Merge pull request #21 from combine/feature/migrate-to-yarn

Feature/migrate to yarn

Author: calvinl

.nvmrc

@@ -1 +1 @@
-v6.4.0
+v6.7.0

README.md

@@ -11,6 +11,13 @@ promise that future updates will not break your existing application.**
 
 ## Get started
 
+If you have (yarn)[https://github.com/yarnpkg/yarn] installed (recommended):
+```
+yarn install
+npm start
+```
+
+Otherwise:
 ```
 npm install
 npm start

package.json

@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/combine/react-redux-starter.git"
+    "url": "https://github.com/combine/universal-react-redux.git"
   },
   "engines": {
     "node": "6.2.1",
@@ -31,72 +31,72 @@
     "postinstall": "if [ \"$NODE_ENV\" = \"production\" ]; then npm run prod:build; fi"
   },
   "devDependencies": {
-    "babel-eslint": "6.1.2",
-    "eslint": "3.4.0",
-    "eslint-loader": "1.5.0",
-    "eslint-plugin-react": "6.2.0",
-    "nodemon": "1.10.2",
+    "babel-eslint": "7.0.0",
+    "eslint": "3.8.1",
+    "eslint-loader": "1.6.0",
+    "eslint-plugin-react": "6.4.1",
+    "nodemon": "1.11.0",
     "react-transform-catch-errors": "1.0.2",
     "react-transform-hmr": "1.0.4",
-    "redbox-react": "1.3.0",
+    "redbox-react": "1.3.2",
     "redux-devtools": "3.3.1",
     "redux-devtools-dock-monitor": "1.1.1",
     "redux-devtools-log-monitor": "1.0.11",
-    "webpack-dev-server": "1.15.1",
+    "webpack-dev-server": "1.16.2",
     "webpack-sources": "0.1.2"
   },
   "dependencies": {
-    "app-module-path": "1.1.0",
-    "autoprefixer": "6.4.1",
+    "app-module-path": "2.1.0",
+    "autoprefixer": "6.5.1",
     "babel": "6.5.2",
-    "babel-cli": "6.14.0",
-    "babel-core": "6.14.0",
+    "babel-cli": "6.16.0",
+    "babel-core": "6.17.0",
     "babel-loader": "6.2.5",
     "babel-plugin-react-transform": "2.0.2",
-    "babel-plugin-resolver": "1.0.0",
+    "babel-plugin-resolver": "1.1.0",
     "babel-plugin-syntax-class-properties": "6.13.0",
     "babel-plugin-syntax-decorators": "6.13.0",
     "babel-plugin-syntax-object-rest-spread": "6.13.0",
-    "babel-plugin-transform-class-properties": "6.11.5",
+    "babel-plugin-transform-class-properties": "6.16.0",
     "babel-plugin-transform-decorators": "6.13.0",
-    "babel-plugin-transform-object-rest-spread": "6.8.0",
-    "babel-polyfill": "6.13.0",
-    "babel-preset-es2015": "6.14.0",
-    "babel-preset-react": "6.11.1",
-    "babel-register": "6.14.0",
+    "babel-plugin-transform-object-rest-spread": "6.16.0",
+    "babel-polyfill": "6.16.0",
+    "babel-preset-es2015": "6.16.0",
+    "babel-preset-react": "6.16.0",
+    "babel-register": "6.16.3",
     "classnames": "2.2.5",
     "compression": "1.6.2",
-    "compression-webpack-plugin": "0.3.1",
-    "css-loader": "0.24.0",
-    "css-modules-require-hook": "4.0.2",
+    "compression-webpack-plugin": "0.3.2",
+    "css-loader": "0.25.0",
+    "css-modules-require-hook": "4.0.5",
     "expose-loader": "0.7.1",
     "express": "4.14.0",
     "extract-text-webpack-plugin": "1.0.1",
     "file-loader": "0.9.0",
     "font-awesome": "4.6.3",
-    "history": "3.2.1",
+    "history": "4.3.0",
     "include-media": "1.4.8",
     "isomorphic-fetch": "2.2.1",
     "json-loader": "0.5.4",
-    "lodash": "4.15.0",
-    "mocha": "3.0.2",
-    "node-sass": "3.9.0",
-    "postcss-loader": "0.11.1",
-    "react": "15.3.1",
-    "react-dom": "15.3.1",
+    "lodash": "4.16.4",
+    "mocha": "3.1.2",
+    "node-sass": "3.10.1",
+    "postcss-loader": "1.0.0",
+    "react": "15.3.2",
+    "react-dom": "15.3.2",
     "react-redux": "4.4.5",
-    "react-router": "2.7.0",
-    "react-router-redux": "4.0.5",
+    "react-router": "2.8.1",
+    "react-router-redux": "4.0.6",
     "redux": "3.6.0",
     "redux-localstorage": "0.4.1",
     "redux-thunk": "2.1.0",
-    "reselect": "2.5.3",
+    "reselect": "2.5.4",
     "resolve-url-loader": "1.6.0",
-    "sass-loader": "4.0.1",
+    "sass-loader": "4.0.2",
     "serve-static": "1.11.1",
     "style-loader": "0.13.1",
     "url-loader": "0.5.7",
     "webpack": "1.13.2",
-    "webpack-isomorphic-tools": "2.5.8"
+    "webpack-isomorphic-tools": "2.6.3"
   }
 }

server/index.js

@@ -14,9 +14,11 @@ require('css-modules-require-hook')({
 
 // this must be equal to the Webpack configuration's "context" parameter
 const basePath = require('path').resolve(__dirname, '..');
+
+// configure isomoprhic tools
 const ISOTools = require('webpack-isomorphic-tools');
+const isoConfig = require('../webpack/isomorphic').default;
+const server = require('./server');
 
 // this global variable will be used later in express middleware
-global.ISOTools = new ISOTools(require('../webpack/isomorphic').default)
-  .development(process.env.NODE_ENV === 'development')
-  .server(basePath, () => require('./server'));
+global.ISOTools = new ISOTools(isoConfig).server(basePath, () => server);