From 146834621c1b32ee40afa6f30ba1de4116fbb59f Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 12:03:01 -0700
Subject: [PATCH 1/9] :fire: Remove react stuff from manifest

---
 package.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/package.json b/package.json
index c4999d12558..de9898fb559 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "autoprefixer": "6.3.7",
     "babel-core": "6.11.4",
     "babel-eslint": "6.1.2",
-    "babel-loader": "6.2.4",
     "babel-plugin-syntax-trailing-function-commas": "6.8.0",
     "babel-plugin-transform-class-properties": "6.11.5",
     "babel-plugin-transform-object-rest-spread": "6.8.0",
@@ -42,29 +41,18 @@
     "babel-runtime": "6.11.6",
     "chalk": "1.1.3",
     "cross-spawn": "4.0.0",
-    "css-loader": "0.23.1",
     "detect-port": "0.1.4",
     "eslint": "3.1.1",
-    "eslint-loader": "1.4.1",
     "eslint-plugin-flow-vars": "0.5.0",
     "eslint-plugin-import": "1.12.0",
     "eslint-plugin-jsx-a11y": "2.0.1",
     "eslint-plugin-react": "5.2.2",
-    "extract-text-webpack-plugin": "1.0.1",
-    "file-loader": "0.9.0",
     "filesize": "3.3.0",
     "fs-extra": "0.30.0",
     "gzip-size": "3.0.0",
-    "html-webpack-plugin": "2.22.0",
-    "json-loader": "0.5.4",
     "opn": "4.0.2",
-    "postcss-loader": "0.9.1",
     "promise": "7.1.1",
     "rimraf": "2.5.4",
-    "style-loader": "0.13.1",
-    "url-loader": "0.5.7",
-    "webpack": "1.13.1",
-    "webpack-dev-server": "1.14.1",
     "whatwg-fetch": "1.0.0"
   },
   "devDependencies": {

From 643e7f5546e853b53cf0c59d414257f4851c7eef Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 12:04:35 -0700
Subject: [PATCH 2/9] :new: Add pundle and friends to manifest

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index de9898fb559..3ce381e7e32 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "babel-preset-es2015": "6.9.0",
     "babel-preset-es2016": "6.11.3",
     "babel-preset-react": "6.11.1",
+    "babel-pundle": "^1.0.0",
     "babel-runtime": "6.11.6",
     "chalk": "1.1.3",
     "cross-spawn": "4.0.0",
@@ -52,6 +53,8 @@
     "gzip-size": "3.0.0",
     "opn": "4.0.2",
     "promise": "7.1.1",
+    "pundle": "^1.0.2",
+    "pundle-dev": "^1.0.2",
     "rimraf": "2.5.4",
     "whatwg-fetch": "1.0.0"
   },

From 4aba8c744815737a4f9402b6c3365a2f5a723673 Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 13:30:06 -0700
Subject: [PATCH 3/9] :new: Use the Pundle dev server

---
 config/babel.dev.js   |   1 -
 package.json          |   1 +
 scripts/start.js      | 238 ++++++++----------------------------------
 template/index.html   |   1 +
 template/src/App.js   |   4 +-
 template/src/index.js |   1 -
 6 files changed, 49 insertions(+), 197 deletions(-)

