Merge pull request #18 from Chassis/fix-path

Fix PATH used for running binaries

Author: Bronson Quick

config/webpack.config.dev.js

@@ -90,7 +90,8 @@ module.exports = {
     alias: {
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web'
+      'react-native': 'react-native-web',
+      'spawn-sync': path.join( paths.appSrc, 'lib', 'spawn-sync.js' ),
     }
   },
 

config/webpack.config.prod.js

@@ -86,7 +86,8 @@ module.exports = {
     alias: {
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web'
+      'react-native': 'react-native-web',
+      'spawn-sync': path.join( paths.appSrc, 'lib', 'spawn-sync.js' ),
     }
   },
 

package.json

@@ -16,7 +16,6 @@
     "case-sensitive-paths-webpack-plugin": "1.1.4",
     "chalk": "1.1.3",
     "connect-history-api-fallback": "1.3.0",
-    "cross-spawn": "4.0.0",
     "css-loader": "0.24.0",
     "deepmerge": "^1.3.1",
     "detect-port": "1.0.0",
@@ -36,6 +35,7 @@
     "file-loader": "0.9.0",
     "filesize": "3.3.0",
     "find-cache-dir": "0.1.1",
+    "fix-path": "^2.1.0",
     "font-awesome": "^4.6.3",
     "fs-extra": "0.30.0",
     "gzip-size": "3.0.0",

src/lib/configure.js

@@ -2,6 +2,7 @@
  * Setup for global handlers.
  */
 import ansiHTML from 'ansi-html';
+import fixPath from 'fix-path';
 import which from 'which';
 
 import * as actions from './actions';
@@ -22,6 +23,9 @@ export default store => {
 	window.keyHandler = new Keys();
 	window.keyHandler.listen( store );
 
+	// Fix the process.env path, which isn't inherited by the shell on macOS.
+	fixPath();
+
 	if ( ! state.installer.installed.chassis ) {
 		// Search for installed applications.
 		which( 'vagrant', err => {

src/lib/spawn-sync.js

@@ -0,0 +1,13 @@
+// fix-path internally uses some modules, which at the end of the day use
+// cross-spawn.
+//
+// Internally, this uses child_process.spawnSync if available (Node 0.11+), but
+// conditionally loads the spawn-sync module for compatibility. However, webpack
+// complains if the module isn't available.
+//
+// We fake this via a webpack alias to this module, as we know the Electron
+// environment always has this available. This file could actually be left
+// blank because it's never loaded, but just in case another module is using it:
+
+import child from 'child_process';
+export default child.spawnSync;