fix(webpack): get INSPECT_ENABLED from process.env

Metnew · Feb 19, 2018 · 88fded3 · 88fded3
1 parent 137c964
commit 88fded3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/webpack_config/config.js b/webpack_config/config.js
@@ -12,7 +12,8 @@ const {
 	ANALYZE_BUNDLE,
 	SENTRY_DSN,
 	PORT = 3000,
-	HOST = 'localhost'
+	HOST = 'localhost',
+	INSPECT_ENABLED = true
 } = process.env
 
 // Paths
@@ -41,6 +42,7 @@ export default {
 	SENTRY_DSN,
 	PORT,
 	HOST,
+	INSPECT_ENABLED,
 	// Client's webpack-dev-server port
 	DEV_SERVER_PORT,
 	// Paths

diff --git a/webpack_config/devServer.js b/webpack_config/devServer.js
@@ -9,10 +9,6 @@ import client from './client/webpack.dev.babel'
 import server from './server/webpack.dev.babel'
 
 const {DEV_SERVER_PORT} = config
-if (process.argv.includes('--inspect')) {
-	process.env.INSPECT_ENABLED = true
-}
-
 const serverCompiler = compile(server)
 
 // Start our server webpack instance in watch mode.

diff --git a/webpack_config/server/webpack.dev.babel.js b/webpack_config/server/webpack.dev.babel.js
@@ -3,12 +3,14 @@ import StartServerPlugin from 'start-server-webpack-plugin'
 import webpack from 'webpack'
 import config from '../config'
 
-const {CLIENT_ASSETS_MANIFEST} = config
+const {CLIENT_ASSETS_MANIFEST, INSPECT_ENABLED} = config
+const inspectEnabled = INSPECT_ENABLED ? ['--inspect'] : []
+const nodeArgs = ['-r', 'source-map-support/register', ...inspectEnabled]
 const plugins = [
 	new webpack.HotModuleReplacementPlugin(),
 	new StartServerPlugin({
 		name: 'index.js',
-		nodeArgs: process.env.INSPECT_ENABLED ? ['--inspect'] : []
+		nodeArgs
 	}),
 	// Ignore assets.json to avoid infinite recompile bug
 	new webpack.WatchIgnorePlugin([CLIENT_ASSETS_MANIFEST])