Move ./js directory to ./resources/js

- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

.eslintignore

@@ -1,5 +1,6 @@
 js/vendor/
 js/dist/
+public/js/
 tmp/
 vendor/
 webpack.config.cjs

.github/workflows/frontend-tests.yml

@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     paths:
-      - 'js/**'
+      - 'resources/js/**'
       - '**.s?css'
       - 'test/javascript/**'
       - '.browserslistrc'

.gitignore

@@ -61,6 +61,6 @@ phpstan.neon
 # Infection
 infection.json5
 /public/build/
-/js/dist/
+/js/
 /setup/
 /themes/

.scrutinizer.yml

@@ -5,9 +5,8 @@ imports:
 filter:
   excluded_paths:
     - build/
-    - js/vendor/
-    - js/dist/
     - node_modules/
+    - public/js/
     - tmp/
     - vendor/
     - test/doctum-config.php

doc/copyright.rst

@@ -34,9 +34,9 @@ Third party licenses
 phpMyAdmin includes several third-party libraries which come under their
 respective licenses.
 
-jQuery's license, which is where we got the files under js/vendor/jquery/ is
+jQuery's license, which is where we got the files under public/js/vendor/jquery/ is
 (MIT|GPL), a copy of each license is available in this repository (GPL
-is available as LICENSE, MIT as js/vendor/jquery/MIT-LICENSE.txt).
+is available as LICENSE, MIT as public/js/vendor/jquery/MIT-LICENSE.txt).
 
 The download kit additionally includes several composer libraries. See their
 licensing information in the vendor/ directory.

doc/faq.rst

@@ -694,8 +694,8 @@ A list of files and corresponding functionality which degrade gracefully when re
 * :file:`./setup/` (setup script)
 * :file:`./examples/` (configuration examples)
 * :file:`./resources/sql/` (SQL scripts to configure advanced functionalities)
-* :file:`./js/src/` (Source files to re-build `./js/dist/`)
-* :file:`./js/global.d.ts` JS type declaration file
+* :file:`./resources/js/src/` (Source files to re-build `./public/js/dist/`)
+* :file:`./resources/js/global.d.ts` JS type declaration file
 * Run `rm -rv vendor/tecnickcom/tcpdf && composer dump-autoload --no-interaction --optimize --dev` (exporting to PDF)
 * Run `rm -rv vendor/williamdes/mariadb-mysql-kbs && composer dump-autoload --no-interaction --optimize --dev` (external links to MariaDB and MySQL documentations)
 * Run `rm -rv vendor/code-lts/u2f-php-server && composer dump-autoload --no-interaction --optimize --dev` (U2F second factor authentication)

doc/vendors.rst

@@ -24,7 +24,7 @@ one we ship.
 
 Currently known list of external libraries:
 
-js/vendor
+public/js/vendor
     jQuery js framework libraries and various js libraries.
 
 vendor/

jest.config.cjs

@@ -3,19 +3,19 @@
 module.exports = {
     extensionsToTreatAsEsm: ['.ts'],
     coverageDirectory: '<rootDir>/build/javascript/',
-    collectCoverageFrom: ['<rootDir>/js/src/**/*.ts'],
+    collectCoverageFrom: ['<rootDir>/resources/js/src/**/*.ts'],
     projects: [
         {
             coveragePathIgnorePatterns: [
                 '<rootDir>/node_modules/',
-                '<rootDir>/js/vendor/',
+                '<rootDir>/public/js/vendor/',
             ],
             displayName: 'phpMyAdmin',
             testMatch: ['<rootDir>/test/javascript/**/*.ts'],
             transform: { '\\.[jt]sx?$': 'babel-jest' },
             moduleNameMapper: {
-                '^phpmyadmin/(.*)$': '<rootDir>/js/src/$1',
-                '^@vendor/(.*)$': '<rootDir>/js/vendor/$1',
+                '^phpmyadmin/(.*)$': '<rootDir>/resources/js/src/$1',
+                '^@vendor/(.*)$': '<rootDir>/public/js/vendor/$1',
             },
             testEnvironment: 'jsdom',
         }

package.json

@@ -78,7 +78,7 @@
     "postinstall": "yarn run build",
     "build": "webpack",
     "css-lint": "stylelint \"public/themes/**/scss/*.scss\" \"public/setup/scss/*.scss\"",
-    "js-lint": "eslint js/src test/javascript jest.config.cjs",
+    "js-lint": "eslint resources/js/src test/javascript jest.config.cjs",
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)"
   }
 }