From e6a55717d64a4f09a67b7bc780c934f4ac26baec Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Wed, 10 Jul 2024 18:26:44 +0800 Subject: [PATCH 01/11] pkp/pkp-lib#9753 [stable-3_3_0] Update path when importing jquery ui --- plugins/themes/default/DefaultThemePlugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/themes/default/DefaultThemePlugin.inc.php b/plugins/themes/default/DefaultThemePlugin.inc.php index 2bef5b6b718..6f6068c26e4 100644 --- a/plugins/themes/default/DefaultThemePlugin.inc.php +++ b/plugins/themes/default/DefaultThemePlugin.inc.php @@ -172,7 +172,7 @@ public function init() { // Load jQuery from a CDN or, if CDNs are disabled, from a local copy. $min = Config::getVar('general', 'enable_minified') ? '.min' : ''; $jquery = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jquery/jquery' . $min . '.js'; - $jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jqueryui/jquery-ui' . $min . '.js'; + $jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/jquery/ui/dist/jquery-ui' . $min . '.js'; // Use an empty `baseUrl` argument to prevent the theme from looking for // the files within the theme directory $this->addScript('jQuery', $jquery, array('baseUrl' => '')); From 33b701aee1ebb9c9953f87ad63e58a365c83abb0 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 21:25:08 +0800 Subject: [PATCH 02/11] pkp/pkp-lib#9753 [stable-3_3_0] Add jquery, jquery-ui and jquery-validation to node dependencies --- package-lock.json | 43 +++++++++++++++++++++++++++++++++++++++++++ package.json | 3 +++ 2 files changed, 46 insertions(+) diff --git a/package-lock.json b/package-lock.json index c326e6a2e18..181975c2059 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,9 @@ "clone-deep": "^4.0.1", "debounce": "^1.2.0", "dompurify": "^3.0.8", + "jquery": "^3.7.1", + "jquery-ui": "^1.13.3", + "jquery-validation": "~1.19.5", "moment": "^2.27.0", "tinymce": "^4.9.11", "v-tooltip": "^2.0.3", @@ -8715,6 +8718,27 @@ "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==", "dev": true }, + "node_modules/jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + }, + "node_modules/jquery-ui": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.3.tgz", + "integrity": "sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA==", + "dependencies": { + "jquery": ">=1.8.0 <4.0.0" + } + }, + "node_modules/jquery-validation": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.5.tgz", + "integrity": "sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==", + "peerDependencies": { + "jquery": "^1.7 || ^2.0 || ^3.1" + } + }, "node_modules/js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", @@ -22409,6 +22433,25 @@ "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==", "dev": true }, + "jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + }, + "jquery-ui": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.3.tgz", + "integrity": "sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA==", + "requires": { + "jquery": ">=1.8.0 <4.0.0" + } + }, + "jquery-validation": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.5.tgz", + "integrity": "sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==", + "requires": {} + }, "js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", diff --git a/package.json b/package.json index eb26c8578de..c3b24692c82 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,9 @@ "clone-deep": "^4.0.1", "debounce": "^1.2.0", "dompurify": "^3.0.8", + "jquery": "^3.7.1", + "jquery-ui": "^1.13.3", + "jquery-validation": "~1.19.5", "moment": "^2.27.0", "tinymce": "^4.9.11", "v-tooltip": "^2.0.3", From ce0fa331d0df198e6bccf3d5adda389fb5ba34b1 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 21:57:17 +0800 Subject: [PATCH 03/11] pkp/pkp-lib#9753 [stable-3_3_0] Copy jquery, jquery-ui, jquery-validation and chartjs files from node_modules to lib/pkp vendor and js/plugins folder --- vue.config.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/vue.config.js b/vue.config.js index 0b69cd5f198..6c28993ff0b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,5 @@ var path = require('path'); +const CopyPlugin = require('copy-webpack-plugin'); module.exports = { css: { @@ -34,6 +35,25 @@ module.exports = { hotUpdateChunkFilename: 'hot-updates/hot-update.js', hotUpdateMainFilename: 'hot-updates/hot-update.json' }, + plugins: [ + new CopyPlugin([ + // copy jquery and jquery-ui from node_modules to lib/pkp composer's vendor dir + { + from: 'node_modules/jquery/dist/', + to: '../lib/pkp/lib/vendor/components/jquery/', + }, + { + from: 'node_modules/jquery-ui/dist/*.js', + to: '../lib/pkp/lib/vendor/components/jqueryui/[name].[ext]', + }, + + // copy jquery-validation from node_modules to lib/pkp/js/lib + { + from: 'node_modules/jquery-validation/dist/', + to: '../lib/pkp/js/lib/jquery/plugins/validate/', + }, + ]) + ], resolve: { alias: { '@': path.resolve(__dirname, 'lib/ui-library/src') From 7211456da3d948e156f9bc506e2581bc9c28973e Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 21:57:28 +0800 Subject: [PATCH 04/11] pkp/pkp-lib#9753 [stable-3_3_0] Undo changes in jquery-ui path --- plugins/themes/default/DefaultThemePlugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/themes/default/DefaultThemePlugin.inc.php b/plugins/themes/default/DefaultThemePlugin.inc.php index 6f6068c26e4..2bef5b6b718 100644 --- a/plugins/themes/default/DefaultThemePlugin.inc.php +++ b/plugins/themes/default/DefaultThemePlugin.inc.php @@ -172,7 +172,7 @@ public function init() { // Load jQuery from a CDN or, if CDNs are disabled, from a local copy. $min = Config::getVar('general', 'enable_minified') ? '.min' : ''; $jquery = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jquery/jquery' . $min . '.js'; - $jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/jquery/ui/dist/jquery-ui' . $min . '.js'; + $jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jqueryui/jquery-ui' . $min . '.js'; // Use an empty `baseUrl` argument to prevent the theme from looking for // the files within the theme directory $this->addScript('jQuery', $jquery, array('baseUrl' => '')); From b135f3f84a7e0736fec70ce4b6b07d3d8e3f40d3 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 12 Aug 2024 23:45:31 +0800 Subject: [PATCH 05/11] pkp/pkp-lib#9753 Remove added npm dependencies for jquery, jqueryui and validate --- package-lock.json | 43 ------------------------------------------- package.json | 3 --- 2 files changed, 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 181975c2059..c326e6a2e18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,6 @@ "clone-deep": "^4.0.1", "debounce": "^1.2.0", "dompurify": "^3.0.8", - "jquery": "^3.7.1", - "jquery-ui": "^1.13.3", - "jquery-validation": "~1.19.5", "moment": "^2.27.0", "tinymce": "^4.9.11", "v-tooltip": "^2.0.3", @@ -8718,27 +8715,6 @@ "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==", "dev": true }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" - }, - "node_modules/jquery-ui": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.3.tgz", - "integrity": "sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA==", - "dependencies": { - "jquery": ">=1.8.0 <4.0.0" - } - }, - "node_modules/jquery-validation": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.5.tgz", - "integrity": "sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==", - "peerDependencies": { - "jquery": "^1.7 || ^2.0 || ^3.1" - } - }, "node_modules/js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", @@ -22433,25 +22409,6 @@ "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==", "dev": true }, - "jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" - }, - "jquery-ui": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.3.tgz", - "integrity": "sha512-D2YJfswSJRh/B8M/zCowDpNFfwsDmtfnMPwjJTyvl+CBqzpYwQ+gFYIbUUlzijy/Qvoy30H1YhoSui4MNYpRwA==", - "requires": { - "jquery": ">=1.8.0 <4.0.0" - } - }, - "jquery-validation": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.5.tgz", - "integrity": "sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==", - "requires": {} - }, "js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", diff --git a/package.json b/package.json index c3b24692c82..eb26c8578de 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,6 @@ "clone-deep": "^4.0.1", "debounce": "^1.2.0", "dompurify": "^3.0.8", - "jquery": "^3.7.1", - "jquery-ui": "^1.13.3", - "jquery-validation": "~1.19.5", "moment": "^2.27.0", "tinymce": "^4.9.11", "v-tooltip": "^2.0.3", From d1ef16bb9301b39d2cf8ffd261b1a9d1f47d2580 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 12 Aug 2024 23:46:56 +0800 Subject: [PATCH 06/11] pkp/pkp-lib#9753 Remove copy scripts from node_modules --- vue.config.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/vue.config.js b/vue.config.js index 6c28993ff0b..0b69cd5f198 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,4 @@ var path = require('path'); -const CopyPlugin = require('copy-webpack-plugin'); module.exports = { css: { @@ -35,25 +34,6 @@ module.exports = { hotUpdateChunkFilename: 'hot-updates/hot-update.js', hotUpdateMainFilename: 'hot-updates/hot-update.json' }, - plugins: [ - new CopyPlugin([ - // copy jquery and jquery-ui from node_modules to lib/pkp composer's vendor dir - { - from: 'node_modules/jquery/dist/', - to: '../lib/pkp/lib/vendor/components/jquery/', - }, - { - from: 'node_modules/jquery-ui/dist/*.js', - to: '../lib/pkp/lib/vendor/components/jqueryui/[name].[ext]', - }, - - // copy jquery-validation from node_modules to lib/pkp/js/lib - { - from: 'node_modules/jquery-validation/dist/', - to: '../lib/pkp/js/lib/jquery/plugins/validate/', - }, - ]) - ], resolve: { alias: { '@': path.resolve(__dirname, 'lib/ui-library/src') From c6dbb34792faba779380d315f0017a6219e5c4ff Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 16 Aug 2024 00:15:20 +0800 Subject: [PATCH 07/11] pkp/pkp-lib#9753 Submodule update ##blesildaramirez/i9753-3_3_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 43d75550f26..70ed240d770 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 43d75550f26be9aef248f209f2e3751ce701758d +Subproject commit 70ed240d77067490c4b3938739a76a0bfbbbd359 From b909551238705fad8bc491fb3bb9a127771676f1 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 16 Aug 2024 01:23:35 +0800 Subject: [PATCH 08/11] pkp/pkp-lib#9753 Submodule update ##blesildaramirez/i9753-3_3_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 70ed240d770..3624d79287b 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 70ed240d77067490c4b3938739a76a0bfbbbd359 +Subproject commit 3624d79287b25890433b0a27e6f9fba3b588fa96 From 9d5710334f0b37f31e2fd4c67df699a1a57a31b7 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Thu, 22 Aug 2024 02:59:48 +0800 Subject: [PATCH 09/11] pkp/pkp-lib#9753 Submodule update ##blesildaramirez/i9753-3_3_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 3624d79287b..6270fa6c743 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 3624d79287b25890433b0a27e6f9fba3b588fa96 +Subproject commit 6270fa6c74326106f64804af3f1afda02b499c46 From 6307f780e4b2bab2495e5e313cdf57f7f6980df3 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Thu, 22 Aug 2024 03:14:17 +0800 Subject: [PATCH 10/11] pkp/pkp-lib#9753 Submodule update ##blesildaramirez/i9753-3_3_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 6270fa6c743..1e227f96eba 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 6270fa6c74326106f64804af3f1afda02b499c46 +Subproject commit 1e227f96eba18c43ec18a49a4b220b4f12c63d8d From ec7f1da2bab148ceab3b9de03dc8c79ebfb25952 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 27 Aug 2024 00:54:17 +0800 Subject: [PATCH 11/11] pkp/pkp-lib#9753 Submodule update ##blesildaramirez/i9753-3_3_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 1e227f96eba..bf243e1e25e 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 1e227f96eba18c43ec18a49a4b220b4f12c63d8d +Subproject commit bf243e1e25e25523434916e1c54c172f6169c702