Issue #2484623 by quietone, anavarre, nod_, Manuel Garcia, rteijeiro, kostyashupenko, ankithashetty, smustgrave, jeroent, xjm, droplet, cilefen, travis-bradbury, catch: Move all JS in modules to a js/ folder

Author: alexpott

.eslintignore

@@ -2,7 +2,7 @@ assets/vendor/**/*
 node_modules/**/*
 **/js_test_files/**/*
 **/build/**/*
-modules/locale/tests/locale_test.js
+modules/locale/tests/js/locale_test.js
 misc/jquery.form.js
 
 # Ignore deliberately malformed YAML files.

modules/comment/comment.libraries.yml

@@ -1,11 +1,18 @@
 drupal.comment:
   version: VERSION
   js:
-    comment-entity-form.js: {}
+    js/comment-entity-form.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/drupal.form
+  moved_files:
+    comment/drupal.comment:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        comment-entity-form.js: 'js/comment-entity-form.js'
 
 drupal.comment-by-viewer:
   version: VERSION

modules/comment/comment-entity-form.js modules/comment/js/comment-entity-form.js

@@ -1,11 +1,18 @@
 drupal.content_translation.admin:
   version: VERSION
   js:
-    content_translation.admin.js: {}
+    js/content_translation.admin.js: {}
   css:
     theme:
       css/content_translation.admin.css: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/once
+  moved_files:
+    content_translation/content_translation.admin.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        content_translation_admin.js: 'js/content_translation.admin.js'

modules/content_translation/content_translation.libraries.yml

@@ -1,12 +1,19 @@
 drupal.file:
   version: VERSION
   js:
-    file.js: {}
+    js/file.js: {}
   dependencies:
     - core/jquery
     - core/once
     - core/drupal
     - core/drupalSettings
+  moved_files:
+    file/file.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        file.js: 'js/file.js'
 
 drupal.file-icon:
   version: VERSION

modules/content_translation/content_translation.admin.js modules/content_translation/js/content_translation.admin.js

@@ -1,21 +1,35 @@
 drupal.filter.admin:
   version: VERSION
   js:
-    filter.admin.js: {}
+    js/filter.admin.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/once
     - core/drupal.form
+  moved_files:
+    filter/filter.admin.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        filter.admin.js: 'js/filter.admin.js'
 
 drupal.filter:
   version: VERSION
   js:
-    filter.js: {}
+    js/filter.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/once
+  moved_files:
+    filter/filter.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        filter.js: 'js/filter.js'
 
 caption:
   version: VERSION

modules/file/file.libraries.yml

@@ -1,11 +1,23 @@
 drupal.language.admin:
   version: VERSION
   js:
-    language.admin.js: {}
+    js/language.admin.js: {}
   css:
     theme:
       css/language.admin.css: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/once
+
+moved_to:
+  version: VERSION
+  js:
+    js/language.admin.js: {}
+  moved_files:
+    language/language.admin.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        language.admin.js: 'js/language.admin.js'

modules/file/file.js modules/file/js/file.js

@@ -1,7 +1,7 @@
 drupal.locale.admin:
   version: VERSION
   js:
-    locale.admin.js: {}
+    js/locale.admin.js: {}
   css:
     component:
       css/locale.admin.css: {}
@@ -10,6 +10,13 @@ drupal.locale.admin:
     - core/drupal
     - core/drupal.form
     - core/once
+  moved_files:
+    locale/locale.admin.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        locale.admin.js: 'js/locale.admin.js'
 
 translations:
   # No sensible version can be specified, since the translations may change at

modules/filter/filter.libraries.yml

@@ -35,7 +35,7 @@ public function testFileParsing(): void {
     // respect to optional whitespace, line breaks, etc.
     // - We test locale_test.js, because that is the one that contains a
     //   variety of whitespace styles.
-    $files[] = __DIR__ . '/../../locale_test.js';
+    $files[] = __DIR__ . '/../../js/locale_test.js';
 
     foreach ($files as $filename) {
       // Parse the file to look for source strings.
@@ -149,7 +149,7 @@ public function testLocaleTranslationJsDependencies(): void {
       ->getStrings([
         'source' => 'Show description',
         'type' => 'javascript',
-        'name' => 'core/modules/locale/locale.admin.js',
+        'name' => 'core/modules/locale/js/locale.admin.js',
       ]);
     $string = $strings[0];
 

modules/filter/filter.admin.js modules/filter/js/filter.admin.js

@@ -1,19 +1,33 @@
 drupal.menu_ui:
   version: VERSION
   js:
-    menu_ui.js: {}
+    js/menu_ui.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/drupal.form
+  moved_files:
+    menu_uit/menu_ui.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        menu_ui.js: 'js/menu_ui.js'
 
 drupal.menu_ui.admin:
   version: VERSION
   js:
-    menu_ui.admin.js: {}
+    js/menu_ui.admin.js: {}
   dependencies:
     - core/jquery
     - core/drupal
+  moved_files:
+    menu_uit/menu_ui.admin.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        menu_ui.admin.js: 'js/menu_ui.admin.js'
 
 drupal.menu_ui.adminforms:
   version: VERSION

modules/filter/filter.js modules/filter/js/filter.js

@@ -4,33 +4,54 @@ drupal.node:
     layout:
       css/node.module.css: {}
   js:
-    node.js: {}
+    js/node.js: {}
   dependencies:
     - core/drupal.entity-form
     - core/drupalSettings
+  moved_files:
+    node/node.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        node.js: 'js/node.js'
 
 drupal.node.preview:
   version: VERSION
   css:
     theme:
       css/node.preview.css: {}
   js:
-    node.preview.js: {}
+    js/node.preview.js: {}
   dependencies:
     - core/jquery
     - core/once
     - core/drupal
     - core/drupal.dialog
     - core/drupal.form
+  moved_files:
+    node/node.preview.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        node.preview.js: 'js/node.preview.js'
 
 drupal.content_types:
   version: VERSION
   js:
-    content_types.js: {}
+    js/content_types.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/drupal.form
+  moved_files:
+    node/content_types.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        content_types.js: 'js/content_types.js'
 
 form:
   version: VERSION

modules/language/language.admin.js modules/language/js/language.admin.js

@@ -1,8 +1,15 @@
 drupal.path:
   version: VERSION
   js:
-    path.js: {}
+    js/path.js: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/drupal.form
+  moved_files:
+    path/path.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        path.js: 'js/path.js'

modules/language/language.libraries.yml

@@ -1,2 +1,2 @@
-<div>file_url: {{ file_url('core/modules/system/tests/modules/twig_theme_test/twig_theme_test.js') }}</div>
+<div>file_url: {{ file_url('core/modules/system/tests/modules/twig_theme_test/js/twig_theme_test.js') }}</div>
 <div>file_url: {{ file_url(undefined_variable) }}</div>

modules/locale/locale.admin.js modules/locale/js/locale.admin.js

@@ -138,7 +138,7 @@ public function testTwigFileUrls(): void {
     $this->drupalGet('/twig-theme-test/file-url');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
-    $filepath = $file_url_generator->generateString('core/modules/system/tests/modules/twig_theme_test/twig_theme_test.js');
+    $filepath = $file_url_generator->generateString('core/modules/system/tests/modules/twig_theme_test/js/twig_theme_test.js');
     $this->assertSession()->responseContains('<div>file_url: ' . $filepath . '</div>');
   }
 

modules/locale/locale.bulk.js modules/locale/js/locale.bulk.js

@@ -1,7 +1,7 @@
 drupal.taxonomy:
   version: VERSION
   js:
-    taxonomy.js: {}
+    js/taxonomy.js: {}
   css:
     component:
       css/taxonomy.theme.css: {}
@@ -10,3 +10,10 @@ drupal.taxonomy:
     - core/drupal
     - core/drupalSettings
     - core/drupal.tabledrag
+  moved_files:
+    taxonomy/taxonomy.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        taxonomy.js: js/taxonomy.js'

modules/locale/locale.libraries.yml

@@ -1,11 +1,18 @@
 drupal.text:
   version: VERSION
   js:
-    text.js: {}
+    js/text.js: {}
   dependencies:
     - core/jquery
     - core/once
     - core/drupal
+  moved_files:
+    text/text.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        text.js: 'js/text.js'
 
 drupal.text-icon:
   version: VERSION

modules/locale/tests/locale_test.js modules/locale/tests/js/locale_test.js

@@ -1,15 +1,28 @@
 drupal.user:
   version: VERSION
   js:
-    user.js: {}
-    user.theme.js: {}
+    js/user.js: {}
+    js/user.theme.js: {}
   css:
     component:
       css/user.module.css: {}
   dependencies:
     - core/jquery
     - core/drupal
     - core/once
+  moved_files:
+    user/user.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        user.js: 'js/user.js'
+    user/user.theme.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        user.theme.js: 'js/user.theme.js'
 
 drupal.user.admin:
   version: VERSION
@@ -20,7 +33,7 @@ drupal.user.admin:
 drupal.user.permissions:
   version: VERSION
   js:
-    user.permissions.js: {}
+    js/user.permissions.js: {}
   dependencies:
     - core/jquery
     - core/once
@@ -30,6 +43,13 @@ drupal.user.permissions:
     - core/drupal.checkbox
     - core/drupal.debounce
     - core/drupal.announce
+  moved_files:
+    user/user.permissions.js:
+      deprecation_version: drupal:11.1.0
+      removed_version: drupal:12.0.0
+      deprecation_link: https://www.drupal.org/node/3471539
+      js:
+        user.permissions.js: 'js/user.permissions.js'
 
 drupal.user.icons:
   version: VERSION