mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Bump webpack-merge from 5.4.0 to 5.6.1
This commit is contained in:
Roeland Jago Douma 2020-12-15 08:36:57 +01:00 committed by GitHub
parent 8d3fcdb5b4 a9b0a4e307
commit 050fa4a746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

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

2
package.json
View File

@ -127,7 +127,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^4.2.0",
"webpack-merge": "^5.4.0",
"webpack-merge": "^5.6.1",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [