Merge pull request jaysoo#1 from niieani/master

Update to latest React & Redux

Author: jaysoo

client/actions/__spec__/todos-spec.ts

@@ -1,4 +1,5 @@
-/// <reference path='../../../test.d.ts'/>
+/// <reference path='../../../typings/mocha/mocha.d.ts'/>
+/// <reference path='../../../typings/chai/chai.d.ts'/>
 
 import { expect } from 'chai';
 

client/components/Footer.tsx

@@ -1,7 +1,7 @@
 /// <reference path='../../typings/react/react.d.ts'/>
 /// <reference path='../../typings/classnames/classnames.d.ts'/>
 import * as React from 'react';
-import * as classNames from 'classnames';
+import classNames from 'classnames';
 
 import {
   SHOW_ALL,

client/components/TodoItem.tsx

@@ -2,7 +2,7 @@
 /// <reference path='../../typings/classnames/classnames.d.ts'/>
 
 import * as React from 'react';
-import * as classNames from 'classnames';
+import classNames from 'classnames';
 
 import { Todo } from '../models/todos';
 import TodoTextInput from './TodoTextInput';

client/components/TodoTextInput.tsx

@@ -2,7 +2,7 @@
 /// <reference path='../../typings/classnames/classnames.d.ts'/>
 
 import * as React from 'react';
-import * as classNames from 'classnames';
+import classNames from 'classnames';
 
 interface TodoTextInputProps {
   onSave: Function;
@@ -59,4 +59,4 @@ class TodoTextInput extends React.Component<TodoTextInputProps, any> {
 }
 
 
-export default TodoTextInput;
+export default TodoTextInput;

client/main.tsx

@@ -1,9 +1,12 @@
 /// <reference path='../typings/react/react.d.ts'/>
+/// <reference path='../typings/react-dom/react-dom.d.ts'/>
 /// <reference path='../typings/redux-actions/redux-actions.d.ts'/>
 /// <reference path='../typings/redux/redux.d.ts'/>
 /// <reference path='../typings/react-redux/react-redux.d.ts'/>
 
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import '../src-scss/main.css!';
 
 import {
   Store,
@@ -18,18 +21,16 @@ import {
 } from 'react-redux';
 import { Action } from 'redux-actions';
 
-import App from './containers/App.tsx';
-import { rootReducer } from './reducers/rootReducer.ts';
+import App from './containers/App';
+import { rootReducer } from './reducers/rootReducer';
 
-const initialState = {
-};
+const initialState = {};
 
 const store: Store = createStore(rootReducer, initialState);
 
-React.render(
+ReactDOM.render(
   <Provider store={store}>
-    {() => <App />}
+    <App />
   </Provider>,
   document.getElementById('app')
 );
-

client/reducers/__spec__/todos-spec.ts

@@ -1,4 +1,5 @@
-/// <reference path='../../../test.d.ts'/>
+/// <reference path='../../../typings/mocha/mocha.d.ts'/>
+/// <reference path='../../../typings/chai/chai.d.ts'/>
 
 import { expect } from 'chai';
 

package.json

@@ -16,38 +16,38 @@
   "author": "Jack Hsu <jack.hsu@gmail.com>",
   "license": "ISC",
   "dependencies": {
-    "classnames": "2.1.3",
-    "express": "4.7.2",
-    "extract-text-webpack-plugin": "0.8.0",
-    "lodash": "3.2.0",
-    "react": "0.13.3",
-    "react-redux": "0.9.0",
-    "redux": "1.0.1",
+    "classnames": "2.2.0",
+    "express": "4.13.3",
+    "extract-text-webpack-plugin": "0.9.1",
+    "lodash": "3.10.1",
+    "react": "0.14.2",
+    "react-redux": "4.0.0",
+    "redux": "3.0.4",
     "redux-actions": "0.8.0",
-    "serve-static": "1.9.2",
+    "serve-static": "1.10.0",
     "todomvc-app-css": "2.0.1",
-    "yargs": "3.5.3"
+    "yargs": "3.29.0"
   },
   "devDependencies": {
     "babel": "5.2.17",
     "babel-core": "5.2.17",
     "babel-loader": "5.0.0",
     "babel-runtime": "5.2.17",
-    "chai": "2.3.0",
-    "css-loader": "0.14.0",
-    "eslint-plugin-react": "3.3.0",
-    "file-loader": "0.8.1",
-    "jsdom": "3.1.2",
+    "chai": "3.4.1",
+    "css-loader": "0.22.0",
+    "eslint-plugin-react": "3.8.0",
+    "file-loader": "0.8.4",
+    "jsdom": "7.0.2",
     "mocha": "2.3.3",
-    "react-hot-loader": "1.2.9",
-    "redux-devtools": "1.0.2",
+    "react-hot-loader": "1.3.0",
+    "redux-devtools": "2.1.5",
     "socket.io": "1.3.7",
-    "stats-webpack-plugin": "0.1.2",
-    "style-loader": "0.12.0",
-    "ts-loader": "0.5.5",
+    "stats-webpack-plugin": "0.2.2",
+    "style-loader": "0.13.0",
+    "ts-loader": "0.6.1",
     "typescript": "1.6.2",
     "typescript-require": "0.2.9-1",
-    "webpack": "1.9.4",
-    "webpack-dev-server": "1.11.0"
+    "webpack": "1.12.3",
+    "webpack-dev-server": "1.12.1"
   }
 }

typings/classnames/classnames.d.ts

@@ -1,18 +1,22 @@
 // Type definitions for classnames
 // Project: https://github.com/JedWatson/classnames
-// Definitions by: Dave Keen <http://www.keendevelopment.ch>, Adi Dahiya <https://github.com/adidahiya>
+// Definitions by: Dave Keen <http://www.keendevelopment.ch>, Adi Dahiya <https://github.com/adidahiya>, Jason Killian <https://github.com/JKillian>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+declare type ClassValue = string | number | ClassDictionary | ClassArray;
+
 interface ClassDictionary {
 	[id: string]: boolean;
 }
 
+interface ClassArray extends Array<ClassValue> { }
+
 interface ClassNamesFn {
-	(...classes: (string | ClassDictionary)[]): string;
+	(...classes: ClassValue[]): string;
 }
 
 declare var classNames: ClassNamesFn;
 
 declare module "classnames" {
-	export = classNames
+	export default classNames
 }

typings/react-dom/react-dom.d.ts

@@ -0,0 +1,40 @@
+// Type definitions for React-DOM v0.14.0-rc
+// Project: https://www.npmjs.com/package/react-dom
+// Definitions by: Stefan-Bieliauskas <http://www.conts.de>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./../react/react.d.ts" />
+
+declare namespace __ReactDom {
+    function render<P>(
+        element: __React.DOMElement<P>,
+        container: Element,
+        callback?: () => any): __React.DOMComponent<P>;
+    function render<P, S>(
+        element: __React.ClassicElement<P>,
+        container: Element,
+        callback?: () => any): __React.ClassicComponent<P, S>;
+    function render<P, S>(
+        element: __React.ReactElement<P>,
+        container: Element,
+        callback?: () => any): __React.Component<P, S>;
+
+    function findDOMNode<TElement extends Element>(
+        componentOrElement: __React.Component<any, any> | Element): TElement;
+    function findDOMNode(
+        componentOrElement: __React.Component<any, any> | Element): Element;
+
+    function unmountComponentAtNode(container: Element): boolean;
+}
+
+declare namespace __ReactDomServer {
+    function renderToString(element: __React.ReactElement<any>): string;
+    function renderToStaticMarkup(element: __React.ReactElement<any>): string;
+}
+declare module "react-dom" {
+    export = __ReactDom
+}
+
+declare module "react-dom/server" {
+    export = __ReactDomServer
+}