milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update webpack-merge

Browse source
This commit is contained in:
Bill Thornton 2021-06-15 00:44:00 -04:00
parent 8c23911044
commit 60d0e1f132
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
package-lock.json generated
View file

@ -15231,12 +15231,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.8.0",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
"dev": true,
"requires": {
"lodash": "^4.17.15"
"clone-deep": "^4.0.1",
"wildcard": "^2.0.0"
}
},
"webpack-sources": {

2
package.json
View file

@ -46,7 +46,7 @@
"webpack": "^5.39.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2",
"webpack-merge": "^4.2.2",
"webpack-merge": "^5.8.0",
"workbox-webpack-plugin": "^6.1.5",
"worker-plugin": "^5.0.1"
},

2
webpack.dev.js
View file

@ -1,6 +1,6 @@
const path = require('path');
const common = require('./webpack.common');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
module.exports = merge(common, {
// In order for live reload to work we must use "web" as the target not "browserlist"

2
webpack.prod.js
View file

@ -1,6 +1,6 @@
const path = require('path');
const common = require('./webpack.common');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const WorkboxPlugin = require('workbox-webpack-plugin');
module.exports = merge(common, {