Skip to content

Commit

Permalink
Upgraded to React 0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
mweststrate committed Oct 29, 2015
1 parent 45001f9 commit 625fd8d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
5 changes: 3 additions & 2 deletions app/app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// <reference path="../typings/react/react.d.ts" />
/// <reference path="../typings/tsd.d.ts" />

import React = require('react');
import ReactDOM = require('react-dom');
import {observable} from 'mobservable';
import {observer} from 'mobservable-react';

Expand Down Expand Up @@ -39,7 +40,7 @@ class Timer extends React.Component<{}, {}> {
}

function render() {
React.render(
ReactDOM.render(
<Demo name="World" />,
document.getElementById('app')
);
Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
5 changes: 4 additions & 1 deletion tsd.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}

0 comments on commit 625fd8d

Please sign in to comment.