wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16952 from nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.2

Browse source 
Bump webpack-merge from 4.2.1 to 4.2.2
This commit is contained in:
Roeland Jago Douma 2019-09-01 19:33:40 +02:00 committed by GitHub
commit 4d696bc4bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -9239,12 +9239,12 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "4.2.1", "version": "4.2.2",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
"integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.5" "lodash": "^4.17.15"
} }
}, },
"webpack-sources": { "webpack-sources": {

2
package.json
View file

@ -80,7 +80,7 @@
"vue-template-compiler": "^2.6.10", "vue-template-compiler": "^2.6.10",
"webpack": "^4.39.2", "webpack": "^4.39.2",
"webpack-cli": "^3.3.7", "webpack-cli": "^3.3.7",
"webpack-merge": "^4.2.1" "webpack-merge": "^4.2.2"
}, },
"browserslist": [ "browserslist": [
"extends browserslist-config-nextcloud" "extends browserslist-config-nextcloud"