diff options
| author | David Mehren | 2021-02-12 22:53:05 +0100 |
|---|---|---|
| committer | GitHub | 2021-02-12 22:53:05 +0100 |
| commit | fbac2d7ef8be325635da78e0b762cfb813c1fca2 (patch) | |
| tree | e8440c525d2caf6f42cf33e3e5581c86526928b9 | |
| parent | 6cbf233fe76698462121f2f17c9231421b9673dc (diff) | |
| parent | 87909b599e08a2361173c3a8717927da51e1aec3 (diff) | |
Merge pull request #895 from hedgedoc/renovate/master-webpack-merge-5.x
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.dev.js | 2 | ||||
| -rw-r--r-- | webpack.prod.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 9 |
4 files changed, 4 insertions, 11 deletions
diff --git a/package.json b/package.json index 4f52135d..532a3346 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "url-loader": "4.1.1", "webpack": "4.46.0", "webpack-cli": "4.5.0", - "webpack-merge": "4.2.2" + "webpack-merge": "5.7.3" }, "optionalDependencies": { "bufferutil": "^4.0.0", diff --git a/webpack.dev.js b/webpack.dev.js index 0e84f7a4..7c7edb61 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,6 +1,6 @@ const common = require('./webpack.common.js') const htmlexport = require('./webpack.htmlexport') -const merge = require('webpack-merge') +const { merge } = require('webpack-merge'); module.exports = [ // merge common config diff --git a/webpack.prod.js b/webpack.prod.js index 4dfac1a8..5c523c06 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,6 +1,6 @@ const common = require('./webpack.common.js') const htmlexport = require('./webpack.htmlexport') -const merge = require('webpack-merge') +const { merge } = require('webpack-merge'); const path = require('path') const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin') @@ -11506,14 +11506,7 @@ webpack-cli@4.5.0: v8-compile-cache "^2.2.0" webpack-merge "^5.7.3" -webpack-merge@4.2.2: - 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: +webpack-merge@5.7.3, webpack-merge@^5.7.3: version "5.7.3" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== |