summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-02-10 21:12:44 +0100
committerGitHub <noreply@github.com>2019-02-10 21:12:44 +0100
commita62924af47a428aa7811e9070d764d6755d21a53 (patch)
tree52dfa486de20ff92aa849098495edeb50af86436
parentd4cf0bdb6ac8ab5048eac7992bd70a3f0666dbb1 (diff)
parentcd674c384bd983065497d78c6924a48b65728657 (diff)
downloadnextcloud-server-a62924af47a428aa7811e9070d764d6755d21a53.tar.gz
nextcloud-server-a62924af47a428aa7811e9070d764d6755d21a53.zip
Merge pull request #14119 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.29.3
Bump webpack from 4.29.1 to 4.29.3 in /settings
-rw-r--r--settings/package-lock.json47
-rw-r--r--settings/package.json2
2 files changed, 12 insertions, 37 deletions
diff --git a/settings/package-lock.json b/settings/package-lock.json
index cf4f9607d9a..54f7d11b982 100644
--- a/settings/package-lock.json
+++ b/settings/package-lock.json
@@ -983,9 +983,9 @@
"dev": true
},
"acorn": {
- "version": "6.0.7",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.7.tgz",
- "integrity": "sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+ "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
"dev": true
},
"acorn-dynamic-import": {
@@ -2589,26 +2589,13 @@
}
},
"flush-write-stream": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.0.tgz",
- "integrity": "sha512-6MHED/cmsyux1G4/Cek2Z776y9t7WCNd3h2h/HW91vFeU7pzMhA8XvAlDhHcanG5IWuIh/xcC7JASY4WQpG6xg==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
- "readable-stream": "^3.1.1"
- },
- "dependencies": {
- "readable-stream": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
- "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
- "dev": true,
- "requires": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- }
- }
+ "readable-stream": "^2.3.6"
}
},
"follow-redirects": {
@@ -6830,9 +6817,9 @@
}
},
"webpack": {
- "version": "4.29.1",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.1.tgz",
- "integrity": "sha512-dY3KyQIVeg6cDPj9G5Bnjy9Pt9SoCpbNWl0RDKHstbd3MWe0dG9ri4RQRpCm43iToy3zoA1IMOpFkJ8Clnc7FQ==",
+ "version": "4.29.3",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.3.tgz",
+ "integrity": "sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.7.11",
@@ -6854,23 +6841,11 @@
"mkdirp": "~0.5.0",
"neo-async": "^2.5.0",
"node-libs-browser": "^2.0.0",
- "schema-utils": "^0.4.4",
+ "schema-utils": "^1.0.0",
"tapable": "^1.1.0",
"terser-webpack-plugin": "^1.1.0",
"watchpack": "^1.5.0",
"webpack-sources": "^1.3.0"
- },
- "dependencies": {
- "schema-utils": {
- "version": "0.4.7",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
- "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
- "dev": true,
- "requires": {
- "ajv": "^6.1.0",
- "ajv-keywords": "^3.1.0"
- }
- }
}
},
"webpack-cli": {
diff --git a/settings/package.json b/settings/package.json
index 26d7455f7c8..a3e6ab8f218 100644
--- a/settings/package.json
+++ b/settings/package.json
@@ -42,7 +42,7 @@
"sass-loader": "^7.1.0",
"vue-loader": "^15.6.2",
"vue-template-compiler": "^2.5.22",
- "webpack": "^4.29.1",
+ "webpack": "^4.29.3",
"webpack-cli": "^3.2.3",
"webpack-merge": "^4.2.1"
}