diff --git a/config/babel.dev.js b/config/babel.dev.js
index 64545127d07..16e4ce0f256 100644
--- a/config/babel.dev.js
+++ b/config/babel.dev.js
@@ -9,7 +9,6 @@
 
 module.exports = {
   babelrc: false,
-  cacheDirectory: true,
   presets: [
     'babel-preset-es2015',
     'babel-preset-es2016',
diff --git a/package.json b/package.json
index 3ce381e7e32..1350d1f06ae 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "fs-extra": "0.30.0",
     "gzip-size": "3.0.0",
     "opn": "4.0.2",
+    "process-bootstrap": "^1.0.0",
     "promise": "7.1.1",
     "pundle": "^1.0.2",
     "pundle-dev": "^1.0.2",
diff --git a/scripts/start.js b/scripts/start.js
index 15243229d37..94b7eea9736 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -1,192 +1,46 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-process.env.NODE_ENV = 'development';
-
-var path = require('path');
-var chalk = require('chalk');
-var webpack = require('webpack');
-var WebpackDevServer = require('webpack-dev-server');
-var execSync = require('child_process').execSync;
-var opn = require('opn');
-var detect = require('detect-port');
-var prompt = require('./utils/prompt');
-var config = require('../config/webpack.config.dev');
-
-// Tools like Cloud9 rely on this
-var DEFAULT_PORT = process.env.PORT || 3000;
-var compiler;
-
-// TODO: hide this behind a flag and eliminate dead code on eject.
-// This shouldn't be exposed to the user.
-var handleCompile;
-var isSmokeTest = process.argv.some(arg => arg.indexOf('--smoke-test') > -1);
-if (isSmokeTest) {
-  handleCompile = function (err, stats) {
-    if (err || stats.hasErrors() || stats.hasWarnings()) {
-      process.exit(1);
-    } else {
-      process.exit(0);
-    }
-  };
-}
-
-var friendlySyntaxErrorLabel = 'Syntax error:';
-
-function isLikelyASyntaxError(message) {
-  return message.indexOf(friendlySyntaxErrorLabel) !== -1;
-}
-
-// This is a little hacky.
-// It would be easier if webpack provided a rich error object.
-
-function formatMessage(message) {
-  return message
-    // Make some common errors shorter:
-    .replace(
-      // Babel syntax error
-      'Module build failed: SyntaxError:',
-      friendlySyntaxErrorLabel
-    )
-    .replace(
-      // Webpack file not found error
-      /Module not found: Error: Cannot resolve 'file' or 'directory'/,
-      'Module not found:'
-    )
-    // Internal stacks are generally useless so we strip them
-    .replace(/^\s*at\s.*:\d+:\d+[\s\)]*\n/gm, '') // at ... ...:x:y
-    // Webpack loader names obscure CSS filenames
-    .replace('./~/css-loader!./~/postcss-loader!', '');
-}
-
-function clearConsole() {
-  process.stdout.write('\x1bc');
-}
-
-function setupCompiler(port) {
-  compiler = webpack(config, handleCompile);
-
-  compiler.plugin('invalid', function() {
-    clearConsole();
-    console.log('Compiling...');
-  });
-
-  compiler.plugin('done', function(stats) {
-    clearConsole();
-    var hasErrors = stats.hasErrors();
-    var hasWarnings = stats.hasWarnings();
-    if (!hasErrors && !hasWarnings) {
-      console.log(chalk.green('Compiled successfully!'));
-      console.log();
-      console.log('The app is running at http://localhost:' + port + '/');
-      console.log();
-      return;
-    }
-
-    var json = stats.toJson();
-    var formattedErrors = json.errors.map(message =>
-      'Error in ' + formatMessage(message)
-    );
-    var formattedWarnings = json.warnings.map(message =>
-      'Warning in ' + formatMessage(message)
-    );
-
-    if (hasErrors) {
-      console.log(chalk.red('Failed to compile.'));
-      console.log();
-      if (formattedErrors.some(isLikelyASyntaxError)) {
-        // If there are any syntax errors, show just them.
-        // This prevents a confusing ESLint parsing error
-        // preceding a much more useful Babel syntax error.
-        formattedErrors = formattedErrors.filter(isLikelyASyntaxError);
-      }
-      formattedErrors.forEach(message => {
-        console.log(message);
-        console.log();
-      });
-      // If errors exist, ignore warnings.
-      return;
-    }
-
-    if (hasWarnings) {
-      console.log(chalk.yellow('Compiled with warnings.'));
-      console.log();
-      formattedWarnings.forEach(message => {
-        console.log(message);
-        console.log();
-      });
-
-      console.log('You may use special comments to disable some warnings.');
-      console.log('Use ' + chalk.yellow('// eslint-disable-next-line') + ' to ignore the next line.');
-      console.log('Use ' + chalk.yellow('/* eslint-disable */') + ' to ignore all warnings in a file.');
-    }
-  });
-}
-
-function openBrowser(port) {
-  if (process.platform === 'darwin') {
-    try {
-      // Try our best to reuse existing tab
-      // on OS X Google Chrome with AppleScript
-      execSync('ps cax | grep "Google Chrome"');
-      execSync(
-        'osascript ' +
-        path.resolve(__dirname, './utils/chrome.applescript') +
-        ' http://localhost:' + port + '/'
-      );
-      return;
-    } catch (err) {
-      // Ignore errors.
-    }
-  }
-  // Fallback to opn
-  // (It will always open new tab)
-  opn('http://localhost:' + port + '/');
-}
-
-function runDevServer(port) {
-  new WebpackDevServer(compiler, {
-    historyApiFallback: true,
-    hot: true, // Note: only CSS is currently hot reloaded
-    publicPath: config.output.publicPath,
-    quiet: true
-  }).listen(port, (err, result) => {
-    if (err) {
-      return console.log(err);
-    }
-
-    clearConsole();
-    console.log(chalk.cyan('Starting the development server...'));
-    console.log();
-    openBrowser(port);
-  });
-}
-
-function run(port) {
-  setupCompiler(port);
-  runDevServer(port);
-}
-
-detect(DEFAULT_PORT).then(port => {
-  if (port === DEFAULT_PORT) {
-    run(port);
-    return;
-  }
-
-  clearConsole();
-  var question =
-    chalk.yellow('Something is already running at port ' + DEFAULT_PORT + '.') +
-    '\n\nWould you like to run the app at another port instead?';
-
-  prompt(question, true).then(shouldChangePort => {
-    if (shouldChangePort) {
-      run(port);
-    }
-  });
-});
+require('process-bootstrap')('react-app', 'REACT-APP')
+
+const Path = require('path')
+const debug = require('debug')
+const Server = require('pundle-dev')
+const debugInfo = debug('REACT-APP:Info')
+const debugError = debug('REACT-APP:Error')
+
+const port = 8056
+
+const server = new Server({
+  pundle: {
+    entry: ['index.js'],
+    rootDirectory: Path.normalize(Path.join(__dirname, '../template/src')),
+    pathType: 'filePath',
+    moduleDirectories: ['node_modules'],
+  },
+  server: {
+    port,
+    error(error) {
+      debugError(error)
+    },
+    ready() {
+      debugInfo('Ready')
+    },
+    generated() {
+      debugInfo('Regenerated')
+    },
+    hmr: true,
+    sourceMap: true,
+    sourceRoot: Path.normalize(Path.join(__dirname, '../template')),
+  },
+  watcher: {},
+  generator: {
+    sourceMap: true,
+    wrapper: 'hmr',
+  },
+})
+
+server.pundle.loadPlugins([
+  [require.resolve('babel-pundle'), {
+    config: require('../config/babel.dev'),
+  }],
+]).then(function() {
+  return server.activate()
+}).catch((e) => console.log('error', e))
diff --git a/template/index.html b/template/index.html
index 72e10e94c6c..4d6799da4f5 100644
--- a/template/index.html
+++ b/template/index.html
@@ -7,6 +7,7 @@
   </head>
   <body>
     <div id="root"></div>
+    <script src="/_/bundle.js"></script>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/template/src/App.js b/template/src/App.js
index d7d52a7f38a..434b9258333 100644
--- a/template/src/App.js
+++ b/template/src/App.js
@@ -1,13 +1,11 @@
 import React, { Component } from 'react';
-import logo from './logo.svg';
-import './App.css';
 
 class App extends Component {
   render() {
     return (
       <div className="App">
         <div className="App-header">
-          <img src={logo} className="App-logo" alt="logo" />
+          <img className="App-logo" alt="logo" />
           <h2>Welcome to React</h2>
         </div>
         <p className="App-intro">
diff --git a/template/src/index.js b/template/src/index.js
index 54c5ef1a427..0ea36197ba1 100644
--- a/template/src/index.js
+++ b/template/src/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
-import './index.css';
 
 ReactDOM.render(
   <App />,

From 2b1e0c7a2037f7d8b5fb638624517eb6cf144c82 Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 13:48:28 -0700
Subject: [PATCH 4/9] :arrow_up: Bump pundle versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1350d1f06ae..a7b7c63f61c 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "opn": "4.0.2",
     "process-bootstrap": "^1.0.0",
     "promise": "7.1.1",
-    "pundle": "^1.0.2",
-    "pundle-dev": "^1.0.2",
+    "pundle": "^1.1.0",
+    "pundle-dev": "^1.1.0",
     "rimraf": "2.5.4",
     "whatwg-fetch": "1.0.0"
   },

From 6c244e6246545c4591ece32c97a39ffb59423c4b Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 14:03:05 -0700
Subject: [PATCH 5/9] :art: Use fixed dependency versions Thanks @lacker

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a7b7c63f61c..a0fe6273667 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "babel-preset-es2015": "6.9.0",
     "babel-preset-es2016": "6.11.3",
     "babel-preset-react": "6.11.1",
-    "babel-pundle": "^1.0.0",
+    "babel-pundle": "1.0.0",
     "babel-runtime": "6.11.6",
     "chalk": "1.1.3",
     "cross-spawn": "4.0.0",
@@ -52,10 +52,10 @@
     "fs-extra": "0.30.0",
     "gzip-size": "3.0.0",
     "opn": "4.0.2",
-    "process-bootstrap": "^1.0.0",
+    "process-bootstrap": "1.0.0",
     "promise": "7.1.1",
-    "pundle": "^1.1.0",
-    "pundle-dev": "^1.1.0",
+    "pundle": "1.1.0",
+    "pundle-dev": "1.1.0",
     "rimraf": "2.5.4",
     "whatwg-fetch": "1.0.0"
   },

From 1f19c9b44602d972aba0caf505b2e4bc9448b6a5 Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 14:09:50 -0700
Subject: [PATCH 6/9] :new: Use the standard ports for dev server

---
 scripts/start.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/start.js b/scripts/start.js
index 94b7eea9736..dfb021274fb 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+process.env.NODE_ENV = 'development';
+
 require('process-bootstrap')('react-app', 'REACT-APP')
 
 const Path = require('path')
@@ -6,7 +17,7 @@ const Server = require('pundle-dev')
 const debugInfo = debug('REACT-APP:Info')
 const debugError = debug('REACT-APP:Error')
 
-const port = 8056
+const port = process.env.PORT || 3000
 
 const server = new Server({
   pundle: {

From 3f7636f20765afea33da956baeec5553e195304e Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 14:46:25 -0700
Subject: [PATCH 7/9] :art: Make start script the same code style as other
 files

---
 scripts/start.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/scripts/start.js b/scripts/start.js
index dfb021274fb..8648cef5e6d 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -11,26 +11,24 @@ process.env.NODE_ENV = 'development';
 
 require('process-bootstrap')('react-app', 'REACT-APP')
 
-const Path = require('path')
-const debug = require('debug')
-const Server = require('pundle-dev')
-const debugInfo = debug('REACT-APP:Info')
-const debugError = debug('REACT-APP:Error')
+var Path = require('path');
+var debug = require('debug');
+var Server = require('pundle-dev');
+var debugInfo = debug('REACT-APP:Info');
+var debugError = debug('REACT-APP:Error');
 
-const port = process.env.PORT || 3000
+var port = process.env.PORT || 3000;
 
-const server = new Server({
+var server = new Server({
   pundle: {
-    entry: ['index.js'],
+    entry: [require.resolve('../config/polyfills'), 'index.js'],
     rootDirectory: Path.normalize(Path.join(__dirname, '../template/src')),
     pathType: 'filePath',
     moduleDirectories: ['node_modules'],
   },
   server: {
-    port,
-    error(error) {
-      debugError(error)
-    },
+    port: port,
+    error: debugError,
     ready() {
       debugInfo('Ready')
     },
@@ -54,4 +52,4 @@ server.pundle.loadPlugins([
   }],
 ]).then(function() {
   return server.activate()
-}).catch((e) => console.log('error', e))
+}).catch(debugError)

From be327e9a511f0cbd5df129c5070a28a79544a004 Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 14:46:40 -0700
Subject: [PATCH 8/9] :arrow_up: Upgrade build.js to use pundle

---
 package.json     |  3 +--
 scripts/build.js | 65 ++++++++++++++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index a0fe6273667..9d380cea3f8 100644
--- a/package.json
+++ b/package.json
@@ -48,9 +48,8 @@
     "eslint-plugin-import": "1.12.0",
     "eslint-plugin-jsx-a11y": "2.0.1",
     "eslint-plugin-react": "5.2.2",
-    "filesize": "3.3.0",
     "fs-extra": "0.30.0",
-    "gzip-size": "3.0.0",
+    "mkdirp": "^0.5.1",
     "opn": "4.0.2",
     "process-bootstrap": "1.0.0",
     "promise": "7.1.1",
diff --git a/scripts/build.js b/scripts/build.js
index 7642ce3f418..bf8576fd849 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -10,34 +10,50 @@
 process.env.NODE_ENV = 'production';
 
 var fs = require('fs');
-var filesize = require('filesize');
-var gzipSize = require('gzip-size');
+var path = require('path');
+var mkdirp = require('mkdirp')
+var Pundle = require('pundle')
 var rimrafSync = require('rimraf').sync;
-var webpack = require('webpack');
-var config = require('../config/webpack.config.prod');
 var paths = require('../config/paths');
 
 // Remove all content but keep the directory so that
 // if you're in it, you don't end up in Trash
 rimrafSync(paths.appBuild + '/*');
 
-function logBuildSize(assets, extension) {
-  for (var i = 0; i < assets.length; i++) {
-    var asset = assets[i];
-    if (asset.name.endsWith('.' + extension)) {
-      var fileContents = fs.readFileSync(paths.appBuild + '/' + asset.name);
-      console.log('Size (gzipped) of ' + asset.name + ': ' + filesize(gzipSize.sync(fileContents)));
-    }
-  }
-}
-
-webpack(config).run(function(err, stats) {
-  if (err) {
-    console.error('Failed to create a production build. Reason:');
-    console.error(err.message || err);
-    process.exit(1);
-  }
+var pundle = new Pundle({
+  entry: [require.resolve('../config/polyfills'), 'index.js'],
+  rootDirectory: path.normalize(path.join(__dirname, '../template/src')),
+  pathType: 'filePath',
+  moduleDirectories: ['node_modules'],
+})
 
+pundle.loadPlugins([
+  [require.resolve('babel-pundle'), {
+    config: require('../config/babel.prod'),
+  }],
+]).then(function() {
+  return pundle.compile()
+}).then(function() {
+  return new Promise(function(resolve, reject) {
+    mkdirp(paths.appBuild, function(error) {
+      if (error) {
+        reject(error)
+      } else {
+        resolve()
+      }
+    })
+  })
+}).then(function() {
+  return new Promise(function(resolve, reject) {
+    fs.writeFile(path.join(paths.appBuild, 'bundle.js'), pundle.generate().contents, function(error) {
+      if (error) {
+        reject(error)
+      } else {
+        resolve()
+      }
+    })
+  })
+}).then(function() {
   var openCommand = process.platform === 'win32' ? 'start' : 'open';
   var homepagePath = require(paths.appPackageJson).homepage;
   console.log('Successfully generated a bundle in the build folder!');
@@ -61,9 +77,10 @@ webpack(config).run(function(err, stats) {
     console.log('  pushstate-server build');
     console.log('  ' + openCommand + ' http://localhost:9000');
     console.log();
-    var assets = stats.toJson()['assets'];
-    logBuildSize(assets, 'js');
-    logBuildSize(assets, 'css');
   }
   console.log('The bundle is optimized and ready to be deployed to production.');
-});
+}, function(err) {
+  console.error('Failed to create a production build. Reason:');
+  console.error(err.message || err);
+  process.exitCode = 1
+})

From 57ba2602e015dc4e877fa5adf344c2fd7742ca7a Mon Sep 17 00:00:00 2001
From: steelbrain <de.steelbrain@gmail.com>
Date: Thu, 28 Jul 2016 14:46:52 -0700
Subject: [PATCH 9/9] :fire: Remove outdated webpack configs

---
 config/webpack.config.dev.js  | 103 ------------------------
 config/webpack.config.prod.js | 144 ----------------------------------
 2 files changed, 247 deletions(-)
 delete mode 100644 config/webpack.config.dev.js
 delete mode 100644 config/webpack.config.prod.js

diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
deleted file mode 100644
index 949e9465fcd..00000000000
--- a/config/webpack.config.dev.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-var path = require('path');
-var autoprefixer = require('autoprefixer');
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var paths = require('./paths');
-
-module.exports = {
-  devtool: 'eval',
-  entry: [
-    require.resolve('webpack-dev-server/client'),
-    require.resolve('webpack/hot/dev-server'),
-    require.resolve('./polyfills'),
-    path.join(paths.appSrc, 'index')
-  ],
-  output: {
-    // Next line is not used in dev but WebpackDevServer crashes without it:
-    path: paths.appBuild,
-    pathinfo: true,
-    filename: 'bundle.js',
-    publicPath: '/'
-  },
-  resolve: {
-    extensions: ['', '.js', '.json'],
-    alias: {
-      // This `alias` section can be safely removed after ejection.
-      // We do this because `babel-runtime` may be inside `react-scripts`,
-      // so when `babel-plugin-transform-runtime` imports it, it will not be
-      // available to the app directly. This is a temporary solution that lets
-      // us ship support for generators. However it is far from ideal, and
-      // if we don't have a good solution, we should just make `babel-runtime`
-      // a dependency in generated projects.
-      // See https://github.com/facebookincubator/create-react-app/issues/255
-      'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator')
-    }
-  },
-  resolveLoader: {
-    root: paths.ownNodeModules,
-    moduleTemplates: ['*-loader']
-  },
-  module: {
-    preLoaders: [
-      {
-        test: /\.js$/,
-        loader: 'eslint',
-        include: paths.appSrc,
-      }
-    ],
-    loaders: [
-      {
-        test: /\.js$/,
-        include: paths.appSrc,
-        loader: 'babel',
-        query: require('./babel.dev')
-      },
-      {
-        test: /\.css$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'style!css!postcss'
-      },
-      {
-        test: /\.json$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'json'
-      },
-      {
-        test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'file',
-      },
-      {
-        test: /\.(mp4|webm)$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'url?limit=10000'
-      }
-    ]
-  },
-  eslint: {
-    configFile: path.join(__dirname, 'eslint.js'),
-    useEslintrc: false
-  },
-  postcss: function() {
-    return [autoprefixer];
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-      favicon: paths.appFavicon,
-    }),
-    new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"development"' }),
-    // Note: only CSS is currently hot reloaded
-    new webpack.HotModuleReplacementPlugin()
-  ]
-};
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
deleted file mode 100644
index e085c274649..00000000000
--- a/config/webpack.config.prod.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-var path = require('path');
-var autoprefixer = require('autoprefixer');
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var url = require('url');
-var paths = require('./paths');
-
-var homepagePath = require(paths.appPackageJson).homepage;
-var publicPath = homepagePath ? url.parse(homepagePath).pathname : '/';
-if (!publicPath.endsWith('/')) {
-  // Prevents incorrect paths in file-loader
-  publicPath += '/';
-}
-
-module.exports = {
-  bail: true,
-  devtool: 'source-map',
-  entry: [
-    require.resolve('./polyfills'),
-    path.join(paths.appSrc, 'index')
-  ],
-  output: {
-    path: paths.appBuild,
-    filename: '[name].[chunkhash:8].js',
-    chunkFilename: '[name].[chunkhash:8].chunk.js',
-    publicPath: publicPath
-  },
-  resolve: {
-    extensions: ['', '.js', '.json'],
-    alias: {
-      // This `alias` section can be safely removed after ejection.
-      // We do this because `babel-runtime` may be inside `react-scripts`,
-      // so when `babel-plugin-transform-runtime` imports it, it will not be
-      // available to the app directly. This is a temporary solution that lets
-      // us ship support for generators. However it is far from ideal, and
-      // if we don't have a good solution, we should just make `babel-runtime`
-      // a dependency in generated projects.
-      // See https://github.com/facebookincubator/create-react-app/issues/255
-      'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator')
-    }
-  },
-  resolveLoader: {
-    root: paths.ownNodeModules,
-    moduleTemplates: ['*-loader']
-  },
-  module: {
-    preLoaders: [
-      {
-        test: /\.js$/,
-        loader: 'eslint',
-        include: paths.appSrc
-      }
-    ],
-    loaders: [
-      {
-        test: /\.js$/,
-        include: paths.appSrc,
-        loader: 'babel',
-        query: require('./babel.prod')
-      },
-      {
-        test: /\.css$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        // Disable autoprefixer in css-loader itself:
-        // https://github.com/webpack/css-loader/issues/281
-        // We already have it thanks to postcss.
-        loader: ExtractTextPlugin.extract('style', 'css?-autoprefixer!postcss')
-      },
-      {
-        test: /\.json$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'json'
-      },
-      {
-        test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'file',
-        query: {
-          name: '[name].[hash:8].[ext]'
-        }
-      },
-      {
-        test: /\.(mp4|webm)$/,
-        include: [paths.appSrc, paths.appNodeModules],
-        loader: 'url?limit=10000'
-      }
-    ]
-  },
-  eslint: {
-    // TODO: consider separate config for production,
-    // e.g. to enable no-console and no-debugger only in prod.
-    configFile: path.join(__dirname, 'eslint.js'),
-    useEslintrc: false
-  },
-  postcss: function() {
-    return [autoprefixer];
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-      favicon: paths.appFavicon,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true
-      }
-    }),
-    new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }),
-    new webpack.optimize.OccurrenceOrderPlugin(),
-    new webpack.optimize.DedupePlugin(),
-    new webpack.optimize.UglifyJsPlugin({
-      compressor: {
-        screw_ie8: true,
-        warnings: false
-      },
-      mangle: {
-        screw_ie8: true
-      },
-      output: {
-        comments: false,
-        screw_ie8: true
-      }
-    }),
-    new ExtractTextPlugin('[name].[contenthash:8].css')
-  ]
-};