summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordependabot[bot] <support@dependabot.com>2018-12-10 02:17:11 +0000
committerdependabot[bot] <support@dependabot.com>2018-12-10 02:17:11 +0000
commit2265751ccbc906685088c007b248779aec785574 (patch)
tree623c04c855fea577c5eca58b72598bce72416afe /apps
parent386875cabe0fbc1a44efe7dd64dbc04ad43243d0 (diff)
downloadnextcloud-server-2265751ccbc906685088c007b248779aec785574.tar.gz
nextcloud-server-2265751ccbc906685088c007b248779aec785574.zip
Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/updatenotification
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/updatenotification/package-lock.json25
-rw-r--r--apps/updatenotification/package.json2
2 files changed, 16 insertions, 11 deletions
diff --git a/apps/updatenotification/package-lock.json b/apps/updatenotification/package-lock.json
index b3fa7400dd0..a9376ac5c2d 100644
--- a/apps/updatenotification/package-lock.json
+++ b/apps/updatenotification/package-lock.json
@@ -1601,7 +1601,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -2016,7 +2017,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2072,6 +2074,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2115,12 +2118,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -2660,9 +2665,9 @@
}
},
"lodash": {
- "version": "4.17.10",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
- "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
"dev": true
},
"lodash.debounce": {
@@ -4490,9 +4495,9 @@
}
},
"webpack-merge": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
- "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
+ "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"dev": true,
"requires": {
"lodash": "^4.17.5"
diff --git a/apps/updatenotification/package.json b/apps/updatenotification/package.json
index 68dd9784c3a..2fc3c518a3e 100644
--- a/apps/updatenotification/package.json
+++ b/apps/updatenotification/package.json
@@ -35,6 +35,6 @@
"vue-template-compiler": "^2.5.17",
"webpack": "^4.27.1",
"webpack-cli": "^3.1.2",
- "webpack-merge": "^4.1.4"
+ "webpack-merge": "^4.1.5"
}
}