Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): use jquery v2.2.4 to unblock jquery-ui v1.14.1 upgrade #11109

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

build(deps): use jquery v2.2.4 to unblock jquery-ui v1.14.1 upgrade #11109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bca2e00
build(deps): bump jquery-ui in the jquery group across 1 directory
dependabot[bot] Dec 23, 2024
9e18186
dependencies: downgrade to `jquery` v2.2.4 in `package.json`
jayaddison Dec 10, 2024
d48c810
gulpfile: cleanup: remove `safe-active-element`, no longer found in `…
jayaddison Dec 10, 2024
6765bfa
gulpfile: add explicit ignore for implicit `jquery` v2.1.4 copying fr…
jayaddison Dec 10, 2024
c3e0bc3
gulpfile: add explanatory comment
jayaddison Dec 10, 2024
c59900e
folksonomy: update versioning comments
jayaddison Dec 10, 2024
fa55e51
folksonomy: fixup for versioning comments
jayaddison Dec 10, 2024
79c1afd
folksonomy: fixup for `jquery-ui` approx size comment
jayaddison Dec 10, 2024
84c593e
gulpfile: copy `jquery.js` from package.json
jayaddison Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gulpfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ 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",
], {
jayaddison marked this conversation as resolved.
Show resolved Hide resolved
// prefer jquery from package.json to foundation-vendored copy
ignore: "./node_modules/foundation-sites/js/vendor/jquery.js",
}).
pipe(init()).
pipe(terser()).
pipe(write(".")).
Expand All @@ -104,7 +108,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",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NB: safe-active-element.js was removed from jquery-ui in jquery/jquery-ui@bb49bd7 (released in v1.14.0).

"./node_modules/jquery-ui/ui/widgets/autocomplete.js",
"./node_modules/jquery-ui/ui/widgets/menu.js",
]).
Expand Down
8 changes: 4 additions & 4 deletions html/js/folksonomy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
/* eslint no-unused-expressions: ["error", { "allowTernary": true }] */

// Product Opener (Open Food Facts web app) uses:
// * jQuery 2.1.4: view-source:https://static.openfoodfacts.org/js/dist/jquery.js (~84 KB)
// http://code.jquery.com/jquery-2.1.4.min.js
// * jQuery-UI 1.12.1: view-source:https://static.openfoodfacts.org/js/dist/jquery-ui.js (~82 KB)
// http://code.jquery.com/ui/1.12.1/jquery-ui.min.js
// * jQuery 2.2.4: view-source:https://static.openfoodfacts.org/js/dist/jquery.js (~84 KB)
// http://code.jquery.com/jquery-2.2.4.min.js
// * jQuery-UI 1.14.1: view-source:https://static.openfoodfacts.org/js/dist/jquery-ui.js (~35 KB)
// http://code.jquery.com/ui/1.14.1/jquery-ui.min.js
// * Tagify 3.x: https://github.com/yairEO/tagify (~47 KB)
// * Foundation 5 CSS Framework: https://sudheerdev.github.io/Foundation5CheatSheet/
// See also: https://github.com/openfoodfacts/openfoodfacts-server/pull/2987
Expand Down
19 changes: 10 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@
"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",
"jquery-ui": "1.14.1",
"jsvectormap": "^1.6.0",
"leaflet": "^1.7.1",
"leaflet.markercluster": "1.5.3",
Expand Down
Loading