Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-09-14 18:46:54 +0300
committerGitHub <noreply@github.com>2020-09-14 18:46:54 +0300
commitd539590f6d4142d91abc78d1f722455d4d12c3ca (patch)
tree0bd9a39452a7f64bb1faf41160a09b587c6626a4
parentda39f8cc2553869440c04e71d14e06e3bedecede (diff)
Bump webpack-merge from 5.1.2 to 5.1.4
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.2 to 5.1.4. - [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/compare/v5.1.2...v5.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
-rw-r--r--package-lock.json19
-rw-r--r--package.json2
2 files changed, 14 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json
index 5013d7ef..50c90f19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -183,9 +183,9 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
}
}
},
@@ -1118,6 +1118,13 @@
"@babel/types": "^7.11.5",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+ }
}
},
"@babel/helper-function-name": {
@@ -11746,9 +11753,9 @@
}
},
"webpack-merge": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz",
- "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==",
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
+ "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index b5b65181..9dc05e59 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,6 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.1.3"
+ "webpack-merge": "^5.1.4"
}
}