Move resources/js/src to resources/js

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>

bin/internal/check-release-excludes.sh

@@ -57,7 +57,7 @@ validateExtension() {
                 foundFileExt
             fi
         ;;
-        resources/js/src/*)
+        resources/js/*)
             if [ "${extension}" != "ts" ] && [ "${extension}" != "mjs" ]; then
                 foundFileExt
             fi

docs/faq.rst

@@ -694,8 +694,7 @@ 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:`./resources/js/src/` (Source files to re-build `./public/js/`)
+* :file:`./resources/js/` (Source files to re-build `./public/js/`)
-* :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)

jest.config.cjs

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

package.json

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

resources/js/global.d.ts

@@ -18,7 +18,7 @@ interface Window {
 interface JQuery {
     sortableTable: (method: any) => any;
 
-    menuResizer: (method: string|Function) => any;
+    menuResizer: (method: string|(() => number)) => any;
 
     filterByValue: (value: any) => any;
 

resources/js/modules/functions/mainMenuResizerCallback.ts

@@ -1,6 +1,6 @@
 import $ from 'jquery';
 
-export default function mainMenuResizerCallback () {
+export default function mainMenuResizerCallback (): number {
     // 5 px margin for jumping menu in Chrome
     // eslint-disable-next-line compat/compat
     return $(document.body).width() - 5;