Commit 00991b9d authored by catch's avatar catch
Browse files

Issue #3280359 by bnjmnm: Make jQuery.form internal

(cherry picked from commit 01512edb)
parent f88b9582
......@@ -842,6 +842,20 @@ jquery.form:
assets/vendor/jquery-form/jquery.form.min.js: { minified: true }
dependencies:
- core/jquery
deprecated: The %library_id% asset library is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0.
internal.jquery.form:
# Internal library. Do not depend on it outside core nor add new core usage.
remote: https://github.com/jquery-form/form
version: "4.3.0"
license:
name: GNU-GPL-2.0-or-later
url: https://raw.githubusercontent.com/jquery-form/form/master/LICENSE
gpl-compatible: true
js:
assets/vendor/jquery-form/jquery.form.min.js: { minified: true }
dependencies:
- core/jquery
jquery.joyride:
remote: https://github.com/zurb/joyride
......
......@@ -326,7 +326,7 @@ public static function preRenderAjaxForm($element) {
// Attach JavaScript settings to the element.
if (isset($element['#ajax']['event'])) {
$element['#attached']['library'][] = 'core/jquery.form';
$element['#attached']['library'][] = 'core/internal.jquery.form';
$element['#attached']['library'][] = 'core/drupal.ajax';
$settings = $element['#ajax'];
......
......@@ -32,7 +32,7 @@ quickedit:
- core/jquery.once.bc
- core/internal.underscore
- core/internal.backbone
- core/jquery.form
- core/internal.jquery.form
- core/drupal
- core/drupal.displace
- core/drupal.form
......
......@@ -174,7 +174,7 @@ function common_test_library_info_alter(&$libraries, $module) {
// Change the version of Farbtastic to 0.0.
$libraries['jquery.farbtastic']['version'] = '0.0';
// Make Farbtastic depend on jQuery Form to test library dependencies.
$libraries['jquery.farbtastic']['dependencies'][] = 'core/jquery.form';
$libraries['jquery.farbtastic']['dependencies'][] = 'core/internal.jquery.form';
}
// Alter the dynamically registered library definition.
......
......@@ -15,5 +15,5 @@ views.ajax:
- core/drupalSettings
- core/once
- core/jquery.once.bc
- core/jquery.form
- core/internal.jquery.form
- core/drupal.ajax
......@@ -10,7 +10,7 @@ views_ui.admin:
- core/drupalSettings
- core/once
- core/jquery.once.bc
- core/jquery.form
- core/internal.jquery.form
- core/drupal.form
- core/drupal.ajax
- core/drupal.dropbutton
......
......@@ -120,13 +120,17 @@ const assetsFolder = `${coreFolder}/assets/vendor`;
},
{
pack: 'jquery-form',
library: 'jquery.form',
library: 'internal.jquery.form',
files: [
{ from: 'dist/jquery.form.min.js', to: 'jquery.form.min.js' },
{ from: 'dist/jquery.form.min.js.map', to: 'jquery.form.min.js.map' },
{ from: 'src/jquery.form.js', to: 'src/jquery.form.js' },
],
},
// Only used to update the version number of the deprecated library.
{
pack: 'jquery-form',
},
{
pack: 'joyride',
folder: 'jquery-joyride',
......
<?php
namespace Drupal\KernelTests\Core\Asset;
use Drupal\KernelTests\KernelTestBase;
/**
* Checks the deprecation status of jQuery.form.
*
* @group Asset
* @group legacy
*/
class DeprecatedJqueryFormTest extends KernelTestBase {
/**
* The library discovery service.
*
* @var \Drupal\Core\Asset\LibraryDiscoveryInterface
*/
protected $libraryDiscovery;
/**
* {@inheritdoc}
*/
protected function setUp():void {
parent::setUp();
$this->libraryDiscovery = $this->container->get('library.discovery');
}
/**
* Tests that the jQuery.form library is deprecated.
*/
public function testJqueryFormDeprecation() {
$this->libraryDiscovery->getLibraryByName('core', 'jquery.form');
$this->expectDeprecation("The core/jquery.form asset library is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0.");
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment