redux-router5
Advanced tools
Comparing version 1.1.2 to 2.0.0-rc.1
@@ -0,1 +1,16 @@ | ||
<a name="2.0.0-rc.1"></a> | ||
## [2.0.0-rc.1](https://github.com/router5/redux-router5/compare/v1.1.2...v2.0.0-rc.1) (2016-01-18) | ||
### Bug Fixes | ||
* fix: fix handling of transition start actions ([312f9b9](https://github.com/router5/redux-router5/commit/312f9b9)) | ||
### BREAKING CHANGES | ||
* store actions are now FSA compliant (Flux Standard Action) | ||
<a name="1.1.2"></a> | ||
@@ -2,0 +17,0 @@ ## [1.1.2](https://github.com/router5/redux-router5/compare/v1.1.1...v1.1.2) (2016-01-07) |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
@@ -13,8 +13,8 @@ }); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _actionTypes = require('./actionTypes'); | ||
var _actionTypes2 = _interopRequireDefault(_actionTypes); | ||
var actionTypes = _interopRequireWildcard(_actionTypes); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } | ||
function navigateTo(name) { | ||
@@ -25,6 +25,8 @@ var params = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; | ||
return { | ||
type: _actionTypes2['default'].NAVIGATE_TO, | ||
name: name, | ||
params: params, | ||
opts: opts | ||
type: actionTypes.NAVIGATE_TO, | ||
payload: { | ||
name: name, | ||
params: params, | ||
opts: opts | ||
} | ||
}; | ||
@@ -35,3 +37,3 @@ } | ||
return { | ||
type: _actionTypes2['default'].CANCEL_TRANSITION | ||
type: actionTypes.CANCEL_TRANSITION | ||
}; | ||
@@ -42,3 +44,3 @@ } | ||
return { | ||
type: _actionTypes2['default'].CLEAR_ERRORS | ||
type: actionTypes.CLEAR_ERRORS | ||
}; | ||
@@ -49,5 +51,7 @@ } | ||
return { | ||
type: _actionTypes2['default'].TRANSITION_START, | ||
route: route, | ||
previousRoute: previousRoute | ||
type: actionTypes.TRANSITION_START, | ||
payload: { | ||
route: route, | ||
previousRoute: previousRoute | ||
} | ||
}; | ||
@@ -58,5 +62,7 @@ } | ||
return { | ||
type: _actionTypes2['default'].TRANSITION_SUCCESS, | ||
route: route, | ||
previousRoute: previousRoute | ||
type: actionTypes.TRANSITION_SUCCESS, | ||
payload: { | ||
route: route, | ||
previousRoute: previousRoute | ||
} | ||
}; | ||
@@ -67,7 +73,9 @@ } | ||
return { | ||
type: _actionTypes2['default'].TRANSITION_ERROR, | ||
route: route, | ||
previousRoute: previousRoute, | ||
transitionError: transitionError | ||
type: actionTypes.TRANSITION_ERROR, | ||
payload: { | ||
route: route, | ||
previousRoute: previousRoute, | ||
transitionError: transitionError | ||
} | ||
}; | ||
} |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
value: true | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
var actionTypes = { | ||
NAVIGATE_TO: 'R5_NAVIGATE', | ||
CANCEL_TRANSITION: 'R5_CANCEL', | ||
TRANSITION_ERROR: 'R5_TRANSITION_ERROR', | ||
TRANSITION_SUCCESS: 'R5_TRANSITION_SUCCESS', | ||
TRANSITION_START: 'R5_TRANSITION_START', | ||
CLEAR_ERRORS: 'R5_CLEAR_ERRORS' | ||
}; | ||
exports['default'] = actionTypes; | ||
module.exports = exports['default']; | ||
var NAVIGATE_TO = exports.NAVIGATE_TO = 'R5_NAVIGATE'; | ||
var CANCEL_TRANSITION = exports.CANCEL_TRANSITION = 'R5_CANCEL'; | ||
var TRANSITION_ERROR = exports.TRANSITION_ERROR = 'R5_TRANSITION_ERROR'; | ||
var TRANSITION_SUCCESS = exports.TRANSITION_SUCCESS = 'R5_TRANSITION_SUCCESS'; | ||
var TRANSITION_START = exports.TRANSITION_START = 'R5_TRANSITION_START'; | ||
var CLEAR_ERRORS = exports.CLEAR_ERRORS = 'R5_CLEAR_ERRORS'; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports.routeNodeSelector = exports.actionTypes = exports.actions = exports.router5Reducer = exports.router5Middleware = undefined; | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _router5Middleware = require('./router5Middleware'); | ||
@@ -29,11 +26,12 @@ | ||
var _actionTypes2 = _interopRequireDefault(_actionTypes); | ||
var actionTypes = _interopRequireWildcard(_actionTypes); | ||
exports['default'] = { | ||
router5Middleware: _router5Middleware2['default'], | ||
router5Reducer: _router5Reducer2['default'], | ||
actions: actions, | ||
actionTypes: _actionTypes2['default'], | ||
routeNodeSelector: _routeNodeSelector2['default'] | ||
}; | ||
module.exports = exports['default']; | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
exports.router5Middleware = _router5Middleware2.default; | ||
exports.router5Reducer = _router5Reducer2.default; | ||
exports.actions = actions; | ||
exports.actionTypes = actionTypes; | ||
exports.routeNodeSelector = _routeNodeSelector2.default; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _reselect = require('reselect'); | ||
var _router5TransitionPath = require('router5.transition-path'); | ||
var _router = require('router5.transition-path'); | ||
var _router5TransitionPath2 = _interopRequireDefault(_router5TransitionPath); | ||
var _router2 = _interopRequireDefault(_router); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
function routeNodeSelector(routeNode) { | ||
@@ -26,3 +26,3 @@ var reducerKey = arguments.length <= 1 || arguments[1] === undefined ? 'router' : arguments[1]; | ||
var intersection = route ? (0, _router5TransitionPath2['default'])(route, previousRoute).intersection : ''; | ||
var intersection = route ? (0, _router2.default)(route, previousRoute).intersection : ''; | ||
return { route: route, intersection: intersection }; | ||
@@ -45,3 +45,2 @@ }); | ||
exports['default'] = routeNodeSelector; | ||
module.exports = exports['default']; | ||
exports.default = routeNodeSelector; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports['default'] = replaceRoutesMiddleware; | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _actionTypes = require('./actionTypes'); | ||
var _actionTypes2 = _interopRequireDefault(_actionTypes); | ||
var actionTypes = _interopRequireWildcard(_actionTypes); | ||
@@ -20,20 +15,22 @@ var _actions = require('./actions'); | ||
function routerPlugin(dispatch) { | ||
var plugin = { | ||
name: 'REDUX_PLUGIN', | ||
onTransitionStart: function onTransitionStart(toState, fromState) { | ||
dispatch(actions.transitionStart(toState, fromState)); | ||
}, | ||
onTransitionSuccess: function onTransitionSuccess(toState, fromState) { | ||
dispatch(actions.transitionSuccess(toState, fromState)); | ||
}, | ||
onTransitionError: function onTransitionError(toState, fromState, err) { | ||
dispatch(actions.transitionError(toState, fromState, err)); | ||
} | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } | ||
var routerPlugin = function routerPlugin(dispatch) { | ||
return function () { | ||
return { | ||
name: 'REDUX_PLUGIN', | ||
onTransitionStart: function onTransitionStart(toState, fromState) { | ||
dispatch(actions.transitionStart(toState, fromState)); | ||
}, | ||
onTransitionSuccess: function onTransitionSuccess(toState, fromState) { | ||
dispatch(actions.transitionSuccess(toState, fromState)); | ||
}, | ||
onTransitionError: function onTransitionError(toState, fromState, err) { | ||
dispatch(actions.transitionError(toState, fromState, err)); | ||
} | ||
}; | ||
}; | ||
}; | ||
return plugin; | ||
} | ||
function replaceRoutesMiddleware(router) { | ||
var router5ReduxMiddleware = function router5ReduxMiddleware(router) { | ||
return function (store) { | ||
@@ -47,5 +44,10 @@ var dispatch = store.dispatch; | ||
return function (action) { | ||
if (action.type === _actionTypes2['default'].NAVIGATE_TO) { | ||
router.navigate(action.name, action.params, action.opts); | ||
} else if (action.type === _actionTypes2['default'].CANCEL_TRANSITION) { | ||
if (action.type === actionTypes.NAVIGATE_TO) { | ||
var _action$payload = action.payload; | ||
var name = _action$payload.name; | ||
var params = _action$payload.params; | ||
var opts = _action$payload.opts; | ||
router.navigate(name, params, opts); | ||
} else if (action.type === actionTypes.CANCEL_TRANSITION) { | ||
router.cancel(); | ||
@@ -58,4 +60,4 @@ } | ||
}; | ||
} | ||
}; | ||
module.exports = exports['default']; | ||
exports.default = router5ReduxMiddleware; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
var _actionTypes = require('./actionTypes'); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var actionTypes = _interopRequireWildcard(_actionTypes); | ||
var _actionTypes = require('./actionTypes'); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } | ||
var _actionTypes2 = _interopRequireDefault(_actionTypes); | ||
var initialState = { | ||
@@ -22,27 +22,28 @@ route: null, | ||
function router5Reducer(state, action) { | ||
if (state === undefined) state = initialState; | ||
function router5Reducer() { | ||
var state = arguments.length <= 0 || arguments[0] === undefined ? initialState : arguments[0]; | ||
var action = arguments[1]; | ||
switch (action.type) { | ||
case _actionTypes2['default'].TRANSTION_START: | ||
case actionTypes.TRANSITION_START: | ||
return _extends({}, state, { | ||
transitionRoute: action.route, | ||
transitionRoute: action.payload.route, | ||
transitionError: null | ||
}); | ||
case _actionTypes2['default'].TRANSITION_SUCCESS: | ||
case actionTypes.TRANSITION_SUCCESS: | ||
return _extends({}, state, { | ||
transitionRoute: null, | ||
transitionError: null, | ||
previousRoute: action.previousRoute, | ||
route: action.route | ||
previousRoute: action.payload.previousRoute, | ||
route: action.payload.route | ||
}); | ||
case _actionTypes2['default'].TRANSITION_ERROR: | ||
case actionTypes.TRANSITION_ERROR: | ||
return _extends({}, state, { | ||
transitionRoute: action.route, | ||
transitionError: action.transitionError | ||
transitionRoute: action.payload.route, | ||
transitionError: action.payload.transitionError | ||
}); | ||
case _actionTypes2['default'].CLEAR_ERRORS: | ||
case actionTypes.CLEAR_ERRORS: | ||
return _extends({}, state, { | ||
@@ -58,3 +59,2 @@ transitionRoute: null, | ||
exports['default'] = router5Reducer; | ||
module.exports = exports['default']; | ||
exports.default = router5Reducer; |
@@ -1,2 +0,2 @@ | ||
import actionTypes from './actionTypes'; | ||
import * as actionTypes from './actionTypes'; | ||
@@ -6,5 +6,7 @@ export function navigateTo(name, params = {}, opts = {}) { | ||
type: actionTypes.NAVIGATE_TO, | ||
name, | ||
params, | ||
opts | ||
payload: { | ||
name, | ||
params, | ||
opts | ||
} | ||
}; | ||
@@ -28,4 +30,6 @@ } | ||
type: actionTypes.TRANSITION_START, | ||
route, | ||
previousRoute | ||
payload: { | ||
route, | ||
previousRoute | ||
} | ||
}; | ||
@@ -37,4 +41,6 @@ } | ||
type: actionTypes.TRANSITION_SUCCESS, | ||
route, | ||
previousRoute | ||
payload: { | ||
route, | ||
previousRoute | ||
} | ||
}; | ||
@@ -46,6 +52,8 @@ } | ||
type: actionTypes.TRANSITION_ERROR, | ||
route, | ||
previousRoute, | ||
transitionError | ||
payload: { | ||
route, | ||
previousRoute, | ||
transitionError | ||
} | ||
}; | ||
} |
@@ -1,10 +0,6 @@ | ||
const actionTypes = { | ||
NAVIGATE_TO: 'R5_NAVIGATE', | ||
CANCEL_TRANSITION: 'R5_CANCEL', | ||
TRANSITION_ERROR: 'R5_TRANSITION_ERROR', | ||
TRANSITION_SUCCESS: 'R5_TRANSITION_SUCCESS', | ||
TRANSITION_START: 'R5_TRANSITION_START', | ||
CLEAR_ERRORS: 'R5_CLEAR_ERRORS' | ||
}; | ||
export default actionTypes; | ||
export const NAVIGATE_TO = 'R5_NAVIGATE'; | ||
export const CANCEL_TRANSITION = 'R5_CANCEL'; | ||
export const TRANSITION_ERROR = 'R5_TRANSITION_ERROR'; | ||
export const TRANSITION_SUCCESS = 'R5_TRANSITION_SUCCESS'; | ||
export const TRANSITION_START = 'R5_TRANSITION_START'; | ||
export const CLEAR_ERRORS = 'R5_CLEAR_ERRORS'; |
@@ -5,5 +5,5 @@ import router5Middleware from './router5Middleware'; | ||
import * as actions from './actions'; | ||
import actionTypes from './actionTypes'; | ||
import * as actionTypes from './actionTypes'; | ||
export default { | ||
export { | ||
router5Middleware, | ||
@@ -10,0 +10,0 @@ router5Reducer, |
@@ -1,6 +0,6 @@ | ||
import actionTypes from './actionTypes'; | ||
import * as actionTypes from './actionTypes'; | ||
import * as actions from './actions'; | ||
function routerPlugin(dispatch) { | ||
const plugin = { | ||
const routerPlugin = dispatch => | ||
() => ({ | ||
name: 'REDUX_PLUGIN', | ||
@@ -16,9 +16,6 @@ onTransitionStart(toState, fromState) { | ||
} | ||
}; | ||
}); | ||
return plugin; | ||
} | ||
export default function replaceRoutesMiddleware(router) { | ||
return store => { | ||
const router5ReduxMiddleware = router => | ||
store => { | ||
const { dispatch } = store; | ||
@@ -28,6 +25,6 @@ router.setAdditionalArgs(store); | ||
return next => action => { | ||
if (action.type === actionTypes.NAVIGATE_TO) { | ||
router.navigate(action.name, action.params, action.opts); | ||
const { name, params, opts } = action.payload; | ||
router.navigate(name, params, opts); | ||
} else if (action.type === actionTypes.CANCEL_TRANSITION) { | ||
@@ -40,2 +37,3 @@ router.cancel(); | ||
}; | ||
} | ||
export default router5ReduxMiddleware; |
@@ -1,2 +0,2 @@ | ||
import actionTypes from './actionTypes'; | ||
import * as actionTypes from './actionTypes'; | ||
@@ -12,6 +12,6 @@ const initialState = { | ||
switch(action.type) { | ||
case actionTypes.TRANSTION_START: | ||
case actionTypes.TRANSITION_START: | ||
return { | ||
...state, | ||
transitionRoute: action.route, | ||
transitionRoute: action.payload.route, | ||
transitionError: null | ||
@@ -25,4 +25,4 @@ }; | ||
transitionError: null, | ||
previousRoute: action.previousRoute, | ||
route: action.route | ||
previousRoute: action.payload.previousRoute, | ||
route: action.payload.route | ||
}; | ||
@@ -33,4 +33,4 @@ | ||
...state, | ||
transitionRoute: action.route, | ||
transitionError: action.transitionError | ||
transitionRoute: action.payload.route, | ||
transitionError: action.payload.transitionError | ||
}; | ||
@@ -37,0 +37,0 @@ |
{ | ||
"name": "redux-router5", | ||
"version": "1.1.2", | ||
"version": "2.0.0-rc.1", | ||
"description": "Router5 integration with redux", | ||
"main": "dist/commonjs", | ||
"main": "dist/commonjs/index.js", | ||
"jnext:main": "modules/index.js", | ||
"scripts": { | ||
"build": "gulp build", | ||
"test": "echo 'no tests specified yet'", | ||
"clog": "node scripts/changelog.js", | ||
"clean": "rimraf dist", | ||
"build:cjs": "babel modules --out-dir dist/commonjs", | ||
"build:amd": "rollup -c rollup.config.js -f amd", | ||
"build:umd": "rollup -c rollup.config.js -f umd", | ||
"build": "npm run clean && npm run build:cjs && npm run build:amd && npm run build:umd", | ||
"test": "mocha --compilers js:babel-core/register --recursive 'test/main.js'", | ||
"clog": "conventional-changelog -i CHANGELOG.md -w", | ||
"lint": "eslint modules", | ||
@@ -32,28 +37,26 @@ "release": "./scripts/release.js" | ||
"devDependencies": { | ||
"babel": "^5.8.23", | ||
"babel-eslint": "^4.1.3", | ||
"conventional-changelog": "^0.5.1", | ||
"del": "^2.0.2", | ||
"eslint": "^1.7.1", | ||
"gulp": "^3.9.0", | ||
"gulp-babel": "^5.3.0", | ||
"gulp-concat": "^2.6.0", | ||
"gulp-rename": "^1.2.2", | ||
"gulp-uglify": "^1.4.2", | ||
"run-sequence": "^1.1.4", | ||
"should": "^7.1.0", | ||
"through2": "^2.0.0", | ||
"vinyl": "^1.0.0", | ||
"vinyl-fs": "^2.2.1", | ||
"vinyl-source-stream2": "^0.1.1", | ||
"babel-core": "^6.4.0", | ||
"babel-eslint": "^4.1.6", | ||
"babel-plugin-transform-export-extensions": "^6.4.0", | ||
"babel-plugin-transform-object-rest-spread": "^6.3.13", | ||
"babel-preset-es2015": "^6.3.13", | ||
"babel-preset-es2015-rollup": "^1.1.1", | ||
"chai": "^3.4.1", | ||
"conventional-changelog": "^0.5.3", | ||
"eslint": "^1.10.3", | ||
"mocha": "^2.3.4", | ||
"rimraf": "^2.5.0", | ||
"rollup": "^0.24.1", | ||
"rollup-plugin-babel": "^2.3.9", | ||
"rollup-plugin-npm": "^1.2.1", | ||
"yargs": "^3.27.0" | ||
}, | ||
"peerDependencies": { | ||
"router5": ">=1.1.0", | ||
"redux": ">=3.0.0" | ||
"router5": "2.0.0-rc.1", | ||
"redux": "^3.0.0" | ||
}, | ||
"dependencies": { | ||
"reselect": "^2.0.0", | ||
"router5.transition-path": "^1.0.0" | ||
"router5.transition-path": "^3.0.0" | ||
} | ||
} |
@@ -0,1 +1,4 @@ | ||
[](https://badge.fury.io/js/redux-router5) | ||
[](https://travis-ci.org/router5/redux-router5) | ||
# redux-router5 | ||
@@ -10,3 +13,3 @@ | ||
- __router5 >= 1.1.0__ | ||
- __router5 >= 2.0.0__ | ||
- __redux >= 3.0.0__ | ||
@@ -13,0 +16,0 @@ |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
Shell access
Supply chain riskThis module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.
Found 1 instance in 1 package
Filesystem access
Supply chain riskAccesses the file system, and could potentially read sensitive data.
Found 1 instance in 1 package
No tests
QualityPackage does not have any tests. This is a strong signal of a poorly maintained or low quality package.
Found 1 instance in 1 package
50205
15
1046
153
0
17
+ Addedjs-tokens@4.0.0(transitive)
+ Addedlodash@4.17.21(transitive)
+ Addedlodash-es@4.17.21(transitive)
+ Addedloose-envify@1.4.0(transitive)
+ Addedpath-parser@1.0.4(transitive)
+ Addedredux@3.7.2(transitive)
+ Addedroute-node@1.3.4(transitive)
+ Addedrouter5@2.0.0-rc.1(transitive)
+ Addedrouter5.transition-path@3.0.0(transitive)
- Removedpath-parser@6.1.0(transitive)
- Removedredux@5.0.1(transitive)
- Removedroute-node@4.1.1(transitive)
- Removedrouter5@8.0.1(transitive)
- Removedrouter5-transition-path@8.0.1(transitive)
- Removedrouter5.transition-path@1.0.1(transitive)
- Removedsearch-params@3.0.0(transitive)
- Removedtslib@1.14.1(transitive)