From 975854f5d56ce4a41d5a9f05eec45d2052ca2311 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 20 Jul 2016 12:35:56 +0100 Subject: [PATCH] Resolve loaders relative to react-scripts Fixes #31 --- config/babel.dev.js | 10 ++++++++-- config/babel.prod.js | 12 ++++++++---- config/webpack.config.dev.js | 6 +++++- config/webpack.config.prod.js | 4 ++++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/config/babel.dev.js b/config/babel.dev.js index 746b215ea0a..ff00b2fa05e 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -9,6 +9,12 @@ module.exports = { cacheDirectory: true, - presets: ['es2015', 'es2016', 'react'], - plugins: ['transform-object-rest-spread'] + presets: [ + 'babel-preset-es2015', + 'babel-preset-es2016', + 'babel-preset-react' + ].map(require.resolve), + plugins: [ + 'babel-plugin-transform-object-rest-spread' + ].map(require.resolve) }; diff --git a/config/babel.prod.js b/config/babel.prod.js index ad4f120d19a..64979ed762e 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -8,9 +8,13 @@ */ module.exports = { - presets: ['es2015', 'es2016', 'react'], + presets: [ + 'babel-preset-es2015', + 'babel-preset-es2016', + 'babel-preset-react' + ].map(require.resolve), plugins: [ - 'transform-object-rest-spread', - 'transform-react-constant-elements' - ] + 'babel-plugin-transform-object-rest-spread', + 'babel-plugin-transform-react-constant-elements' + ].map(require.resolve) }; diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index 18420f7b7e9..f7309605e66 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -19,7 +19,7 @@ var relative = isInNodeModules ? '../../..' : '..'; module.exports = { devtool: 'eval', entry: [ - 'webpack-dev-server/client?http://localhost:3000', + require.resolve('webpack-dev-server/client') + '?http://localhost:3000', './src/index.js' ], output: { @@ -29,6 +29,10 @@ module.exports = { filename: 'bundle.js', publicPath: '/' }, + resolveLoader: { + root: path.join(__dirname, '..', 'node_modules'), + moduleTemplates: ['*-loader'] + }, module: { preLoaders: [ { diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 8067ba8c12f..74b06600831 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -27,6 +27,10 @@ module.exports = { // Good news: we can infer it from package.json :-) publicPath: '/' }, + resolveLoader: { + root: path.join(__dirname, '..', 'node_modules'), + moduleTemplates: ['*-loader'] + }, module: { preLoaders: [ {