Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove React-specific code in favor of gaearon/redux-react #249

Merged
merged 2 commits into from
Jul 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ npm-debug.log
dist
lib
coverage
react.js
react-native.js
2 changes: 1 addition & 1 deletion examples/counter/containers/App.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion examples/counter/containers/CounterApp.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion examples/counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/todomvc/containers/App.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion examples/todomvc/containers/TodoApp.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion examples/todomvc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions scripts/browser
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 0 additions & 17 deletions src/components/createAll.js

This file was deleted.

25 changes: 0 additions & 25 deletions src/components/createConnectDecorator.js

This file was deleted.

89 changes: 0 additions & 89 deletions src/components/createConnector.js

This file was deleted.

20 changes: 0 additions & 20 deletions src/components/createProvideDecorator.js

This file was deleted.

40 changes: 0 additions & 40 deletions src/components/createProvider.js

This file was deleted.

1 change: 0 additions & 1 deletion src/entry-react-native.js

This file was deleted.

1 change: 0 additions & 1 deletion src/entry-react.js

This file was deleted.

4 changes: 0 additions & 4 deletions src/react-native.js

This file was deleted.

4 changes: 0 additions & 4 deletions src/react.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/umd-react.js

This file was deleted.

1 change: 0 additions & 1 deletion src/umd.js

This file was deleted.

7 changes: 0 additions & 7 deletions src/utils/createStoreShape.js

This file was deleted.

3 changes: 0 additions & 3 deletions src/utils/getDisplayName.js

This file was deleted.

3 changes: 0 additions & 3 deletions src/utils/identity.js

This file was deleted.

23 changes: 0 additions & 23 deletions src/utils/shallowEqual.js

This file was deleted.

34 changes: 0 additions & 34 deletions src/utils/shallowEqualScalar.js

This file was deleted.

Loading