From 953a8ab5d63b5f484da5b6fbef155aa22bc2effa Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Mon, 12 Sep 2016 23:40:25 -0700
Subject: [PATCH] Define `WEBPACK_PUBLIC_PATH` in webpack.config.js

Move WEBPACK_PUBLIC_PATH back to webpack.config.js

- Reverses a change made in 10899cf
- Closes #1718
---
 assets/build/webpack.config.js       | 5 +++++
 assets/build/webpack.config.watch.js | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/build/webpack.config.js b/assets/build/webpack.config.js
index 7073812..7e1ad1f 100644
--- a/assets/build/webpack.config.js
+++ b/assets/build/webpack.config.js
@@ -154,6 +154,11 @@ const webpackConfig = {
       Tether: 'tether',
       'window.Tether': 'tether',
     }),
+    new webpack.DefinePlugin({
+      WEBPACK_PUBLIC_PATH: (config.enabled.watcher)
+        ? JSON.stringify(config.publicPath)
+        : false,
+    }),
     new webpack.LoaderOptionsPlugin({
       minimize: config.enabled.minify,
       debug: config.enabled.watcher,
diff --git a/assets/build/webpack.config.watch.js b/assets/build/webpack.config.watch.js
index 6f68603..807466b 100644
--- a/assets/build/webpack.config.watch.js
+++ b/assets/build/webpack.config.watch.js
@@ -11,9 +11,6 @@ module.exports = {
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
-    new webpack.DefinePlugin({
-      WEBPACK_PUBLIC_PATH: JSON.stringify(config.publicPath),
-    }),
     new BrowserSyncPlugin({
       target: config.devUrl,
       publicPath: config.publicPath,