groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-06-30 14:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Upgraded jquery to 4.0.0

Browse source
This commit is contained in:
Jan Böhmer 2026-06-21 15:51:22 +02:00
parent b4cf5b57fa
commit 22f23d9c82
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
assets/js/app.js
View file

@ -30,21 +30,21 @@ import '../css/app/images.css';
// start the Stimulus application // start the Stimulus application
import '../stimulus_bootstrap'; import '../stimulus_bootstrap';
// Need jQuery? Install it with "yarn add jquery", then uncomment to require it. import $ from 'jquery';
const $ = require('jquery');
//Only include javascript //Only include javascript
import '@fortawesome/fontawesome-free/css/all.css' import '@fortawesome/fontawesome-free/css/all.css'
require('bootstrap'); import 'bootstrap';
import "./error_handler"; import "./error_handler";
import "./tab_remember"; import "./tab_remember";
import "./register_events"; import "./register_events";
import "./tristate_checkboxes"; import "./tristate_checkboxes";
//Define jquery globally // Expose jQuery globally so legacy plugins and Bootstrap's jQuery integration
global.$ = global.jQuery = require("jquery"); // can find it on window at runtime.
global.$ = global.jQuery = $;
//Use the local WASM file for the ZXing library //Use the local WASM file for the ZXing library
import { import {

4
package.json
View file

@ -13,7 +13,7 @@
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"core-js": "^3.38.0", "core-js": "^3.38.0",
"intl-messageformat": "^10.5.11", "intl-messageformat": "^10.5.11",
"jquery": "^3.5.1", "jquery": "^4.0.0",
"popper.js": "^1.14.7", "popper.js": "^1.14.7",
"regenerator-runtime": "^0.14.1", "regenerator-runtime": "^0.14.1",
"webpack": "^5.74.0", "webpack": "^5.74.0",
@ -76,6 +76,6 @@
"typescript": "^6.0.2" "typescript": "^6.0.2"
}, },
"resolutions": { "resolutions": {
"jquery": "^3.5.1" "jquery": "^4.0.0"
} }
} }

9
webpack.config.js
View file

@ -119,7 +119,14 @@ Encore
// requires WebpackEncoreBundle 1.4 or higher // requires WebpackEncoreBundle 1.4 or higher
.enableIntegrityHashes(Encore.isProduction()) .enableIntegrityHashes(Encore.isProduction())
// uncomment if you're having problems with a jQuery plugin // Force all jquery imports to the UMD build so webpack always receives the
// jQuery function directly instead of an ESM namespace object. Without this,
// webpack's ESM interop wraps jquery.module.js in a namespace
// { default, jQuery, $ } which has no .fn, crashing Bootstrap's
// defineJQueryPlugin when it tries to access $.fn.alert.
.addAliases({
'jquery': path.resolve(__dirname, 'node_modules/jquery/dist/jquery.js')
})
.autoProvidejQuery() .autoProvidejQuery()

8
yarn.lock
View file

@ -3451,10 +3451,10 @@ jest-worker@^30.0.5:
merge-stream "^2.0.0" merge-stream "^2.0.0"
supports-color "^8.1.1" supports-color "^8.1.1"
jquery@>=1.7, jquery@^3.5.1: jquery@>=1.7, jquery@^4.0.0:
version "3.7.1" version "4.0.0"
resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz" resolved "https://registry.yarnpkg.com/jquery/-/jquery-4.0.0.tgz#95c33ac29005ff72ec444c5ba1cf457e61404fbb"
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== integrity sha512-TXCHVR3Lb6TZdtw1l3RTLf8RBWVGexdxL6AC8/e0xZKEpBflBsjh9/8LXw+dkNFuOyW9B7iB3O1sP7hS0Kiacg==
js-md5@^0.8.3: js-md5@^0.8.3:
version "0.8.3" version "0.8.3"