Skip to content

Commit

Permalink
Bump webpack-merge from 4.2.2 to 5.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] authored and MorrisJobke committed Jul 30, 2020
1 parent a32e6a7 commit d784557
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 10 deletions.
4 changes: 2 additions & 2 deletions core/webpack.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
* @copyright 2018 Christoph Wurst <[email protected]>
*
* @author 2018 Christoph Wurst <[email protected]>
Expand All @@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.js');
// webpack.config.js
const nodeExternals = require('webpack-node-externals')
Expand Down
35 changes: 31 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"vue-template-compiler": "^2.6.11",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^4.2.2",
"webpack-merge": "^5.0.9",
"webpack-node-externals": "^1.7.2"
},
"browserslist": [
Expand Down
2 changes: 1 addition & 1 deletion webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable camelcase */
const path = require('path')
const merge = require('webpack-merge')
const { merge } = require('webpack-merge')
const { VueLoaderPlugin } = require('vue-loader')

const accessibility = require('./apps/accessibility/webpack')
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');

module.exports = common.map(
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require('webpack-merge')
const { merge } = require('webpack-merge')
const common = require('./webpack.common.js')
const TerserPlugin = require('terser-webpack-plugin');

Expand Down

0 comments on commit d784557

Please sign in to comment.