Revert "Use Node's spawn behavior except default to a shell on Windows"

This reverts commit 9e7833c.

packages/react-dev-utils/crossSpawn.js

@@ -7,52 +7,6 @@
 
 'use strict';
 
-const { spawn, spawnSync } = require('child_process');
-
-// Based on Node's internal normalizeSpawnArguments
-// See https://github.com/nodejs/node/blob/97ba69f91543f89d389a4f3fef57c5c6c734df34/lib/child_process.js#L378-L489
-function normalizeSpawnArguments(file, args, options) {
-  if (typeof file !== 'string' || file.length === 0) {
-    throw new TypeError('"file" argument must be a non-empty string');
-  }
-
-  if (Array.isArray(args)) {
-    args = args.slice(0);
-  } else if (
-    args !== undefined &&
-    (args === null || typeof args !== 'object')
-  ) {
-    throw new TypeError('Incorrect value of args option');
-  } else {
-    options = args;
-    args = [];
-  }
-
-  if (options === undefined) {
-    options = {};
-  } else if (options === null || typeof options !== 'object') {
-    throw new TypeError('"options" argument must be an object');
-  }
-
-  // Make a shallow copy so we don't clobber the user's options object.
-  options = Object.assign({}, options);
-
-  // Default to using a shell on Windows
-  if (options.shell === undefined && process.platform === 'win32') {
-    options.shell = true;
-  }
-
-  return { file, args, options };
-}
-
-function crossSpawn(file, args, options) {
-  ({ file, args, options } = normalizeSpawnArguments(file, args, options));
-  return spawn(file, args, options);
-}
-
-crossSpawn.sync = function crossSpawnSync(file, args, options) {
-  ({ file, args, options } = normalizeSpawnArguments(file, args, options));
-  return spawnSync(file, args, options);
-};
+var crossSpawn = require('cross-spawn');
 
 module.exports = crossSpawn;

packages/react-dev-utils/openBrowser.js

@@ -9,7 +9,7 @@
 
 var chalk = require('chalk');
 var execSync = require('child_process').execSync;
-var spawn = require('./crossSpawn');
+var spawn = require('cross-spawn');
 var opn = require('opn');
 
 // https://github.com/sindresorhus/opn#app

packages/react-dev-utils/package.json

@@ -39,6 +39,7 @@
     "address": "1.0.3",
     "babel-code-frame": "6.26.0",
     "chalk": "1.1.3",
+    "cross-spawn": "5.1.0",
     "detect-port-alt": "1.1.3",
     "escape-string-regexp": "1.0.5",
     "filesize": "3.5.11",

packages/react-scripts/scripts/eject.js

@@ -48,7 +48,7 @@ function adjustPackages(cwd, packages, append, dev) {
   let status, output;
   if (fs.existsSync(paths.yarnLockFile)) {
     ({ status, output } = spawnSync(
-      'yarnpkg',
+      process.platform === 'win32' ? 'yarn.cmd' : 'yarnpkg',
       [append ? 'add' : 'remove', ...packages],
       {
         stdio: 'pipe',