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

Merge pull request #22365 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.2 

Bump webpack-merge from 5.1.1 to 5.1.2
This commit is contained in:
Roeland Jago Douma 2020-08-24 09:12:45 +02:00 committed by GitHub
parent 7b7cbe6f36 e1742c6701
commit 7fb1e44b53
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

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

2
package.json
View File

@ -125,7 +125,7 @@
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"webpack": "^4.44.1", "webpack": "^4.44.1",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-merge": "^5.1.1", "webpack-merge": "^5.1.2",
"webpack-node-externals": "^2.5.1" "webpack-node-externals": "^2.5.1"
}, },
"browserslist": [ "browserslist": [