Move utils into scripts folder (for inclusion in ejection)

Author: djgrant

packages/react-scripts/scripts/eject.js

@@ -14,7 +14,7 @@ var spawnSync = require('cross-spawn').sync;
 var chalk = require('chalk');
 var prompt = require('react-dev-utils/prompt');
 var paths = require('../config/paths');
-var createJestConfig = require('../utils/createJestConfig');
+var createJestConfig = require('./utils/createJestConfig');
 
 var green = chalk.green;
 var cyan = chalk.cyan;
@@ -48,7 +48,8 @@ prompt(
   var folders = [
     'config',
     'config/jest',
-    'scripts'
+    'scripts',
+    'scripts/utils'
   ];
 
   // Make shallow array of files paths

packages/react-scripts/scripts/start.js

@@ -29,8 +29,8 @@ var prompt = require('react-dev-utils/prompt');
 var paths = require('../config/paths');
 var config = require('../config/webpack.config.dev');
 var devServerConfig = require('../config/webpackDevServer.config');
-var createWebpackCompiler = require('../utils/createWebpackCompiler');
-var addWebpackMiddleware = require('../utils/addWebpackMiddleware');
+var createWebpackCompiler = require('./utils/createWebpackCompiler');
+var addWebpackMiddleware = require('./utils/addWebpackMiddleware');
 
 var useYarn = fs.existsSync(paths.yarnLockFile);
 var cli = useYarn ? 'yarn' : 'npm';

packages/react-scripts/scripts/test.js

@@ -28,7 +28,7 @@ if (!process.env.CI && argv.indexOf('--coverage') < 0) {
 
 // @remove-on-eject-begin
 // This is not necessary after eject because we embed config into package.json.
-const createJestConfig = require('../utils/createJestConfig');
+const createJestConfig = require('./utils/createJestConfig');
 const path = require('path');
 const paths = require('../config/paths');
 argv.push('--config', JSON.stringify(createJestConfig(

packages/react-scripts/utils/addWebpackMiddleware.js packages/react-scripts/scripts/utils/addWebpackMiddleware.js

@@ -1,7 +1,7 @@
+var chalk = require('chalk');
 var historyApiFallback = require('connect-history-api-fallback');
 var httpProxyMiddleware = require('http-proxy-middleware');
-var paths = require('../config/paths');
-var chalk = require('chalk');
+var paths = require('../../config/paths');
 
 module.exports = function addMiddleware(devServer) {
   // `proxy` lets you to specify a fallback server during development.

packages/react-scripts/utils/createJestConfig.js packages/react-scripts/scripts/utils/createJestConfig.js

@@ -9,7 +9,7 @@
  */
 
 const fs = require('fs');
-const paths = require('../config/paths');
+const paths = require('../../config/paths');
 
 module.exports = (resolve, rootDir, isEjecting) => {
   // Use this instead of `paths.testsSetup` to avoid putting