Merge pull request mui#1978 from davidmdem/Example_Dependencies_Fix

[example] Update projects
tyfoo · Oct 23, 2015 · 75f6782 · 75f6782
2 parents 2c18cd7 + f8de5da
commit 75f6782
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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"
   }
 }
diff --git 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,