Fixes a silent crash when ejecting (facebook#1810)

* Fixes a silent crash when ejecting * Delete unnecessary files * Remove references to eslintrc in Webpack config * Fix lint * Correct ESLint CLI options
sbuzonas · Mar 14, 2017 · a34d48a · a34d48a
1 parent c40d031
commit a34d48a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 28 deletions.
diff --git a/babelrc b/babelrc
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
@@ -19,11 +19,6 @@ const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeM
 const getClientEnvironment = require('./env');
 const paths = require('./paths');
 
-// @remove-on-eject-begin
-// `path` is not used after eject - see https://github.com/facebookincubator/create-react-app/issues/1174
-const path = require('path');
-// @remove-on-eject-end
-
 // Webpack uses `publicPath` to determine where the app is being served from.
 // In development, we always serve from the root. This makes config easier.
 const publicPath = '/';
@@ -121,7 +116,9 @@ module.exports = {
             // @remove-on-eject-begin
             // Point ESLint to our predefined config.
             options: {
-              configFile: path.join(__dirname, '../eslintrc'),
+              baseConfig: {
+                extends: ['react-app'],
+              },
               useEslintrc: false,
             },
             // @remove-on-eject-end

diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
@@ -19,11 +19,6 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
 
-// @remove-on-eject-begin
-// `path` is not used after eject - see https://github.com/facebookincubator/create-react-app/issues/1174
-const path = require('path');
-// @remove-on-eject-end
-
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
 const publicPath = paths.servedPath;
@@ -122,7 +117,9 @@ module.exports = {
             options: {
               // TODO: consider separate config for production,
               // e.g. to enable no-console and no-debugger only in production.
-              configFile: path.join(__dirname, '../eslintrc'),
+              baseConfig: {
+                extends: ['react-app'],
+              },
               useEslintrc: false,
             },
             // @remove-on-eject-end

diff --git a/eslintrc b/eslintrc
diff --git a/package.json b/package.json
@@ -11,8 +11,6 @@
     "url": "https://github.com/facebookincubator/create-react-app/issues"
   },
   "files": [
-    "babelrc",
-    "eslintrc",
     "bin",
     "config",
     "scripts",

diff --git a/scripts/eject.js b/scripts/eject.js
@@ -100,12 +100,6 @@ prompt(
 
   const ownPackage = require(path.join(ownPath, 'package.json'));
   const appPackage = require(path.join(appPath, 'package.json'));
-  const babelConfig = JSON.parse(
-    fs.readFileSync(path.join(ownPath, '.babelrc'), 'utf8')
-  );
-  const eslintConfig = JSON.parse(
-    fs.readFileSync(path.join(ownPath, '.eslintrc'), 'utf8')
-  );
 
   console.log(cyan('Updating the dependencies'));
   const ownPackageName = ownPackage.name;
@@ -154,11 +148,15 @@ prompt(
 
   // Add Babel config
   console.log(`  Adding ${cyan('Babel')} preset`);
-  appPackage.babel = babelConfig;
+  appPackage.babel = {
+    presets: ['react-app'],
+  };
 
   // Add ESlint config
   console.log(`  Adding ${cyan('ESLint')} configuration`);
-  appPackage.eslintConfig = eslintConfig;
+  appPackage.eslintConfig = {
+    extends: 'react-app',
+  };
 
   fs.writeFileSync(
     path.join(appPath, 'package.json'),