Merge pull request #221 from nextcloud/dependabot/npm_and_yarn/webpack-merge-4.1.5

Bump webpack-merge from 4.1.4 to 4.1.5
pull/224/head
Maxence Lange 2018-12-13 08:50:44 -01:00 zatwierdzone przez GitHub
commit 719b03d9dd
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 4 dodań i 4 usunięć

6
package-lock.json wygenerowano
Wyświetl plik

@ -12618,9 +12618,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "4.1.4", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
"integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.5" "lodash": "^4.17.5"

Wyświetl plik

@ -87,7 +87,7 @@
"vue-template-compiler": "^2.5.21", "vue-template-compiler": "^2.5.21",
"webpack": "^4.27.1", "webpack": "^4.27.1",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.2" "webpack-merge": "^4.1.5"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [