From 92053aff8f87f69b4aeda49c0f5b07eaeda1eac1 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 10 Dec 2024 15:59:10 +0000 Subject: [PATCH] build(deps): use `jquery` v2.2.4 to unblock `jquery-ui` v1.14.1 upgrade Unblocks @dependabot PR openfoodfacts/openfoodfacts-server#10970 --- gulpfile.ts | 6 ++++-- package-lock.json | 8 +++++--- package.json | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 1c88db077d73a..89e4b087d9f77 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -79,7 +79,10 @@ export function copyJs() { "./node_modules/jsvectormap/dist/maps/world-merc.js", "./node_modules/select2/dist/js/select2.min.js", "./node_modules/jsbarcode/dist/JsBarcode.all.min.js", - ]). + "./node_modules/jquery/dist/jquery.js", + ], { + ignore: "./node_modules/foundation-sites/js/vendor/jquery.js", + }). pipe(init()). pipe(terser()). pipe(write(".")). @@ -104,7 +107,6 @@ function buildjQueryUi() { "./node_modules/jquery-ui/ui/position.js", "./node_modules/jquery-ui/ui/keycode.js", "./node_modules/jquery-ui/ui/unique-id.js", - "./node_modules/jquery-ui/ui/safe-active-element.js", "./node_modules/jquery-ui/ui/widgets/autocomplete.js", "./node_modules/jquery-ui/ui/widgets/menu.js", ]). diff --git a/package-lock.json b/package-lock.json index 9eee4aeebe7ee..9820ab7525605 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "cropperjs": "^1.6.1", "foundation-sites": "5.5.3", "highcharts": "^9.2.2", + "jquery": "2.2.4", "jquery-cropper": "^1.0.1", "jquery-form": "^4.3.0", "jquery-ui": "1.13.3", @@ -6833,9 +6834,10 @@ } }, "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q==", + "license": "MIT" }, "node_modules/jquery-cropper": { "version": "1.0.1", diff --git a/package.json b/package.json index 69fd19b39f665..f7021b1d94a63 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "cropperjs": "^1.6.1", "foundation-sites": "5.5.3", "highcharts": "^9.2.2", + "jquery": "2.2.4", "jquery-cropper": "^1.0.1", "jquery-form": "^4.3.0", "jquery-ui": "1.13.3",