Skip to content
This repository was archived by the owner on Oct 26, 2018. It is now read-only.

Commit 98ceca0

Browse files
committed
Merge remote-tracking branch 'origin/master' into synchronicity
2 parents 8ed23ca + fe88422 commit 98ceca0

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

CHANGELOG.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
## [HEAD](https://github.com/rackt/react-router-redux/compare/3.0.0...master)
1+
## [HEAD](https://github.com/reactjs/react-router-redux/compare/3.0.0...master)
22

33
- Nothing yet!
44

5-
## [3.0.0](https://github.com/rackt/react-router-redux/compare/2.1.0...3.0.0)
5+
## [3.0.0](https://github.com/reactjs/react-router-redux/compare/2.1.0...3.0.0)
66

77
Technically, 2.1.0 broke semver. The appropriate @timdorr's have been flogged. So, we're bumping the major version to catch up.
88

9-
- Fixed Resets in Redux Dev Tools. [3ae8110f](https://github.com/rackt/react-router-redux/commit/3ae8110f)
10-
- Ensure the initialState is set properly. [a00acfd4](https://github.com/rackt/react-router-redux/commit/a00acfd4)
11-
- Support any number of args on action creators [524898b5](https://github.com/rackt/react-router-redux/commit/524898b5)
9+
- Fixed Resets in Redux Dev Tools. [3ae8110f](https://github.com/reactjs/react-router-redux/commit/3ae8110f)
10+
- Ensure the initialState is set properly. [a00acfd4](https://github.com/reactjs/react-router-redux/commit/a00acfd4)
11+
- Support any number of args on action creators [524898b5](https://github.com/reactjs/react-router-redux/commit/524898b5)
1212

13-
## [2.1.0](https://github.com/rackt/react-router-redux/compare/2.0.4...2.1.0)
13+
## [2.1.0](https://github.com/reactjs/react-router-redux/compare/2.0.4...2.1.0)
1414

15-
- `listenForReplays` has a `selectLocationState` selector. [#218](https://github.com/rackt/react-router-redux/pull/218)
16-
- Provide unscoped action creators. [#225](https://github.com/rackt/react-router-redux/pull/225)
15+
- `listenForReplays` has a `selectLocationState` selector. [#218](https://github.com/reactjs/react-router-redux/pull/218)
16+
- Provide unscoped action creators. [#225](https://github.com/reactjs/react-router-redux/pull/225)
1717
- Example updated to use fully ES2015 syntax.
1818

19-
## [2.0.4](https://github.com/rackt/react-router-redux/compare/2.0.2...2.0.4)
19+
## [2.0.4](https://github.com/reactjs/react-router-redux/compare/2.0.2...2.0.4)
2020

21-
- Remove `history` module published within the tarball. [#133](https://github.com/rackt/react-router-redux/issues/133)
22-
- Make actions conform to [Flux Standard Action](https://github.com/acdlite/flux-standard-action). [#208](https://github.com/rackt/react-router-redux/pull/208)
21+
- Remove `history` module published within the tarball. [#133](https://github.com/reactjs/react-router-redux/issues/133)
22+
- Make actions conform to [Flux Standard Action](https://github.com/acdlite/flux-standard-action). [#208](https://github.com/reactjs/react-router-redux/pull/208)
2323

24-
## [2.0.2](https://github.com/rackt/react-router-redux/compare/1.0.2...2.0.2)
24+
## [2.0.2](https://github.com/reactjs/react-router-redux/compare/1.0.2...2.0.2)
2525

2626
Versions 2.0.0 and 2.0.1 were test releases for the 2.* series. 2.0.2 is the first public release.
2727

@@ -31,20 +31,20 @@ Versions 2.0.0 and 2.0.1 were test releases for the 2.* series. 2.0.2 is the fir
3131
* If you use redux devtools, you need to call `middleware.listenForReplays(store)` on the middleware returned from `syncHistory`. Create the store first with the middleware, then call this function with the store.
3232
* Action creators are now contained in a single object called `routeActions`. `go`, `goBack`, and `goForward` action creators have been added.
3333
* `UPDATE_PATH` is now `UPDATE_LOCATION`.
34-
* The fully parsed [location object](https://github.com/rackt/history/blob/master/docs/Location.md) is now stored in the state instead of a URL string. To access the path, use `state.routing.location.pathname` instead of `state.routing.path`.
34+
* The fully parsed [location object](https://github.com/reactjs/history/blob/master/docs/Location.md) is now stored in the state instead of a URL string. To access the path, use `state.routing.location.pathname` instead of `state.routing.path`.
3535

36-
[View the new docs](https://github.com/rackt/react-router-redux#api)
36+
[View the new docs](https://github.com/reactjs/react-router-redux#api)
3737

38-
## [1.0.2](https://github.com/rackt/react-router-redux/compare/1.0.1...1.0.2)
38+
## [1.0.2](https://github.com/reactjs/react-router-redux/compare/1.0.1...1.0.2)
3939

4040
* Only publish relevant files to npm
4141

42-
## [1.0.1](https://github.com/rackt/react-router-redux/compare/1.0.0...1.0.1)
42+
## [1.0.1](https://github.com/reactjs/react-router-redux/compare/1.0.0...1.0.1)
4343

4444
* Solve problem with `basename` causing infinite redirects (#103)
4545
* Switched to ES6 imports/exports internally, but should not affect outside users
4646

47-
## [1.0.0](https://github.com/rackt/react-router-redux/compare/0.0.10...1.0.0)
47+
## [1.0.0](https://github.com/reactjs/react-router-redux/compare/0.0.10...1.0.0)
4848
> 2015-12-09
4949
5050
This release changes quite a bit so you'll have to update your code.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# react-router-redux
22

3-
[![npm version](https://img.shields.io/npm/v/react-router-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-router-redux) [![npm downloads](https://img.shields.io/npm/dm/react-router-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-router-redux) [![build status](https://img.shields.io/travis/rackt/react-router-redux/master.svg?style=flat-square)](https://travis-ci.org/rackt/react-router-redux)
3+
[![npm version](https://img.shields.io/npm/v/react-router-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-router-redux) [![npm downloads](https://img.shields.io/npm/dm/react-router-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-router-redux) [![build status](https://img.shields.io/travis/reactjs/react-router-redux/master.svg?style=flat-square)](https://travis-ci.org/reactjs/react-router-redux)
44

55
> **Keep your router in sync with application state** :sparkles:
66
77
_Formerly known as redux-simple-router_
88

9-
You're a smart person. You use [Redux](https://github.com/rackt/redux) to manage your application state. You use [React Router](https://github.com/rackt/react-router) to do routing. All is good.
9+
You're a smart person. You use [Redux](https://github.com/rackt/redux) to manage your application state. You use [React Router](https://github.com/reactjs/react-router) to do routing. All is good.
1010

1111
But the two libraries don't coordinate. You want to do time travel with your application state, but React Router doesn't navigate between pages when you replay actions. It controls an important part of application state: the URL.
1212

@@ -24,7 +24,7 @@ If you want to install the next major version, use `react-router-redux@next`. Ru
2424

2525
This library allows you to use React Router's APIs as they are documented. And, you can use redux like you normally would, with a single app state. The library simply enhances a history instance to allow it to synchronize any changes it receives into application state.
2626

27-
[history](https://github.com/rackt/history) + `store` ([redux](https://github.com/rackt/redux)) → [**react-router-redux**](https://github.com/rackt/react-router-redux) → enhanced [history](https://github.com/rackt/history) → [react-router](https://github.com/rackt/react-router)
27+
[history](https://github.com/reactjs/history) + `store` ([redux](https://github.com/rackt/redux)) → [**react-router-redux**](https://github.com/reactjs/react-router-redux) → enhanced [history](https://github.com/reactjs/history) → [react-router](https://github.com/reactjs/react-router)
2828

2929
## Tutorial
3030

@@ -90,7 +90,7 @@ These two hooks will allow you to store the state that this library uses in what
9090

9191
#### How do I access router state in a container component?
9292

93-
React Router [provides route information via a route component's props](https://github.com/rackt/react-router/blob/latest/docs/Introduction.md#getting-url-parameters). This makes it easy to access them from a container component. When using [react-redux](https://github.com/rackt/react-redux) to `connect()` your components to state, you can access the router's props from the [2nd argument of `mapStateToProps`](https://github.com/rackt/react-redux/blob/master/docs/api.md#connectmapstatetoprops-mapdispatchtoprops-mergeprops-options):
93+
React Router [provides route information via a route component's props](https://github.com/reactjs/react-router/blob/latest/docs/Introduction.md#getting-url-parameters). This makes it easy to access them from a container component. When using [react-redux](https://github.com/rackt/react-redux) to `connect()` your components to state, you can access the router's props from the [2nd argument of `mapStateToProps`](https://github.com/rackt/react-redux/blob/master/docs/api.md#connectmapstatetoprops-mapdispatchtoprops-mergeprops-options):
9494

9595
```js
9696
function mapStateToProps(state, ownProps) {
@@ -154,15 +154,15 @@ The `options` object takes in the following optional keys:
154154

155155
**You must install `routerMiddleware` for these action creators to work.**
156156

157-
Action creators that correspond with the [history methods of the same name](https://github.com/rackt/history/blob/master/docs/GettingStarted.md#navigation). For reference they are defined as follows:
157+
Action creators that correspond with the [history methods of the same name](https://github.com/reactjs/history/blob/master/docs/GettingStarted.md#navigation). For reference they are defined as follows:
158158

159159
- `push` - Pushes a new location to history, becoming the current location.
160160
- `replace` - Replaces the current location in history.
161161
- `go` - Moves backwards or forwards a relative number of locations in history.
162162
- `goForward` - Moves forward one location. Equivalent to `go(1)`
163163
- `goBack` - Moves backwards one location. Equivalent to `go(-1)`
164164

165-
Both `push` and `replace` take in a [location descriptor](https://github.com/rackt/history/blob/master/docs/Glossary.md#locationdescriptor), which can be an object describing the URL or a plain string URL.
165+
Both `push` and `replace` take in a [location descriptor](https://github.com/reactjs/history/blob/master/docs/Glossary.md#locationdescriptor), which can be an object describing the URL or a plain string URL.
166166

167167
These action creators are also available in one single object as `routerActions`, which can be used as a convenience when using Redux's `bindActionCreators()`.
168168

examples/basic/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ This example also demonstrates integration with
1919
-
2020

2121
If you want to run the example from the npm published version of
22-
**react-router-redux**, remove the alias in `webpack.config`
22+
**react-router-redux**, remove the alias in `webpack.config`
2323
to the source from line 21.
2424

2525
This example uses the latest version, switch to a specific tag to use a stable version:
2626

27-
e.g. [react-router-redux tag 1.0.2](https://github.com/rackt/react-router-redux/tree/1.0.2/examples/basic)
27+
e.g. [react-router-redux tag 1.0.2](https://github.com/reactjs/react-router-redux/tree/1.0.2/examples/basic)

examples/basic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "rrr-basic-example",
33
"version": "0.0.0",
4-
"repository": "rackt/react-router-redux",
4+
"repository": "reactjs/react-router-redux",
55
"license": "MIT",
66
"dependencies": {
77
"react": "^0.14.7",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lib",
1010
"src"
1111
],
12-
"repository": "rackt/react-router-redux",
12+
"repository": "reactjs/react-router-redux",
1313
"authors": [
1414
"James Long",
1515
"Tim Dorr"

0 commit comments

Comments
 (0)