From f539fcb51a19b5e4871d322364fa69297baef6c7 Mon Sep 17 00:00:00 2001 From: Mingdong Luo Date: Mon, 11 Apr 2016 20:55:05 +0800 Subject: [PATCH 1/2] Update package.json --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 462c1e4..9587b5e 100644 --- a/package.json +++ b/package.json @@ -31,29 +31,29 @@ "watch": "concurrently --kill-others \"npm run watch-server-start\" \"npm run watch-server\" \"npm run watch-client\"" }, "dependencies": { - "babel-polyfill": "6.6.1", + "babel-polyfill": "6.7.4", "css-loader": "0.23.1", "fetch-plus": "3.8.1", "fetch-plus-bearerauth": "3.5.0", "fetch-plus-json": "3.6.0", "file-loader": "0.8.5", "isomorphic-fetch": "2.2.1", - "isomorphic-style-loader": "0.0.10", + "isomorphic-style-loader": "0.0.12", "koa": "1.2.0", "koa-proxy": "0.5.0", "koa-static": "2.0.0", "node-sass": "3.4.2", - "react": "0.14.7", - "react-dom": "0.14.7", + "react": "15.0.1", + "react-dom": "15.0.1", "react-inline-css": "2.1.0", - "react-router": "2.0.0", + "react-router": "2.0.1", "react-transmit": "3.1.7", - "sass-loader": "3.1.2", - "style-loader": "0.13.0" + "sass-loader": "3.2.0", + "style-loader": "0.13.1" }, "devDependencies": { "babel": "6.5.2", - "babel-core": "6.6.5", + "babel-core": "6.7.6", "babel-loader": "6.2.4", "babel-preset-es2015": "6.6.0", "babel-preset-react": "6.5.0", @@ -63,7 +63,7 @@ "forever": "0.15.1", "json-loader": "0.5.4", "just-wait": "1.0.5", - "webpack": "1.12.14", + "webpack": "1.12.15", "webpack-dev-server": "1.14.1", "webpack-node-externals": "1.0.0" }, From 50f5530e3828ae5556c95338ede063122f0cec85 Mon Sep 17 00:00:00 2001 From: Mingdong Luo Date: Mon, 11 Apr 2016 20:56:05 +0800 Subject: [PATCH 2/2] Update react/react-router version --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9bd9f7d..6f767fd 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ # React Isomorphic Starterkit -Isomorphic starterkit with server-side React rendering using +Isomorphic starterkit with server-side React rendering using [npm](https://www.npmjs.com), [koa](http://koajs.com), -[webpack](https://webpack.github.io/), +[webpack](https://webpack.github.io/), [babel](http://babeljs.io), [react](https://facebook.github.io/react), -[react-router](https://github.com/rackt/react-router), -[react-transform-hmr](https://github.com/gaearon/react-transform-hmr), +[react-router](https://github.com/rackt/react-router), +[react-transform-hmr](https://github.com/gaearon/react-transform-hmr), [react-transmit](https://github.com/RickWong/react-transmit), [react-inline-css](https://github.com/RickWong/react-inline-css) @@ -18,7 +18,7 @@ Isomorphic starterkit with server-side React rendering using ## Features - Fully automated toolchain with npm run scripts -- React 0.14 + React Router 2.0 on the client and server +- React 15.0.1 + React Router 2.0.1 on the client and server - Babel 6 automatically compiles ES2015 + ES7 stage-0 - Webpack HMR for instant server updates - React Transform HMR for instant client updates @@ -34,7 +34,7 @@ Development ```bash git clone https://github.com/RickWong/react-isomorphic-starterkit.git cd react-isomorphic-starterkit - + npm install npm run watch # Yes, ONE command for both server AND client development! ``` @@ -43,7 +43,7 @@ Production ```bash npm run build -npm run start +npm run start ``` ## Usage @@ -58,4 +58,4 @@ on Twitter. ## License -BSD 3-Clause license. Copyright © 2015, Rick Wong. All rights reserved. +BSD 3-Clause license. Copyright © 2016, Rick Wong. All rights reserved.