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

Merge pull request #2649 from nextcloud/dependabot/npm_and_yarn/master/webpack-merge-5.6.1

Browse Source 
Bump webpack-merge from 5.4.0 to 5.6.1
This commit is contained in:
Julius Härtl
2020-12-14 13:32:09 +01:00
committed by GitHub
parent e9a85f31f8 5ed8cef229
commit 189a89cf6a
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

@@ -22224,9 +22224,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "5.4.0", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz",
"integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==", "integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==",
"dev": true, "dev": true,
"requires": { "requires": {
"clone-deep": "^4.0.1", "clone-deep": "^4.0.1",

2
package.json
View File

@@ -110,7 +110,7 @@
"webpack": "^4.44.2", "webpack": "^4.44.2",
"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.4.0" "webpack-merge": "^5.6.1"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [