From 8a960a5d8b1fcbbb8b870db8c09aa936b4b48d7d Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Wed, 10 Jul 2024 18:52:10 +0800 Subject: [PATCH 1/7] 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 7ebc4bdf8b..c1d2228798 100755 --- 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 8c4110b66ea5060f73ccca59ef106bad927439f3 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 22:13:05 +0800 Subject: [PATCH 2/7] 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 dfd17cbc70..07e21108b3 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", @@ -22387,6 +22411,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 099d7d3058..4b5258db57 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 4e869b8ccab693c55426295b6ca0a74f1ddb1522 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 22:18:05 +0800 Subject: [PATCH 3/7] pkp/pkp-lib#9753 [stable-3_3_0] Copy jquery, jquery-ui and jquery-validation 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 0b69cd5f19..6c28993ff0 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 f98d662c215bf42fc01d0980d7f52e2b9ba34d8f Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 12 Jul 2024 22:18:54 +0800 Subject: [PATCH 4/7] 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 c1d2228798..7ebc4bdf8b 100755 --- 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 62817e6161d9028963d692235b67e3f5c2d1ad9e Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 13 Aug 2024 01:12:02 +0800 Subject: [PATCH 5/7] 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 07e21108b3..dfd17cbc70 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", @@ -22411,25 +22387,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 4b5258db57..099d7d3058 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 0f36ae27ef3c9349fbd52c2fc44bba8ca788237b Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 13 Aug 2024 01:13:05 +0800 Subject: [PATCH 6/7] 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 6c28993ff0..0b69cd5f19 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 fb6ae2e56ad9de995ab64677ecc23f81b53ad8f1 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 27 Aug 2024 01:04:00 +0800 Subject: [PATCH 7/7] 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 43d75550f2..bf243e1e25 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 43d75550f26be9aef248f209f2e3751ce701758d +Subproject commit bf243e1e25e25523434916e1c54c172f6169c702