Skip to content

Commit

Permalink
Merge pull request #11 from FriendsOfECMAScript/feature/connected-rea…
Browse files Browse the repository at this point in the history
…ct-router

Removed deprecated react-router-redux dependency. Updated the ConnectedRouter component for the connected-react-router provided one.
  • Loading branch information
gorkalaucirica authored Oct 22, 2018
2 parents da824c9 + 3585fdc commit 6da5c45
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ This changelog references the relevant changes done between versions.
To get the diff for a specific change, go to https://github.com/FriendsOfECMAScript/ReactI18nRouting/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/FriendsOfECMAScript/ReactI18nRouting/compare/v0.4.0...v0.5.0

* 0.6.0
* Removed deprecated `react-router-redux` dependency. Updated the `ConnectedRouter` for the `connected-react-router` provided one.
* 0.5.2
* Fixed unprefixed strategy when URL starts with another locale.
* 0.5.1
Expand Down
4 changes: 2 additions & 2 deletions docs/browser_intl_provider_strategies.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ const history = createHistory();
This strategy apart of intl provider also exposes a fully functional reducer that fires when also exposed
`LANGUAGE_CHANGE` event is dispatched in the Redux actions.

Check the [https://github.com/supasate/connected-react-router](connected-react-router) library to setup your connected router.

```javascript
import {LANGUAGE_CHANGE} from '@foes/react-i18n-routing';

// ... other module of your application

import {i18nReducer} from '@foes/react-i18n-routing';
import {routerReducer} from 'react-router-redux';
import {combineReducers} from 'redux';

export default combineReducers({
i18n: i18nReducer,
routing: routerReducer,

// your other reducers
});
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@foes/react-i18n-routing",
"version": "0.5.2",
"version": "0.6.0",
"license": "MIT",
"description": "Provides components and functions to make i18n routing React apps with ease.",
"keywords": [
Expand Down Expand Up @@ -122,13 +122,13 @@
"rimraf": "^2.6.2"
},
"peerDependencies": {
"connected-react-router": "^4.5.0",
"lodash.flatmap": ">=4.x",
"prop-types": ">=15.x",
"react": ">=16.x",
"react-intl": ">=2.x",
"react-redux": ">=5.x",
"react-router-dom": ">=4.x",
"react-router-named-routes": ">=0.x",
"react-router-redux": ">=4.x"
"react-router-named-routes": ">=0.x"
}
}
2 changes: 1 addition & 1 deletion src/component/bridges/ReduxBrowserIntlProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import React from 'react';
import {connect} from 'react-redux';
import {ConnectedRouter} from 'react-router-redux';
import {ConnectedRouter} from 'connected-react-router';
import PropTypes from 'prop-types';

import {setLocale} from './../../locale.js';
Expand Down

0 comments on commit 6da5c45

Please sign in to comment.