Merge pull request #37 from r-park/dev

chore: misc. updates

Author: r-park

package.json

@@ -17,7 +17,7 @@
     "node": ">=5.11"
   },
   "scripts": {
-    "build": "cross-env NODE_ENV=production webpack --display-chunks --display-modules --progress",
+    "build": "cross-env NODE_ENV=production webpack --display-chunks --progress",
     "clean": "del-cli ./target",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
     "lint": "eslint -c .eslintrc.yml *.js ./src ./server",
@@ -48,25 +48,25 @@
     "extract-text-webpack-plugin": "~1.0.1",
     "firebase": "~3.1.0",
     "firebase-tools": "3.0.4",
-    "html-webpack-plugin": "~2.21.0",
+    "html-webpack-plugin": "~2.22.0",
     "jasmine-core": "~2.4.1",
     "karma": "~1.0.0",
     "karma-chrome-launcher": "~1.0.1",
     "karma-jasmine": "~1.0.2",
     "karma-sourcemap-loader": "~0.3.7",
     "karma-webpack": "~1.7.0",
-    "minx": "~0.4.14",
+    "minx": "r-park/minx.git",
     "morgan": "~1.7.0",
     "node-sass": "~3.8.0",
     "nodemon": "~1.9.2",
     "npm-run-all": "~2.3.0",
     "postcss-loader": "~0.9.1",
-    "react": "~15.1.0",
-    "react-addons-test-utils": "~15.1.0",
-    "react-dom": "~15.1.0",
+    "react": "~15.2.0",
+    "react-addons-test-utils": "~15.2.0",
+    "react-dom": "~15.2.0",
     "react-hot-loader": "3.0.0-beta.2",
     "react-redux": "~4.4.5",
-    "react-router": "~2.5.1",
+    "react-router": "~2.5.2",
     "react-router-redux": "~4.0.5",
     "redux": "~3.5.2",
     "redux-thunk": "~2.1.0",

src/main.js

@@ -1,4 +1,3 @@
-import 'babel-polyfill';
 import './styles/styles.scss';
 
 import React from 'react';

src/vendor.js

@@ -0,0 +1,16 @@
+// Polyfills
+import 'babel-polyfill';
+
+// React Redux
+import 'react';
+import 'react-dom';
+import 'react-hot-loader';
+import 'react-redux';
+import 'react-router';
+import 'react-router-redux';
+import 'redux';
+import 'redux-thunk';
+
+//
+import 'classnames';
+import 'firebase';

webpack.config.js

@@ -36,7 +36,7 @@ module.exports = config;
 
 
 config.resolve = {
-  extensions: ['', '.ts', '.js'],
+  extensions: ['', '.js'],
   modulesDirectories: ['node_modules'],
   root: path.resolve('.')
 };
@@ -63,9 +63,7 @@ config.sassLoader = {
 //-------------------------------------
 if (ENV_DEVELOPMENT || ENV_PRODUCTION) {
   config.entry = {
-    main: [
-      './src/main'
-    ]
+    main: ['./src/main.js']
   };
 
   config.output = {
@@ -76,6 +74,7 @@ if (ENV_DEVELOPMENT || ENV_PRODUCTION) {
 
   config.plugins.push(
     new HtmlWebpackPlugin({
+      chunkSortMode: 'dependency',
       filename: 'index.html',
       hash: false,
       inject: 'body',
@@ -94,7 +93,8 @@ if (ENV_DEVELOPMENT) {
   config.entry.main.unshift(
     `webpack-dev-server/client?http://${HOST}:${PORT}`,
     'webpack/hot/only-dev-server',
-    'react-hot-loader/patch'
+    'react-hot-loader/patch',
+    'babel-polyfill'
   );
 
   config.module = {
@@ -136,20 +136,7 @@ if (ENV_DEVELOPMENT) {
 if (ENV_PRODUCTION) {
   config.devtool = 'source-map';
 
-  config.entry.vendor = [
-    'babel-polyfill',
-    'classnames',
-    'firebase',
-    'history',
-    'react',
-    'react-dom',
-    'react-hot-loader',
-    'react-redux',
-    'react-router',
-    'react-router-redux',
-    'redux',
-    'redux-thunk'
-  ];
+  config.entry.vendor = './src/vendor.js';
 
   config.output.filename = '[name].[chunkhash].js';
 
@@ -162,7 +149,7 @@ if (ENV_PRODUCTION) {
 
   config.plugins.push(
     new WebpackMd5Hash(),
-    new ExtractTextPlugin('styles.css'),
+    new ExtractTextPlugin('styles.[contenthash].css'),
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
       minChunks: Infinity