A free open source IT asset/license management system
Align css-loader on v7 and adapt Laravel Mix as a temporary workaround
Joël Pittetefa35d8d23df
diff --git a/package-lock.json b/package-lock.jsonindex 9167dea85b..2cbb6f0df6 100644--- a/package-lock.json+++ b/package-lock.json@@ -56,7 +56,7 @@"webpack": "^5.98.0"},"engines": {- "node": ">=0.12"+ "node": ">=18.12.0"}},"node_modules/@ampproject/remapping": {@@ -4192,9 +4192,9 @@}},"node_modules/css-loader": {- "version": "7.1.4",- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.4.tgz",- "integrity": "sha512-vv3J9tlOl04WjiMvHQI/9tmIrCxVrj6PFbHemBB1iihpeRbi/I4h033eoFIhwxBBqLhI0KYFS7yvynBFhIZfTw==",+ "version": "7.1.5",+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.5.tgz",+ "integrity": "sha512-Q7iAfQkU2twNBryKX/vGAlE+GAmkF7quhSzAGNK8fBimxk3+tqg245rH52UPb9dioBolBc8rP0ihmHBaDTJQBA==","license": "MIT","dependencies": {"icss-utils": "^5.1.0",@@ -7054,63 +7054,6 @@"node": ">=12"}},- "node_modules/laravel-mix/node_modules/css-loader": {- "version": "5.2.7",- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",- "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==",- "dev": true,- "license": "MIT",- "dependencies": {- "icss-utils": "^5.1.0",- "loader-utils": "^2.0.0",- "postcss": "^8.2.15",- "postcss-modules-extract-imports": "^3.0.0",- "postcss-modules-local-by-default": "^4.0.0",- "postcss-modules-scope": "^3.0.0",- "postcss-modules-values": "^4.0.0",- "postcss-value-parser": "^4.1.0",- "schema-utils": "^3.0.0",- "semver": "^7.3.5"- },- "engines": {- "node": ">= 10.13.0"- },- "funding": {- "type": "opencollective",- "url": "https://opencollective.com/webpack"- },- "peerDependencies": {- "webpack": "^4.27.0 || ^5.0.0"- }- },- "node_modules/laravel-mix/node_modules/css-loader/node_modules/json5": {- "version": "2.2.3",- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",- "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",- "dev": true,- "license": "MIT",- "bin": {- "json5": "lib/cli.js"- },- "engines": {- "node": ">=6"- }- },- "node_modules/laravel-mix/node_modules/css-loader/node_modules/loader-utils": {- "version": "2.0.4",- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",- "dev": true,- "license": "MIT",- "dependencies": {- "big.js": "^5.2.2",- "emojis-list": "^3.0.0",- "json5": "^2.1.2"- },- "engines": {- "node": ">=8.9.0"- }- },"node_modules/laravel-mix/node_modules/file-type": {"version": "12.4.2","dev": true,diff --git a/package.json b/package.jsonindex 01c8b35561..55a7805f0b 100644--- a/package.json+++ b/package.json@@ -14,7 +14,7 @@"screenshotter": "node .screenshotter/src/screenshotter.mjs"},"engines": {- "node": ">=0.12"+ "node": ">=18.12.0"},"devDependencies": {"all-contributors-cli": "^6.26.1",@@ -47,7 +47,7 @@"canvas-confetti": "^1.9.3","chart.js": "^2.9.4","clipboard": "^2.0.11",- "css-loader": "^6.7.1",+ "css-loader": "^7.1.4","ekko-lightbox": "^5.1.1","imagemin": "^9.0.1","jquery-slimscroll": "^1.3.8",@@ -68,6 +68,9 @@"tether": "^1.4.0"},"overrides": {+ "laravel-mix": {+ "css-loader": "$css-loader"+ },"pbkdf2": {"sha.js": ">=2.4.12"},diff --git a/webpack.mix.js b/webpack.mix.jsindex ba7f38ba5a..b8f8f42061 100644--- a/webpack.mix.js+++ b/webpack.mix.js@@ -1,6 +1,29 @@const mix = require("laravel-mix");const fs = require("node:fs");+// Mix 6 generates css-loader 5 options. Keep its URL filtering and CSS+// module exports compatible with the css-loader 7 dependency override.+mix.override(config => {+ const rules = config.module.rules.flatMap(rule => rule.oneOf || [rule]);++ for (const rule of rules) {+ for (const loader of rule.use || []) {+ if (typeof loader !== 'object' || loader.loader !== require.resolve('css-loader')) {+ continue;+ }++ if (typeof loader.options.url === 'function') {+ loader.options.url = { filter: loader.options.url };+ }++ if (loader.options.modules) {+ loader.options.modules.namedExport = false;+ loader.options.modules.exportLocalsConvention = 'as-is';+ }+ }+ }+});+// This generates a file called app.css, which we use// later on to build all.cssmix@@ -149,4 +172,4 @@ mix'./node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js'],'public/js/dist/bootstrap-table.js'- ).version();\ No newline at end of file+ ).version();