From a30a87c1c748dac42c9799b249b55eb7cf28c7f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Jun 2021 06:34:17 +0000 Subject: [PATCH] Bump webpack-merge from 5.7.3 to 5.8.0 in /server/resources Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.3 to 5.8.0. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.3...v5.8.0) --- updated-dependencies: - dependency-name: webpack-merge dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/resources/package-lock.json | 14 +++++++------- server/resources/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/resources/package-lock.json b/server/resources/package-lock.json index 97ba925..0b59db1 100644 --- a/server/resources/package-lock.json +++ b/server/resources/package-lock.json @@ -51,7 +51,7 @@ "webpack": "^5.38.1", "webpack-assets-manifest": "^5.0.6", "webpack-inject-plugin": "^1.5.5", - "webpack-merge": "^5.7.3" + "webpack-merge": "^5.8.0" }, "devDependencies": { "speed-measure-webpack-plugin": "^1.5.0", @@ -5973,9 +5973,9 @@ } }, "node_modules/webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dependencies": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" @@ -10667,9 +10667,9 @@ } }, "webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "requires": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" diff --git a/server/resources/package.json b/server/resources/package.json index 34bdf6e..c232cac 100644 --- a/server/resources/package.json +++ b/server/resources/package.json @@ -56,7 +56,7 @@ "webpack": "^5.38.1", "webpack-assets-manifest": "^5.0.6", "webpack-inject-plugin": "^1.5.5", - "webpack-merge": "^5.7.3" + "webpack-merge": "^5.8.0" }, "devDependencies": { "speed-measure-webpack-plugin": "^1.5.0",