From 7b797aff4384f9cf3075c826c85789a07b982db2 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Tue, 5 Oct 2021 00:26:00 -0400
Subject: [PATCH] Fix webpack dev server checks

---
 webpack.common.js | 4 ++++
 webpack.dev.js    | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/webpack.common.js b/webpack.common.js
index b09bb95351..99f7272fd3 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -2,6 +2,7 @@ const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const { DefinePlugin } = require('webpack');
 
 const Assets = [
     'native-promise-only/npo.js',
@@ -30,6 +31,9 @@ module.exports = {
         ]
     },
     plugins: [
+        new DefinePlugin({
+            __WEBPACK_SERVE__: JSON.stringify(!!process.env.WEBPACK_SERVE)
+        }),
         new CleanWebpackPlugin(),
         new HtmlWebpackPlugin({
             filename: 'index.html',
diff --git a/webpack.dev.js b/webpack.dev.js
index 4dc76aee3c..890dd0eac6 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,6 +1,5 @@
 const common = require('./webpack.common');
 const { merge } = require('webpack-merge');
-const { DefinePlugin } = require('webpack');
 
 module.exports = merge(common, {
     // In order for live reload to work we must use "web" as the target not "browserlist"
@@ -24,11 +23,6 @@ module.exports = merge(common, {
             }
         ]
     },
-    plugins: [
-        new DefinePlugin({
-            __WEBPACK_SERVE__: true
-        })
-    ],
     devServer: {
         compress: true,
         client: {