From db7d0cbb8b194f7dcdc8b750eb44f9d50ea873e0 Mon Sep 17 00:00:00 2001 From: David DeMeulenaere Date: Fri, 23 Oct 2015 11:22:39 -0400 Subject: [PATCH 1/2] Update dependencies in example projects --- examples/browserify-gulp-example/package.json | 11 ++++++++--- examples/webpack-example/package.json | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/examples/browserify-gulp-example/package.json b/examples/browserify-gulp-example/package.json index e5f5071a02042a..383c5cdb58df3e 100644 --- a/examples/browserify-gulp-example/package.json +++ b/examples/browserify-gulp-example/package.json @@ -23,8 +23,13 @@ "watchify": "^2.2.1" }, "dependencies": { - "material-ui": ">=0.8", - "react": ">=0.13", - "react-tap-event-plugin": "^0.1.3" + "material-ui": "^0.13.0", + "react": "^0.14.0", + "react-dom":"^0.14.0", + "react-tap-event-plugin": "^0.2.1", + "react-addons-create-fragment": "^0.14.0", + "react-addons-pure-render-mixin": "^0.14.0", + "react-addons-transition-group": "^0.14.0", + "react-addons-update": "^0.14.0" } } diff --git a/examples/webpack-example/package.json b/examples/webpack-example/package.json index 27b2886b351619..b22460ac2106df 100644 --- a/examples/webpack-example/package.json +++ b/examples/webpack-example/package.json @@ -25,8 +25,13 @@ "webpack-dev-server": "^1.10.1" }, "dependencies": { - "material-ui": ">=0.8", - "react": "0.13", - "react-tap-event-plugin": "^0.1.3" + "material-ui": "^0.13.0", + "react": "^0.14.0", + "react-dom":"^0.14.0", + "react-tap-event-plugin": "^0.2.1", + "react-addons-create-fragment": "^0.14.0", + "react-addons-pure-render-mixin": "^0.14.0", + "react-addons-transition-group": "^0.14.0", + "react-addons-update": "^0.14.0" } } From f8de5da7d673521e6cbe2546dd70cc1ed8580f60 Mon Sep 17 00:00:00 2001 From: David DeMeulenaere Date: Fri, 23 Oct 2015 11:27:01 -0400 Subject: [PATCH 2/2] Set contetnBase in example webpack dev server --- examples/webpack-example/webpack-dev-server.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webpack-example/webpack-dev-server.config.js b/examples/webpack-example/webpack-dev-server.config.js index bc43426c63eae7..dc99845e8f7d80 100644 --- a/examples/webpack-example/webpack-dev-server.config.js +++ b/examples/webpack-example/webpack-dev-server.config.js @@ -18,7 +18,7 @@ var config = { }, //Server Configuration options devServer:{ - contentBase: '', //Relative directory for base of server + contentBase: 'src/www', //Relative directory for base of server devtool: 'eval', hot: true, //Live-reload inline: true,