From aa6ff2e87d2d4e2318eaa7bccb414275b64bc1a8 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 13 Nov 2022 23:19:11 +0000
Subject: [PATCH] fix test env

---
 config/test.env.js      | 2 +-
 test/unit/karma.conf.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/test.env.js b/config/test.env.js
index 89f90deb..646a6ef8 100644
--- a/config/test.env.js
+++ b/config/test.env.js
@@ -1,4 +1,4 @@
-var merge = require('webpack-merge')
+var { merge } = require('webpack-merge')
 var devEnv = require('./dev.env')
 
 module.exports = merge(devEnv, {
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index 45d74f14..37c39e6d 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -4,7 +4,7 @@
 //   https://github.com/webpack/karma-webpack
 
 // var path = require('path')
-var merge = require('webpack-merge')
+var { merge } = require('webpack-merge')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 var baseConfig = require('../../build/webpack.base.conf')
 var utils = require('../../build/utils')
@@ -16,7 +16,7 @@ var webpackConfig = merge(baseConfig, {
   module: {
     rules: utils.styleLoaders()
   },
-  devtool: '#inline-source-map',
+  devtool: 'inline-source-map',
   // vue: {
   //   loaders: {
   //     js: 'isparta'