Fixing messy merge conflict

1 files changed, 26 insertions, 18 deletions

diff --git a/webpack.config.js b/webpack.config.js
index f692749..0c16db4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -11,12 +11,17 @@ module.exports = {
   entry: {
     ui: './webAO/ui.js',
     client: './webAO/client.js',
-    master: './webAO/master.js',
+    master: './webAO/master.js'
   },
-  output: {
-    path: path.resolve(__dirname, 'webAO'),
-    filename: '[name].b.js',
+  devtool: 'source-map',
+  devServer: {
+    static: {
+      directory: path.join(__dirname, 'webAO'),
+    },
+    compress: true,
+    port: 8080,
   },
+  mode: 'production',
   module: {
     rules: [
       {
@@ -30,19 +35,23 @@ module.exports = {
                 '@babel/preset-env', {
                   useBuiltIns: 'usage',
                   targets: [
-                    'defaults',
-                    'Safari > 3',
-                    'Opera > 8',
-                    'Android > 3',
+                    "defaults",
+                    "Safari > 3",
+                    "Opera > 8",
+                    "Android > 3"
                   ],
-                  corejs: 3,
-                },
-              ],
-            ],
-          },
-        },
-      },
-    ],
+                  corejs: 3
+                }
+              ]
+            ]
+          }
+        }
+      }
+    ]
+  },
+  output: {
+    path: path.resolve(__dirname, 'webAO'),
+    filename: '[name].b.js'
   },
   performance: {
     hints: false,
@@ -54,6 +63,5 @@ module.exports = {
       'process.env': JSON.stringify(process.env)
     })
   ],
-  devtool: 'source-map',
-  mode: 'production',
+
 };