From 5fb61367034f14d937d991af93cbfc5c3d816258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 23:50:41 +0000 Subject: [PATCH 1/2] Bump webpack-merge from 4.2.2 to 6.0.1 Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 6.0.1. - [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v6.0.1) --- updated-dependencies: - dependency-name: webpack-merge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 24 +++++++++++------------- package.json | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7ae0aed..8924bdf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "slick-carousel": "^1.8.1", "tinymce": "^7.3.0", "to-string-loader": "^1.1.6", - "webpack-merge": "^4.2.2" + "webpack-merge": "^6.0.1" }, "devDependencies": { "@babel/core": "^7.22.5", @@ -6445,7 +6445,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, "dependencies": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -6459,7 +6458,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -8237,7 +8235,6 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, "bin": { "flat": "cli.js" } @@ -10063,7 +10060,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -10572,7 +10568,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, "engines": { "node": ">=0.10.0" } @@ -13661,7 +13656,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, "dependencies": { "kind-of": "^6.0.2" }, @@ -15729,11 +15723,16 @@ } }, "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==", "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": { @@ -15829,8 +15828,7 @@ "node_modules/wildcard": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", - "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", - "dev": true + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==" }, "node_modules/word-wrap": { "version": "1.2.5", diff --git a/package.json b/package.json index 30bb2709..d888822e 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,6 @@ "slick-carousel": "^1.8.1", "tinymce": "^7.3.0", "to-string-loader": "^1.1.6", - "webpack-merge": "^4.2.2" + "webpack-merge": "^6.0.1" } } From 5e456980f137b140dfa254638f7cc9ff1eaab15d Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Tue, 27 Aug 2024 11:34:43 +1000 Subject: [PATCH 2/2] update import syntax for webpack-merge version 5+ - 'merge' is now a named export instead of default --- webpack/webpack.dev.js | 2 +- webpack/webpack.prod.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index 350e8f3a..79152a4d 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -1,4 +1,4 @@ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); const path = require('path'); diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index ebd4f280..b03ffdde 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -1,4 +1,4 @@ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); const path = require('path'); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); @@ -63,4 +63,4 @@ module.exports = env => { } }); -} \ No newline at end of file +}