Merge pull request #249 from gaearon/remove-react

Remove React-specific code in favor of gaearon/redux-react
reduxjs · Jul 12, 2015 · 66ec814 · 66ec814
2 parents c80a77a + ab347bf
commit 66ec814
Show file tree

Hide file tree

Showing 35 changed files with 11 additions and 1,060 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,3 @@ npm-debug.log
 dist
 lib
 coverage
-react.js
-react-native.js
diff --git a/examples/counter/containers/App.js b/examples/counter/containers/App.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import CounterApp from './CounterApp';
 import { createStore, applyMiddleware } from 'redux';
-import { Provider } from 'redux/react';
+import { Provider } from 'react-redux';
 import * as reducers from '../reducers';
 
 const createStoreWithMiddleware = applyMiddleware()(createStore);

diff --git a/examples/counter/containers/CounterApp.js b/examples/counter/containers/CounterApp.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
-import { connect } from 'redux/react';
+import { connect } from 'react-redux';
 import Counter from '../components/Counter';
 import * as CounterActions from '../actions/CounterActions';
 

diff --git a/examples/counter/package.json b/examples/counter/package.json
@@ -28,7 +28,8 @@
   "homepage": "https://github.com/gaearon/redux#readme",
   "dependencies": {
     "react": "^0.13.3",
-    "redux": "^0.12.0"
+    "redux": "^1.0.0-alpha",
+    "react-redux": "^1.0.0-alpha"
   },
   "devDependencies": {
     "babel-core": "^5.5.8",

diff --git a/examples/todomvc/containers/App.js b/examples/todomvc/containers/App.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import TodoApp from './TodoApp';
 import { createStore } from 'redux';
-import { Provider } from 'redux/react';
+import { Provider } from 'react-redux';
 import * as reducers from '../reducers';
 
 const store = createStore(reducers);

diff --git a/examples/todomvc/containers/TodoApp.js b/examples/todomvc/containers/TodoApp.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
-import { Connector } from 'redux/react';
+import { Connector } from 'react-redux';
 import Header from '../components/Header';
 import MainSection from '../components/MainSection';
 import * as TodoActions from '../actions/TodoActions';

diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -30,7 +30,8 @@
   "dependencies": {
     "classnames": "^2.1.2",
     "react": "^0.13.3",
-    "redux": "^0.12.0"
+    "redux": "^1.0.0-alpha",
+    "react-redux": "^1.0.0-alpha"
   },
   "devDependencies": {
     "babel-core": "^5.5.8",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux",
-  "version": "0.12.0",
+  "version": "1.0.0-alpha",
   "description": "Atomic Flux with hot reloading",
   "main": "lib/index.js",
   "scripts": {
@@ -44,9 +44,7 @@
     "eslint-plugin-react": "^2.3.0",
     "expect": "^1.6.0",
     "istanbul": "^0.3.15",
-    "jsdom": "~5.4.3",
     "mocha": "^2.2.5",
-    "mocha-jsdom": "~0.4.0",
     "react": "^0.13.0",
     "react-hot-loader": "^1.2.7",
     "rimraf": "^2.3.4",

diff --git a/scripts/browser b/scripts/browser
@@ -4,8 +4,5 @@ WEBPACK_CMD=node_modules/.bin/webpack
 
 mkdir -p dist
 
-$WEBPACK_CMD src/umd.js dist/redux.js
-NODE_ENV=production $WEBPACK_CMD src/umd.js dist/redux.min.js
-
-$WEBPACK_CMD src/umd-react.js dist/redux-react.js
-NODE_ENV=production $WEBPACK_CMD src/umd-react.js dist/redux-react.min.js
+$WEBPACK_CMD src/index.js dist/redux.js
+NODE_ENV=production $WEBPACK_CMD src/index.js dist/redux.min.js
diff --git a/scripts/build b/scripts/build
@@ -2,6 +2,3 @@
 
 rm -rf lib
 `npm bin`/babel src --out-dir lib
-
-mv lib/entry-react.js ./react.js
-mv lib/entry-react-native.js ./react-native.js
diff --git a/src/components/createAll.js b/src/components/createAll.js
diff --git a/src/components/createConnectDecorator.js b/src/components/createConnectDecorator.js
diff --git a/src/components/createConnector.js b/src/components/createConnector.js
diff --git a/src/components/createProvideDecorator.js b/src/components/createProvideDecorator.js
diff --git a/src/components/createProvider.js b/src/components/createProvider.js
diff --git a/src/entry-react-native.js b/src/entry-react-native.js
diff --git a/src/entry-react.js b/src/entry-react.js
diff --git a/src/react-native.js b/src/react-native.js
diff --git a/src/react.js b/src/react.js
diff --git a/src/umd-react.js b/src/umd-react.js
diff --git a/src/umd.js b/src/umd.js
diff --git a/src/utils/createStoreShape.js b/src/utils/createStoreShape.js
diff --git a/src/utils/getDisplayName.js b/src/utils/getDisplayName.js
diff --git a/src/utils/identity.js b/src/utils/identity.js
diff --git a/src/utils/shallowEqual.js b/src/utils/shallowEqual.js
diff --git a/src/utils/shallowEqualScalar.js b/src/utils/shallowEqualScalar.js