From 625fd8dd06c680d6ef073b0952c5f7a0693f9b8a Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Thu, 29 Oct 2015 13:51:07 +0100 Subject: [PATCH] Upgraded to React 0.14 --- app/app.tsx | 5 +++-- package.json | 12 ++++++++---- tsd.json | 5 ++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/app.tsx b/app/app.tsx index 2b7bfbd..a779798 100644 --- a/app/app.tsx +++ b/app/app.tsx @@ -1,6 +1,7 @@ -/// +/// import React = require('react'); +import ReactDOM = require('react-dom'); import {observable} from 'mobservable'; import {observer} from 'mobservable-react'; @@ -39,7 +40,7 @@ class Timer extends React.Component<{}, {}> { } function render() { - React.render( + ReactDOM.render( , document.getElementById('app') ); diff --git a/package.json b/package.json index 52125d4..cae0030 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,16 @@ "name": "mobservable-react-typescript", "version": "1.0.0", "description": "Minimal boilerplate for a single-page app using React, TypeScript with JSX (TSX), and Visual Studio Code.", - "repository": "mweststrate/mobservable-react-typescript", + "repository": { + "type": "git", + "url": "https://github.com/mweststrate/mobservable-react-typescript.git" + }, "main": "index.js", "dependencies": { "mobservable": "^1.0.0", - "mobservable-react": "^1.0.1", - "react": "^0.13.3" + "mobservable-react": "^2.0.0", + "react": "^0.14", + "react-dom": "^0.14" }, "devDependencies": { "browserify": "^11.1.0", @@ -18,6 +22,6 @@ "build": "mkdirp public/js/app && tsc && browserify ./temp/app.js -o public/js/app/bundle.js", "start": "http-server" }, - "author": "Benny van Reeven", + "author": "Michel Weststrate", "license": "MIT" } diff --git a/tsd.json b/tsd.json index 363b95c..dc171a9 100644 --- a/tsd.json +++ b/tsd.json @@ -6,7 +6,10 @@ "bundle": "typings/tsd.d.ts", "installed": { "react/react.d.ts": { - "commit": "af81415504b4edce8dac8446d96857f8018c6e9f" + "commit": "62eedc3121a5e28c50473d2e4a9cefbcb9c3957f" + }, + "react-dom/react-dom.d.ts": { + "commit": "62eedc3121a5e28c50473d2e4a9cefbcb9c3957f" } } }