Merge pull request #63 from johnnyreilly/master

Migrated to React 0.14.3

Author: mhegazy

es6-babel-react-flux-karma/package.json

@@ -41,7 +41,6 @@
     "gulp-eslint": "^1.0.0",
     "gulp-if": "^2.0.0",
     "gulp-inject": "^3.0.0",
-    "gulp-jshint": "^1.11.2",
     "gulp-notify": "^2.2.0",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-streamify": "1.0.0",
@@ -58,8 +57,11 @@
     "karma-sourcemap-loader": "^0.3.6",
     "karma-webpack": "^1.7.0",
     "phantomjs": "^1.9.17",
-    "react": "^0.13.3",
+    "react": "^0.14.3",
     "ts-loader": "^0.6.0",
+    "react-addons-test-utils": "^0.14.3",
+    "react-dom": "^0.14.3",
+    "ts-loader": "^0.7.1",
     "typescript": "^1.6.2",
     "webpack": "^1.12.2",
     "webpack-notifier": "^1.2.1"

es6-babel-react-flux-karma/src/components/App.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react/addons';
+import * as React from 'react';
 import GreetingStore from '../stores/GreetingStore';
 import * as GreetingActions from '../actions/GreetingActions';
 import GreetingState from '../types/GreetingState';

es6-babel-react-flux-karma/src/components/Greeting.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react/addons';
+import * as React from 'react';
 import * as GreetingActions from '../actions/GreetingActions';
 
 interface Props {

es6-babel-react-flux-karma/src/components/WhoToGreet.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react/addons';
+import * as React from 'react';
 import * as GreetingActions from '../actions/GreetingActions';
 
 interface Props {

es6-babel-react-flux-karma/src/main.tsx

@@ -1,5 +1,7 @@
 import './dependencies';
-import * as React from 'react/addons';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import App from './components/App';
+React; // use React as an expression to prevent React being purged from dependencies as not used directly
 
-React.render(<App />, document.getElementById('content'));
+ReactDOM.render(<App />, document.getElementById('content'));

es6-babel-react-flux-karma/src/tsconfig.json

@@ -3,6 +3,7 @@
     "filesGlob": [
         "../typings/**/*.*.ts",
         "!../typings/jasmine/jasmine.d.ts",
+        "!../typings/react/react-addons-test-utils.d.ts",
         "**/*.{ts,tsx}"
     ],
     "compilerOptions": {
@@ -16,6 +17,7 @@
     "files": [
         "../typings/flux/flux.d.ts",
         "../typings/node/node.d.ts",
+        "../typings/react/react-dom.d.ts",
         "../typings/react/react.d.ts",
         "../typings/tsd.d.ts",
         "actions/GreetingActions.ts",

es6-babel-react-flux-karma/test/components/App.tests.tsx

@@ -1,10 +1,10 @@
-import * as React from 'react/addons';
+import * as React from 'react';
+import * as TestUtils from 'react-addons-test-utils';
 import App from '../../src/components/App';
 import WhoToGreet from '../../src/components/WhoToGreet';
 import Greeting from '../../src/components/Greeting';
 import GreetingStore from '../../src/stores/GreetingStore';
-
-const { TestUtils } = React.addons;
+React; // use React as an expression to prevent React being purged from dependencies as not used directly
 
 describe('App', () => {
   it('renders expected HTML', () => {

es6-babel-react-flux-karma/test/components/Greeting.tests.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react/addons';
+import * as React from 'react';
+import * as TestUtils from 'react-addons-test-utils';
 import Greeting from '../../src/components/Greeting';
 import * as GreetingActions from '../../src/actions/GreetingActions';
-
-const { TestUtils } = React.addons;
+React; // use React as an expression to prevent React being purged from dependencies as not used directly
 
 describe('Greeting', () => {
   let handleSelectionChangeSpy: jasmine.Spy;

es6-babel-react-flux-karma/test/components/WhoToGreet.tests.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react/addons';
+import * as React from 'react';
+import * as TestUtils from 'react-addons-test-utils';
 import WhoToGreet from '../../src/components/WhoToGreet';
 import * as GreetingActions from '../../src/actions/GreetingActions';
-
-const { TestUtils } = React.addons;
+React; // use React as an expression to prevent React being purged from dependencies as not used directly
 
 describe('WhoToGreet', () => {
   let handleSelectionChangeSpy: jasmine.Spy;

es6-babel-react-flux-karma/test/tsconfig.json

@@ -22,6 +22,8 @@
         "../typings/flux/flux.d.ts",
         "../typings/jasmine/jasmine.d.ts",
         "../typings/node/node.d.ts",
+        "../typings/react/react-addons-test-utils.d.ts",
+        "../typings/react/react-dom.d.ts",
         "../typings/react/react.d.ts",
         "../typings/tsd.d.ts"
     ],

es6-babel-react-flux-karma/tsd.json

@@ -6,16 +6,22 @@
   "bundle": "typings/tsd.d.ts",
   "installed": {
     "jasmine/jasmine.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
     },
     "flux/flux.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
     },
     "node/node.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
     },
     "react/react.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
-    }
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
+    },
+    "react/react-dom.d.ts": {
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
+    },
+    "react/react-addons-test-utils.d.ts": {
+      "commit": "fa04c80f4a889613b96cb4f283848c61a9f64233"
+     }
   }
 }

es6-babel-react-flux-karma/webpack.config.js

@@ -9,7 +9,7 @@ module.exports = {
   entry: {
     main: './src/main.tsx',
     vendor: [
-      'react/addons',
+      'react',
       'flux',
       'events',
       'babel/polyfill'