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

This commit is contained in:
dependabot-preview[bot]
2019-08-28 21:24:45 +00:00
committed by GitHub
2 changed files with 5 additions and 5 deletions

8
package-lock.json generated
View File

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

View File

@@ -84,7 +84,7 @@
"vue-template-compiler": "^2.6.10",
"webpack": "^4.39.2",
"webpack-cli": "^3.3.7",
"webpack-merge": "^4.2.1"
"webpack-merge": "^4.2.2"
},
"jest": {
"moduleFileExtensions": [