From 6a7a0b07bcbb7e3c2232bd62533109cfc32df137 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 23 Aug 2016 12:43:01 -0700 Subject: [PATCH] try --- scripts/build.sh | 2 +- webpack/server.js | 2 +- .../{webpack.config.base.js => webpack.config.base.babel.js} | 0 ...onfig.development.js => webpack.config.development.babel.js} | 2 +- ....config.production.js => webpack.config.production.babel.js} | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename webpack/{webpack.config.base.js => webpack.config.base.babel.js} (100%) rename webpack/{webpack.config.development.js => webpack.config.development.babel.js} (92%) rename webpack/{webpack.config.production.js => webpack.config.production.babel.js} (85%) diff --git a/scripts/build.sh b/scripts/build.sh index 5f4ee98c0..1acfde648 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -11,7 +11,7 @@ if [ -d "$BUILD_DIR" ]; then fi echo "-- BUILDING PRODUCTION APP --" -cross-env NODE_ENV=production babel-node ./node_modules/.bin/webpack --config ./webpack/webpack.config.production.js +cross-env NODE_ENV=production --config ./webpack/webpack.config.production.babel.js echo "-- COPYING REMAINING FILES --" diff --git a/webpack/server.js b/webpack/server.js index 69bf305d2..88443bcab 100644 --- a/webpack/server.js +++ b/webpack/server.js @@ -3,7 +3,7 @@ import webpack from 'webpack'; import webpackDevMiddleware from 'webpack-dev-middleware'; import webpackHotMiddleware from 'webpack-hot-middleware'; -import config from './webpack.config.development'; +import config from './webpack.config.development.babel'; const app = express(); const compiler = webpack(config); diff --git a/webpack/webpack.config.base.js b/webpack/webpack.config.base.babel.js similarity index 100% rename from webpack/webpack.config.base.js rename to webpack/webpack.config.base.babel.js diff --git a/webpack/webpack.config.development.js b/webpack/webpack.config.development.babel.js similarity index 92% rename from webpack/webpack.config.development.js rename to webpack/webpack.config.development.babel.js index f862cfcf3..38f5c20a5 100644 --- a/webpack/webpack.config.development.js +++ b/webpack/webpack.config.development.babel.js @@ -1,5 +1,5 @@ import webpack from 'webpack'; -import baseConfig from './webpack.config.base'; +import baseConfig from './webpack.config.base.babel'; export default { ...baseConfig, diff --git a/webpack/webpack.config.production.js b/webpack/webpack.config.production.babel.js similarity index 85% rename from webpack/webpack.config.production.js rename to webpack/webpack.config.production.babel.js index 01d857bf3..16faf4622 100644 --- a/webpack/webpack.config.production.js +++ b/webpack/webpack.config.production.babel.js @@ -1,5 +1,5 @@ import webpack from 'webpack'; -import baseConfig from './webpack.config.base'; +import baseConfig from './webpack.config.base.babel'; export default { ...baseConfig,