From 25349889bd447d0a5d728e044abc953145674102 Mon Sep 17 00:00:00 2001
From: PC Drew <pc@thedrews.net>
Date: Wed, 16 Nov 2016 14:48:28 -0700
Subject: [PATCH 1/3] Remove dependency on node-inspector because builds are
 failing when coupled with recent versions of nodejs (like v7.1.0).  Update
 Travis to use stable versions of node.

---
 .travis.yml                                   | 2 +-
 packages/react-server-test-pages/package.json | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bed74325e..20525a5a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 6
+  - node
 cache:
   directories:
     - node_modules
diff --git a/packages/react-server-test-pages/package.json b/packages/react-server-test-pages/package.json
index fe1438039..2be3f12a4 100644
--- a/packages/react-server-test-pages/package.json
+++ b/packages/react-server-test-pages/package.json
@@ -8,7 +8,6 @@
     "prepublish": "gulp build",
     "start": "react-server start",
     "test": "gulp test",
-    "debug": "node-debug --debug-brk=0 -p 9000 react-server start",
     "clean": "rimraf npm-debug.log* __clientTemp target"
   },
   "author": "Bo Borgerson",
@@ -30,7 +29,6 @@
     "eslint": "^3.8.1",
     "gulp": "^3.9.1",
     "gulp-eslint": "^3.0.1",
-    "node-inspector": "^0.12.8",
     "rimraf": "^2.5.4",
     "gulp-nsp": "^2.4.2"
   }

From be7d492f51b1b02e31f0ad2946ac2b6f9fdda53d Mon Sep 17 00:00:00 2001
From: PC Drew <pc@thedrews.net>
Date: Wed, 16 Nov 2016 14:50:00 -0700
Subject: [PATCH 2/3] Add ability to properly handle filenames with bad
 characters (spaces, single quotes, etc) in them while executing the
 generator-react-server tests to install dependencies with npm.  We get lazy
 with Mac OS X and have poorly named folder structures that don't work well
 when executing shell scripts.

---
 packages/generator-react-server/package.json | 3 ++-
 packages/generator-react-server/test/app.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/generator-react-server/package.json b/packages/generator-react-server/package.json
index e62dc3f99..cd1cfc630 100644
--- a/packages/generator-react-server/package.json
+++ b/packages/generator-react-server/package.json
@@ -37,7 +37,8 @@
     "yeoman-test": "^1.0.0",
     "babel-eslint": "^7.0.0",
     "eslint": "^3.8.1",
-    "eslint-plugin-react": "^6.4.1"
+    "eslint-plugin-react": "^6.4.1",
+	"shell-escape": "^0.2.0"
   },
   "repository": "redfin/react-server",
   "scripts": {
diff --git a/packages/generator-react-server/test/app.js b/packages/generator-react-server/test/app.js
index 763ecaa0f..fa6a6423b 100644
--- a/packages/generator-react-server/test/app.js
+++ b/packages/generator-react-server/test/app.js
@@ -4,6 +4,7 @@ import path from 'path';
 import test from 'ava';
 import helpers from 'yeoman-test';
 import { defaultOptions } from 'react-server-cli';
+import shellescape from 'shell-escape';
 
 test('generator-react-server:app creates default files', async t => {
 	let testDir;
@@ -129,7 +130,7 @@ function installDeps() {
 			} else {
 				const localDeps = ['react-server-cli', 'react-server']
 					.map(dep => path.resolve(path.join(__dirname, '../..', dep)));
-				cp.exec('npm install ' + localDeps.join(' '), (error) => {
+				cp.exec(shellescape(['npm', 'install'].concat(localDeps)), (error) => {
 					if (error) {
 						reject(error);
 					} else {

From 0d0229aaa738042c365621c6a7ce704b01dc5553 Mon Sep 17 00:00:00 2001
From: PC Drew <pc@thedrews.net>
Date: Fri, 18 Nov 2016 10:45:12 -0700
Subject: [PATCH 3/3] fix indentation error.

---
 packages/generator-react-server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/generator-react-server/package.json b/packages/generator-react-server/package.json
index cd1cfc630..e720a95b2 100644
--- a/packages/generator-react-server/package.json
+++ b/packages/generator-react-server/package.json
@@ -38,7 +38,7 @@
     "babel-eslint": "^7.0.0",
     "eslint": "^3.8.1",
     "eslint-plugin-react": "^6.4.1",
-	"shell-escape": "^0.2.0"
+    "shell-escape": "^0.2.0"
   },
   "repository": "redfin/react-server",
   "scripts": {