chore: bumped deps and fixed eslint (#622)

OpenZWave · Jul 14, 2020 · 34d2282 · 34d2282
1 parent 7fe91b5
commit 34d2282
Show file tree

Hide file tree

Showing 6 changed files with 1,462 additions and 1,780 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,7 +4,8 @@ module.exports = {
   root: true,
   env: {
     browser: true,
-    mocha: true
+    mocha: true,
+    node: true
   },
   extends: [
     // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention

diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
@@ -3,7 +3,7 @@ const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
 const appConfig = require('../config/webConfig')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const path = require('path')
 const baseWebpackConfig = require('./webpack.base.conf')
 const CopyWebpackPlugin = require('copy-webpack-plugin')

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -3,7 +3,7 @@ const path = require('path')
 const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const baseWebpackConfig = require('./webpack.base.conf')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')

diff --git a/config/dev.env.js b/config/dev.env.js
@@ -1,5 +1,5 @@
 'use strict'
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const prodEnv = require('./prod.env')
 const appConfig = require('./app.js')