From 084bf2eaa137637740fb102d0b3c950ac52b063d Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Thu, 23 Jun 2016 15:55:20 -0600 Subject: [PATCH] HMR Actually working! --- bikeshop_project/.babelrc | 3 +++ bikeshop_project/package.json | 10 +++++++--- bikeshop_project/webpack.dev.config.js | 6 ++---- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 bikeshop_project/.babelrc diff --git a/bikeshop_project/.babelrc b/bikeshop_project/.babelrc new file mode 100644 index 0000000..7eae1a3 --- /dev/null +++ b/bikeshop_project/.babelrc @@ -0,0 +1,3 @@ +{ + presets: ['es2015', 'stage-0', 'react'] +} \ No newline at end of file diff --git a/bikeshop_project/package.json b/bikeshop_project/package.json index b1c7982..5950bb7 100644 --- a/bikeshop_project/package.json +++ b/bikeshop_project/package.json @@ -4,8 +4,10 @@ "description": "A membership management app for the BCBC.", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, + "build": "webpack --config webpack.config.js --progress --colors", + "build-production": "webpack --config webpack.prod.config.js --progress --colors", + "watch": "node server.js" +}, "author": "", "license": "ISC", "devDependencies": { @@ -28,12 +30,14 @@ "react": "^15.1.0", "react-addons-css-transition-group": "^15.1.0", "react-dom": "^15.1.0", + "react-hot-loader": "^1.3.0", "react-tap-event-plugin": "^1.0.0", "react-toolbox": "^0.16.2", "sass-loader": "^3.2.0", "style-loader": "^0.13.1", "toolbox-loader": "0.0.3", "webpack": "^1.13.1", - "webpack-bundle-tracker": "0.0.93" + "webpack-bundle-tracker": "0.0.93", + "webpack-dev-server": "^1.14.1" } } diff --git a/bikeshop_project/webpack.dev.config.js b/bikeshop_project/webpack.dev.config.js index b8ed3f5..4325d73 100644 --- a/bikeshop_project/webpack.dev.config.js +++ b/bikeshop_project/webpack.dev.config.js @@ -28,10 +28,8 @@ config.module.loaders.push( { test: /\.jsx?$/, exclude: /node_modules/, - loader: 'babel-loader', - query: { - presets: ['es2015', 'stage-0', 'react'] - } + loaders: ['react-hot','babel-loader'] + }, { test: /(\.scss|\.css)$/,