summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2019-07-21 17:54:34 -0100
committerGitHub <noreply@github.com>2019-07-21 17:54:34 -0100
commit1897e08e60795bded281624837c5ae7b481f5181 (patch)
tree522fd00f27eb2dd9301c5d7eb4ba671a4fa0aff9
parent8dad209262e96f86d56f7c6ff0b1066358abeeff (diff)
parent1f96e11d955947c0dd6b0b00cdc4a6490fce85a2 (diff)
Merge pull request #648 from nextcloud/dependabot/npm_and_yarn/webpack-4.36.1
Bump webpack from 4.35.3 to 4.36.1
-rw-r--r--package-lock.json6
-rw-r--r--package.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json
index 22f17979..c6ebd5bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14709,9 +14709,9 @@
"dev": true
},
"webpack": {
- "version": "4.35.3",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz",
- "integrity": "sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==",
+ "version": "4.36.1",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz",
+ "integrity": "sha512-Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
diff --git a/package.json b/package.json
index 0d96c232..69f301da 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
"vue-loader": "^15.7.1",
"vue-style-loader": "^4.1.1",
"vue-template-compiler": "^2.6.10",
- "webpack": "^4.35.2",
+ "webpack": "^4.36.1",
"webpack-cli": "^3.3.6",
"webpack-merge": "^4.2.1"
},