Merge pull request #15 from Spendar89/react-10

upgrades react version to 0.10.0 and bumps react-meteor version to 0.6
facebookarchive · Mar 29, 2014 · a5c0b73 · a5c0b73
2 parents aea5612 + 42cf97b
commit a5c0b73
Show file tree

Hide file tree

Showing 6 changed files with 5,361 additions and 2,603 deletions.
diff --git a/examples/leaderboard/.meteor/packages b/examples/leaderboard/.meteor/packages
@@ -16,6 +16,5 @@ underscore
 jquery
 autopublish
 insecure
-preserve-inputs
 random
 react
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.7.0.1
+0.8.0
diff --git a/package.js b/package.js
@@ -2,7 +2,7 @@ Package.describe({
   summary: "React rendering for Meteor apps"
 });
 
-var reactToolsVersion = "0.8.0";
+var reactToolsVersion = "0.10.0";
 
 Npm.depends({
   "react-tools": reactToolsVersion

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "react-meteor",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "React Meteor bindings",
   "main": "lib/ReactMeteor.js",
   "dependencies": {
-    "react": "~0.8",
+    "react": "~0.10",
     "react-raf-batching": "~0.0.0"
   },
   "devDependencies": {

diff --git a/src/require-react.js b/src/require-react.js
@@ -1 +1 @@
-React = Npm.require("react-tools").React;
+React = Npm.require("react");
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		React = Npm.require("react-tools").React;
		React = Npm.require("react");