Merge pull request #177 from vios-fish/dependabot/npm_and_yarn/front/…

…develop/webpack-merge-5.7.3 Dependabot/npm and yarn/front/develop/webpack merge 5.7.3
tier4 · Feb 2, 2021 · b42d123 · b42d123
2 parents 8ddc232 + c7e147d
commit b42d123
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/front/package.json b/front/package.json
@@ -37,7 +37,7 @@
     "redux-thunk": "^2.3.0",
     "webpack": "v4",
     "webpack-bundle-tracker": "^0.4.3",
-    "webpack-merge": "^4.1.4"
+    "webpack-merge": "^5.7.3"
   },
   "devDependencies": {
     "@material-ui/icons": "^4.11.2",

diff --git a/front/webpack.dev.js b/front/webpack.dev.js
@@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const path = require('path');
 const BundleTracker = require('webpack-bundle-tracker');

diff --git a/front/webpack.prod.js b/front/webpack.prod.js
@@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const path = require('path');
 const BundleTracker = require('webpack-bundle-tracker');

diff --git a/front/yarn.lock b/front/yarn.lock
@@ -6110,13 +6110,6 @@ webpack-cli@^4.4.0:
     v8-compile-cache "^2.2.0"
     webpack-merge "^5.7.3"
 
-webpack-merge@^4.1.4:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
-  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
-  dependencies:
-    lodash "^4.17.15"
-
 webpack-merge@^5.7.3:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"