Move configs to a separate folder

facebook · Jul 19, 2016 · 95e73d3 · 95e73d3
1 parent 7a15b7e
commit 95e73d3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.eslintrc → config/.eslintrc b/.eslintrc → config/.eslintrc
diff --git a/webpack.config.dev.js → config/webpack.config.dev.js b/webpack.config.dev.js → config/webpack.config.dev.js
@@ -13,8 +13,8 @@ var webpack = require('webpack');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 
 var isInNodeModules = 'node_modules' ===
-  path.basename(path.resolve(path.join(__dirname, '..')));
-var relative = isInNodeModules ? '../..' : '.';
+  path.basename(path.resolve(path.join(__dirname, '..', '..')));
+var relative = isInNodeModules ? '../../..' : '..';
 
 module.exports = {
   devtool: 'eval',

diff --git a/webpack.config.prod.js → config/webpack.config.prod.js b/webpack.config.prod.js → config/webpack.config.prod.js
@@ -13,8 +13,8 @@ var webpack = require('webpack');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 
 var isInNodeModules = 'node_modules' ===
-  path.basename(path.resolve(path.join(__dirname, '..')));
-var relative = isInNodeModules ? '../..' : '.';
+  path.basename(path.resolve(path.join(__dirname, '..', '..')));
+var relative = isInNodeModules ? '../../..' : '..';
 
 module.exports = {
   devtool: 'source-map',

diff --git a/package.json b/package.json
@@ -9,13 +9,11 @@
   "files": [
     "LICENSE",
     "PATENTS",
-    ".eslintrc",
     "bin",
+    "config",
     "scripts",
     "src",
-    "index.html",
-    "webpack.config.dev.js",
-    "webpack.config.prod.js"
+    "index.html"
   ],
   "bin": {
     "start-react-app": "./bin/start-react-app.js",

diff --git a/scripts/build.js b/scripts/build.js
@@ -12,7 +12,7 @@ process.env.NODE_ENV = 'production';
 var path = require('path');
 var rimrafSync = require('rimraf').sync;
 var webpack = require('webpack');
-var config = require('../webpack.config.prod');
+var config = require('../config/webpack.config.prod');
 
 var isInNodeModules = 'node_modules' ===
   path.basename(path.resolve(path.join(__dirname, '..', '..')));

diff --git a/scripts/eject.js b/scripts/eject.js
@@ -40,11 +40,11 @@ prompt('Are you sure you want to eject? This action is permanent. [y/N]', functi
   var hostPath = path.join(selfPath, '..', '..');
 
   var files = [
-   path.join('scripts', 'build.js'),
-   path.join('scripts', 'start.js'),
-   'webpack.config.dev.js',
-   'webpack.config.prod.js',
-   '.eslintrc'
+    path.join('config', '.eslintrc'),
+    path.join('config', 'webpack.config.dev.js'),
+    path.join('config', 'webpack.config.prod.js'),
+    path.join('scripts', 'build.js'),
+    path.join('scripts', 'start.js')
   ];
 
   // Ensure that the host folder is clean and we won't override any files
@@ -61,7 +61,9 @@ prompt('Are you sure you want to eject? This action is permanent. [y/N]', functi
   });
 
   // Copy the files over
+  fs.mkdirSync(path.join(hostPath, 'config'));
   fs.mkdirSync(path.join(hostPath, 'scripts'));
+
   files.forEach(function(file) {
    console.log('Copying ' + file + ' to ' + hostPath);
    var content = fs.readFileSync(path.join(selfPath, file), 'utf8');

diff --git a/scripts/start.js b/scripts/start.js
@@ -11,7 +11,7 @@ process.env.NODE_ENV = 'development';
 
 var webpack = require('webpack');
 var WebpackDevServer = require('webpack-dev-server');
-var config = require('../webpack.config.dev');
+var config = require('../config/webpack.config.dev');
 var execSync = require('child_process').execSync;
 var opn = require('opn');