diff --git a/.eslintrc b/config/.eslintrc similarity index 100% rename from .eslintrc rename to config/.eslintrc diff --git a/webpack.config.dev.js b/config/webpack.config.dev.js similarity index 94% rename from webpack.config.dev.js rename to config/webpack.config.dev.js index e64d3d01382..a57f226a867 100644 --- a/webpack.config.dev.js +++ b/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 b/config/webpack.config.prod.js similarity index 95% rename from webpack.config.prod.js rename to config/webpack.config.prod.js index 85fa5bdce25..0c2e215a589 100644 --- a/webpack.config.prod.js +++ b/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 index 074b61fd4cd..4b338be57d2 100644 --- 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 index fb5571ce602..adfe9cc0d19 100644 --- 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 index bb16ea6b8d9..2bb42bc9cfe 100644 --- 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 index 477c5ed7c4d..ec89a2488aa 100644 --- 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');