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

github.com/nextcloud/twofactor_totp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2021-01-19 23:26:35 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2021-01-20 10:18:59 +0300
commitb3b8e67bb2a75557b8d294ed6991422e1a10f4ea (patch)
treeee6e35f948183ddc2e2fb83eba8b0ca82dcf2405 /src
parent4e07c9d439269cc2b56d3d8677094b015af8ef61 (diff)
Bump webpack-merge from 4.2.2 to 5.7.3
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.7.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'src')
-rw-r--r--src/webpack.dev.js2
-rw-r--r--src/webpack.prod.js2
-rw-r--r--src/webpack.test.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/webpack.dev.js b/src/webpack.dev.js
index 451c793..42c4c9b 100644
--- a/src/webpack.dev.js
+++ b/src/webpack.dev.js
@@ -1,4 +1,4 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
diff --git a/src/webpack.prod.js b/src/webpack.prod.js
index 07cb994..f64cdb8 100644
--- a/src/webpack.prod.js
+++ b/src/webpack.prod.js
@@ -1,4 +1,4 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
diff --git a/src/webpack.test.js b/src/webpack.test.js
index b0621ad..2463f5d 100644
--- a/src/webpack.test.js
+++ b/src/webpack.test.js
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
const common = require('./webpack.common.js')
const nodeExternals = require('webpack-node-externals')