ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2303 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.4

Browse Source 
Bump webpack-merge from 5.1.2 to 5.1.4
This commit is contained in:
Julius Härtl
2020-09-17 13:32:59 +02:00
committed by GitHub
parent a41e2e2aae b8c8970cd1
commit 8afcae42fa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -20170,9 +20170,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "5.1.2", "version": "5.1.4",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.2.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
"integrity": "sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==", "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"clone-deep": "^4.0.1", "clone-deep": "^4.0.1",

2
package.json
View File

@@ -109,7 +109,7 @@
"webpack": "^4.44.1", "webpack": "^4.44.1",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0", "webpack-dev-server": "^3.11.0",
"webpack-merge": "^5.1.2" "webpack-merge": "^5.1.4"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [