Merge pull request #10064 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.14.0

This commit is contained in:
dependabot[bot] 2018-06-30 07:20:21 +00:00 committed by GitHub
commit 99e6191dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 35 deletions

View File

@ -2600,8 +2600,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -3016,8 +3015,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -3073,7 +3071,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -3117,14 +3114,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
@ -3695,23 +3690,6 @@
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
"dev": true "dev": true
}, },
"is-odd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
"integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
"dev": true,
"requires": {
"is-number": "^4.0.0"
},
"dependencies": {
"is-number": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
"dev": true
}
}
},
"is-plain-obj": { "is-plain-obj": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@ -4153,9 +4131,9 @@
"optional": true "optional": true
}, },
"nanomatch": { "nanomatch": {
"version": "1.2.9", "version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
"integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
"dev": true, "dev": true,
"requires": { "requires": {
"arr-diff": "^4.0.0", "arr-diff": "^4.0.0",
@ -4163,7 +4141,6 @@
"define-property": "^2.0.2", "define-property": "^2.0.2",
"extend-shallow": "^3.0.2", "extend-shallow": "^3.0.2",
"fragment-cache": "^0.2.1", "fragment-cache": "^0.2.1",
"is-odd": "^2.0.0",
"is-windows": "^1.0.2", "is-windows": "^1.0.2",
"kind-of": "^6.0.2", "kind-of": "^6.0.2",
"object.pick": "^1.3.0", "object.pick": "^1.3.0",
@ -6382,9 +6359,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "4.12.2", "version": "4.14.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.12.2.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz",
"integrity": "sha512-qgZAR7T+pvvKSO62gn8kdn+lDeqAH4eyjaUMeLUx4BS/wQghFFCw/JamWhNJ2d95tTOSS130h2WNiNr+Ff3J+A==", "integrity": "sha512-CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@webassemblyjs/ast": "1.5.12", "@webassemblyjs/ast": "1.5.12",
@ -6397,7 +6374,7 @@
"ajv": "^6.1.0", "ajv": "^6.1.0",
"ajv-keywords": "^3.1.0", "ajv-keywords": "^3.1.0",
"chrome-trace-event": "^1.0.0", "chrome-trace-event": "^1.0.0",
"enhanced-resolve": "^4.0.0", "enhanced-resolve": "^4.1.0",
"eslint-scope": "^3.7.1", "eslint-scope": "^3.7.1",
"json-parse-better-errors": "^1.0.2", "json-parse-better-errors": "^1.0.2",
"loader-runner": "^2.3.0", "loader-runner": "^2.3.0",
@ -6412,6 +6389,19 @@
"uglifyjs-webpack-plugin": "^1.2.4", "uglifyjs-webpack-plugin": "^1.2.4",
"watchpack": "^1.5.0", "watchpack": "^1.5.0",
"webpack-sources": "^1.0.1" "webpack-sources": "^1.0.1"
},
"dependencies": {
"enhanced-resolve": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
"integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"memory-fs": "^0.4.0",
"tapable": "^1.0.0"
}
}
} }
}, },
"webpack-cli": { "webpack-cli": {

View File

@ -36,7 +36,7 @@
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"vue-loader": "^15.2.4", "vue-loader": "^15.2.4",
"vue-template-compiler": "^2.5.16", "vue-template-compiler": "^2.5.16",
"webpack": "^4.12.2", "webpack": "^4.14.0",
"webpack-cli": "^3.0.8", "webpack-cli": "^3.0.8",
"webpack-merge": "^4.1.3" "webpack-merge": "^4.1.3"
} }