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

Merge pull request #2183 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1

Browse Source 
Bump webpack-merge from 5.1.0 to 5.1.1
This commit is contained in:
Julius Härtl
2020-08-18 22:07:44 +02:00
committed by GitHub
parent ce518e6246 8426bd7e3f
commit 98d31ec6c6
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

@@ -22081,9 +22081,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "5.1.0", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.0.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz",
"integrity": "sha512-NNEXYSV/ixLwICcAhlVQ8c8E8dHmOcVnubfhoFdL6Tpbq6N9ZUvotQBYPwTsyXepXmCm34KjXgdC4PCQwJBp/w==", "integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==",
"dev": true, "dev": true,
"requires": { "requires": {
"clone-deep": "^4.0.1", "clone-deep": "^4.0.1",

2
package.json
View File

@@ -108,7 +108,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.0" "webpack-merge": "^5.1.1"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [