fixes production builds

Datawheel · Apr 26, 2017 · 69dc785 · 69dc785
1 parent 0064ae4
commit 69dc785
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/bin/server.js b/bin/server.js
@@ -6,16 +6,18 @@ const helmet = require("helmet");
 const path = require("path");
 const webpack = require("webpack");
 
-console.log("\n\n📂  Gathering resources\n");
-const appDir = process.cwd();
-const resolve = require("../webpack/resolve");
-const store = resolve("store.js") || {};
-const headerConfig = resolve("helmet.js") || {};
 const NODE_ENV = process.env.NODE_ENV || "development";
 const PORT = process.env.PORT || 3300;
 const ATTRS = process.env.ATTRS;
 const API = process.env.API;
 
+console.log("\n\n📂  Gathering resources\n");
+const appDir = process.cwd();
+const joiner = NODE_ENV === "development" ? "../" : "";
+const resolve = require(path.join(__dirname, joiner, "webpack/require-fallback"));
+const store = resolve("store.js") || {};
+const headerConfig = resolve("helmet.js") || {};
+
 const i18n = require("i18next");
 const Backend = require("i18next-node-fs-backend");
 const i18nMiddleware = require("i18next-express-middleware");

diff --git a/webpack/resolve.js → webpack/require-fallback.js b/webpack/resolve.js → webpack/require-fallback.js
diff --git a/webpack/webpack.config.dev-client.js b/webpack/webpack.config.dev-client.js
@@ -5,7 +5,7 @@ const webpack = require("webpack");
 const assetsPath = path.join(appDir, "static", "assets");
 const publicPath = "/assets/";
 const appPath = path.join(appDir, "app");
-const variables = require("./resolve")("style.js") || {};
+const variables = require("./require-fallback")("style.js") || {};
 
 const hotMiddlewareScript = "webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000&reload=true";
 

diff --git a/webpack/webpack.config.prod.js b/webpack/webpack.config.prod.js
@@ -5,7 +5,7 @@ const webpack = require("webpack");
 const assetsPath = path.join(appDir, "static", "assets");
 const publicPath = "/assets/";
 const appPath = path.join(appDir, "app");
-const variables = require("./resolve")("style.js") || {};
+const variables = require("./require-fallback")("style.js") || {};
 
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const InlineEnviromentVariablesPlugin = require("inline-environment-variables-webpack-plugin");