From 9b4ce8eebb17550e337853c77c278f65ef5cf07d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 22:25:57 -0700 Subject: [PATCH] chore(deps-dev): bump webpack-merge from 4.2.2 to 5.1.3 (#908) * chore(deps-dev): bump webpack-merge from 4.2.2 to 5.1.3 Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.1.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.1.3) Signed-off-by: dependabot[bot] * fix: updating our usage of webpack-merge so it works again Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jon Ursenbach --- package-lock.json | 15 ++++++-- package.json | 2 +- packages/api-explorer/package-lock.json | 51 +++++++++++++++++++++++-- packages/api-explorer/package.json | 2 +- packages/api-explorer/webpack.prod.js | 2 +- packages/api-logs/package-lock.json | 51 +++++++++++++++++++++++-- packages/api-logs/package.json | 2 +- packages/api-logs/webpack.prod.js | 2 +- webpack.config.js | 2 +- webpack.prod.js | 2 +- 10 files changed, 112 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6485d61f..34e670fb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23840,12 +23840,13 @@ } }, "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": "5.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz", + "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { @@ -23918,6 +23919,12 @@ "string-width": "^1.0.2 || 2" } }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "windows-release": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.1.tgz", diff --git a/package.json b/package.json index 00826767e..3705ca0bf 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "webpack": "^4.41.0", "webpack-cli": "^3.3.9", "webpack-dev-server": "^3.8.2", - "webpack-merge": "^4.2.2" + "webpack-merge": "^5.1.3" }, "dependencies": { "@apidevtools/swagger-parser": "^10.0.1", diff --git a/packages/api-explorer/package-lock.json b/packages/api-explorer/package-lock.json index 6da38aee3..3d0f77212 100644 --- a/packages/api-explorer/package-lock.json +++ b/packages/api-explorer/package-lock.json @@ -3066,6 +3066,25 @@ } } }, + "clone-deep": { + "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, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "dependencies": { + "kind-of": { + "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 + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -9707,6 +9726,23 @@ "safe-buffer": "^5.0.1" } }, + "shallow-clone": { + "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, + "requires": { + "kind-of": "^6.0.2" + }, + "dependencies": { + "kind-of": { + "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 + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -11699,12 +11735,13 @@ } }, "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": "5.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz", + "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { @@ -11782,6 +11819,12 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/packages/api-explorer/package.json b/packages/api-explorer/package.json index a068eb585..5f90fd686 100644 --- a/packages/api-explorer/package.json +++ b/packages/api-explorer/package.json @@ -54,7 +54,7 @@ "terser-webpack-plugin": "^4.1.0", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", - "webpack-merge": "^4.2.2" + "webpack-merge": "^5.1.3" }, "prettier": "@readme/eslint-config/prettier" } diff --git a/packages/api-explorer/webpack.prod.js b/packages/api-explorer/webpack.prod.js index 3ede094ef..8e4f3a470 100644 --- a/packages/api-explorer/webpack.prod.js +++ b/packages/api-explorer/webpack.prod.js @@ -1,6 +1,6 @@ /* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */ const webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const TerserPlugin = require('terser-webpack-plugin'); const common = require('./webpack.config'); diff --git a/packages/api-logs/package-lock.json b/packages/api-logs/package-lock.json index cbf06660d..d94c95f6e 100644 --- a/packages/api-logs/package-lock.json +++ b/packages/api-logs/package-lock.json @@ -2928,6 +2928,25 @@ "wrap-ansi": "^6.2.0" } }, + "clone-deep": { + "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, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "dependencies": { + "kind-of": { + "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 + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -8359,6 +8378,23 @@ "safe-buffer": "^5.0.1" } }, + "shallow-clone": { + "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, + "requires": { + "kind-of": "^6.0.2" + }, + "dependencies": { + "kind-of": { + "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 + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -9982,12 +10018,13 @@ } }, "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": "5.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz", + "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { @@ -10055,6 +10092,12 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/packages/api-logs/package.json b/packages/api-logs/package.json index 2c8926e6b..7672d0070 100644 --- a/packages/api-logs/package.json +++ b/packages/api-logs/package.json @@ -34,7 +34,7 @@ "prettier": "^2.0.1", "terser-webpack-plugin": "^4.1.0", "webpack": "^4.41.0", - "webpack-merge": "^4.2.2" + "webpack-merge": "^5.1.3" }, "prettier": "@readme/eslint-config/prettier" } diff --git a/packages/api-logs/webpack.prod.js b/packages/api-logs/webpack.prod.js index 3ede094ef..8e4f3a470 100644 --- a/packages/api-logs/webpack.prod.js +++ b/packages/api-logs/webpack.prod.js @@ -1,6 +1,6 @@ /* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */ const webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const TerserPlugin = require('terser-webpack-plugin'); const common = require('./webpack.config'); diff --git a/webpack.config.js b/webpack.config.js index 1521c79d8..640d98e3a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,6 @@ const path = require('path'); const webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common'); const log = require('./example/fixtures/requestmodel.json'); diff --git a/webpack.prod.js b/webpack.prod.js index 8baa9e2dd..7a67ba8f6 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,7 +1,7 @@ /* eslint import/no-extraneous-dependencies: ["error", {"devDependencies": true }] */ const path = require('path'); const webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const TerserPlugin = require('terser-webpack-plugin'); const common = require('./webpack.common');