Fix for #3

Added ES2015 preset

Author: kirill-konshin

.travis.yml

@@ -7,8 +7,7 @@ cache:
 deploy:
   provider: npm
   email: [email protected]
-  api_key:
-    secure: HNtemXD+Dj8hp7E3aKwRdPqzrx7s143IFA9mTRA5Z61T8afI4kX3HB2flmrMdq2dOzi7ujlf7zDEvA6JSWHhXYdY1UOF1OHjt/+hq4p17us5wh5Lqmyf9XXIwjJqW57BhJHLO8tw6EEzaMlZb/AjeOLEWuds0949Hx410YeccXqKQQSSgwuKUTpcH/vPkegXAK9m+Xbhxpp+rN3HlbvlKveh4Dm3LrpPTHIgtLjLtA6S7pwSX7qkNlLVB7YCUUzRzil6TDwzgBV7y+b/U7qA9WfU/07bl/p/4CEnf0/KfnT82OGIDr5yRVs5fCF13Em6stou3BKGmOFUN2OUC7XsaRbvcEeRxtia5BraYlEf/VgVr2bhJ5sNrXqBm6fWfkYt/ft4XC32d5KAw47p6fBwmaXnNKnwSKquVq0xydO+i9NW/77qhjMaXEqqBDd8qMnyyPrwvyR1SfnoFp0ZIF1dVjwiKQCXLCsnOeRQfpHdBTA9OME1O3XxrnpQdk2UetXsQwic0FhhrEEpefce2CMkkmVPilyNl5/9nmptDzBqQeZrTDLv0drXHYSXQ//oWzylXFP8m1S4YReJWQa1AluLlu186V1WsreP+GeeCtTq7KMFk4g/AERSmACaHfT9VYRhB13r1f9i50w3XCC2IJWIeoZocHzk3z/d/AjFeS98fH8=
+  api_key: $NPM_TOKEN
   skip_cleanup: true
   on:
     tags: true

README.md

@@ -22,7 +22,7 @@ Webpack Dev Middleware for simple and painless development and production usage.
 ## Installation
 
 ```bash
-npm install create-react-server babel-preset-react-app --save-dev
+npm install create-react-server babel-preset-react-app babel-preset-es2015 --save-dev
 ```
 
 You don't have to install `babel-preset-react-app` if you use Create React App, it will be pre-installed already.
@@ -51,6 +51,7 @@ npm run redeploy # launch in production mode
 ```json
 {
     "presets": [
+      "es2015",
       "react-app"
     ]
 }
@@ -232,7 +233,7 @@ Available options:
 - `--template` or `-t` path to JS file with `template` function
 - `--outputPath` or `-o` as path to your `build` (e.g. your static files)
 - `--templatePath` or `-i` path to your `index.html`
-- `--debug` or `-d` if you want to get more information of requests handling
+- `--debug` or `-d` if you want to get more information of requests handling & stack traces of errors
 - `--port` or `-p` to bind to something other than `3000`, port will also be automatically taken from `process.env.PORT`
 
 
@@ -522,6 +523,7 @@ And add it to `.babelrc` file or `babel` section of `package.json`:
 ```json
 {
     "presets": [
+      "es2015",
       "react-app"
     ],
     "plugins": [

examples/create-react-app/package.json

@@ -8,6 +8,7 @@
   },
   "babel": {
     "presets": [
+      "es2015",
       "react-app"
     ],
     "plugins": [
@@ -19,16 +20,17 @@
     "isomorphic-fetch": "^2.2.1",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "react-helmet": "^4.0.0",
+    "react-helmet": "^5.1.3",
     "react-redux": "^5.0.3",
-    "react-router": "^3.0.2",
+    "react-router": "^3.0.5",
     "redux": "^3.6.0",
-    "redux-logger": "^2.8.2",
+    "redux-logger": "^3.0.6",
     "redux-promise-middleware": "^4.2.0",
     "redux-thunk": "^2.2.0"
   },
   "devDependencies": {
     "babel-plugin-transform-ensure-ignore": "^0.1.0",
-    "react-scripts": "^0.9.5"
+    "babel-preset-es2015": "^6.24.1",
+    "react-scripts": "^1.0.7"
   }
 }

examples/create-react-app/src/store.js

@@ -1,5 +1,5 @@
 import {applyMiddleware, compose, createStore, combineReducers} from "redux";
-import createLogger from "redux-logger";
+import {createLogger} from "redux-logger";
 import thunk from "redux-thunk";
 import promiseMiddleware from "redux-promise-middleware";
 

examples/create-react-app/template.js

@@ -1,9 +1,9 @@
-import {rewind} from "react-helmet";
+import Helmet from "react-helmet";
 
 export default ({template, html, error}) => {
 
     //@see https://github.com/nfl/react-helmet#server-usage
-    const head = rewind();
+    const head = Helmet.renderStatic();
 
     const errorHtml = error
         ? `<div id="server-error"><h1>Server Error</h1><pre>${error.stack || error}</pre></div>`

examples/webpack-blocks/package.json

@@ -9,6 +9,7 @@
   },
   "babel": {
     "presets": [
+      "es2015",
       "react-app"
     ],
     "plugins": [
@@ -21,11 +22,11 @@
     "isomorphic-fetch": "^2.2.1",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "react-helmet": "^4.0.0",
+    "react-helmet": "^5.1.3",
     "react-redux": "^5.0.3",
-    "react-router": "^3.0.2",
+    "react-router": "^3.0.5",
     "redux": "^3.6.0",
-    "redux-logger": "^2.8.1",
+    "redux-logger": "^3.0.6",
     "redux-promise-middleware": "^4.2.0",
     "redux-thunk": "^2.2.0"
   },
@@ -34,14 +35,14 @@
     "@webpack-blocks/dev-server2": "^0.4.0",
     "@webpack-blocks/webpack2": "^0.4.0",
     "babel-cli": "^6.23.0",
-    "babel-plugin-dynamic-import-webpack": "^1.0.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-ensure-ignore": "^0.1.0",
-    "babel-preset-react-app": "^2.1.1",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react-app": "^3.0.0",
     "express": "^4.14.1",
     "html-webpack-plugin": "^2.28.0",
     "rimraf": "^2.6.1",
-    "webpack": "^2.2.1",
+    "webpack": "^3.0.0",
     "webpack-dev-server": "^2.4.1"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-react-server",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Server & middleware for React + Router + Redux with Server Side Rendering",
   "scripts": {
     "test": "jest",
@@ -14,6 +14,7 @@
   },
   "babel": {
     "presets": [
+      "es2015",
       "react-app"
     ],
     "plugins": [
@@ -26,8 +27,9 @@
   },
   "devDependencies": {
     "babel-plugin-transform-ensure-ignore": "^0.1.0",
-    "babel-preset-react-app": "^2.2.0",
-    "jest": "^19.0.2",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react-app": "^3.0.0",
+    "jest": "^20.0.4",
     "memory-fs": "^0.4.1",
     "node-fetch": "^1.6.3",
     "react": "^15.4.2",
@@ -42,7 +44,7 @@
     "express": "^4.14.1",
     "hoist-non-react-statics": "^1.2.0",
     "prop-types": "^15.5.8",
-    "yargs": "^7.0.2"
+    "yargs": "^8.0.2"
   },
   "peerDependencies": {
     "react": "*",