Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35936 from openedx/renovate/webpack-merge-6.x

Browse Source 
fix(deps): update dependency webpack-merge to v6
This commit is contained in:
Feanil Patel
2025-09-22 12:10:23 -04:00
committed by GitHub
parent 4219438c56 9a02c73936
commit 198886d191
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@@ -72,7 +72,7 @@
"underscore.string": "3.3.6",
"webpack": "^5.90.3",
"webpack-bundle-tracker": "3.2.1",
"webpack-merge": "4.2.2",
"webpack-merge": "6.0.1",
"which-country": "1.0.0"
},
"devDependencies": {
@@ -6570,7 +6570,6 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"is-plain-object": "^2.0.4",
@@ -9295,7 +9294,6 @@
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
"dev": true,
"license": "BSD-3-Clause",
"bin": {
"flat": "cli.js"
@@ -13027,6 +13025,16 @@
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/karma-webpack/node_modules/webpack-merge": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
"dev": true,
"license": "MIT",
"dependencies": {
"lodash": "^4.17.15"
}
},
"node_modules/karma/node_modules/lodash": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -13048,7 +13056,6 @@
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@@ -17635,7 +17642,6 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true,
"license": "MIT",
"dependencies": {
"kind-of": "^6.0.2"
@@ -20552,12 +20558,17 @@
}
},
"node_modules/webpack-merge": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
"license": "MIT",
"dependencies": {
"lodash": "^4.17.15"
"clone-deep": "^4.0.1",
"flat": "^5.0.2",
"wildcard": "^2.0.1"
},
"engines": {
"node": ">=18.0.0"
}
},
"node_modules/webpack-sources": {
@@ -20741,7 +20752,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
"dev": true,
"license": "MIT"
},
"node_modules/word-wrap": {

2
package.json
View File

@@ -97,7 +97,7 @@
"underscore.string": "3.3.6",
"webpack": "^5.90.3",
"webpack-bundle-tracker": "3.2.1",
"webpack-merge": "4.2.2",
"webpack-merge": "6.0.1",
"which-country": "1.0.0"
},
"devDependencies": {

4
webpack.common.config.js
View File

@@ -88,11 +88,11 @@ var workerConfig = function() {
}
};
} catch (err) {
return null;
return {};
}
};
module.exports = Merge.smart({
module.exports = Merge.merge({
web: {
context: __dirname,

2
webpack.dev.config.js
View File

@@ -9,7 +9,7 @@ var _ = require('underscore');
var commonConfig = require('./webpack.common.config.js');
module.exports = _.values(Merge.smart(commonConfig, {
module.exports = _.values(Merge.merge(commonConfig, {
web: {
output: {
filename: '[name].js'

4
webpack.prod.config.js
View File

@@ -10,7 +10,7 @@ const TerserPlugin = require("terser-webpack-plugin");
var commonConfig = require('./webpack.common.config.js');
var optimizedConfig = Merge.smart(commonConfig, {
var optimizedConfig = Merge.merge(commonConfig, {
web: {
output: {
filename: '[name].[chunkhash].js'
@@ -49,7 +49,7 @@ var optimizedConfig = Merge.smart(commonConfig, {
// gone.
// Step 1: Alter the bundle output names to omit the chunkhash.
var requireCompatConfig = Merge.smart(optimizedConfig, {
var requireCompatConfig = Merge.merge(optimizedConfig, {
web: {
output: {
filename: '[name].js'