diff --git a/.travis.yml b/.travis.yml index 681a3b5e..e96195f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: node_js node_js: - 14 - 12 - - 10 cache: npm: false diff --git a/package.json b/package.json index 1077ff16..dfbdb245 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,7 @@ "url-loader": "^4.0.0", "webpack": "^4.0.0", "webpack-cli": "^3.0.1", - "webpack-merge": "^4.1.2", + "webpack-merge": "^5.0.8", "yaspeller": "^7.0.0" }, "engines": { diff --git a/webpack.config.js b/webpack.config.js index b663db21..301237b4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,6 @@ 'use strict'; -const merge = require('webpack-merge'); +const {merge} = require('webpack-merge'); const htmlConfig = require('./.webpack/html'); const cssConfig = require('./.webpack/css');