Skip to content

Commit c372067

Browse files
committed
Version 0.13.6
1 parent 4e27b98 commit c372067

File tree

12 files changed

+232
-222
lines changed

12 files changed

+232
-222
lines changed

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v0.13.6 - Mon, 18 Jul 2016 19:57:19 GMT
2+
---------------------------------------
3+
4+
- [#3607](../../pull/3607) [added] Support for React v0.15
5+
- [#3645](../../pull/3645) [fixed] Passing through extra props to `<Link>`
6+
7+
18
v0.13.5 - Tue, 03 Nov 2015 06:15:38 GMT
29
---------------------------------------
310

@@ -14,7 +21,7 @@ v0.13.4 - Tue, 06 Oct 2015 13:13:20 GMT
1421
v0.13.3 - Wed, 29 Apr 2015 01:47:08 GMT
1522
---------------------------------------
1623

17-
-
24+
-
1825

1926

2027
v0.13.2 - Tue, 24 Mar 2015 14:22:07 GMT
@@ -30,7 +37,7 @@ v0.13.2 - Tue, 24 Mar 2015 14:22:07 GMT
3037
v0.13.1 - Fri, 20 Mar 2015 22:21:57 GMT
3138
---------------------------------------
3239

33-
-
40+
-
3441

3542

3643
v0.13.0 - Fri, 20 Mar 2015 21:25:35 GMT

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.13.5",
3+
"version": "0.13.6",
44
"description": "A complete routing library for React.js",
55
"main": "build/umd/ReactRouter.js",
66
"homepage": "https://github.com/rackt/react-router",

build/lib/PropTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assign = require('react/lib/Object.assign');
3+
var assign = require('object-assign');
44
var ReactPropTypes = require('react').PropTypes;
55
var Route = require('./Route');
66

build/lib/Route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var _createClass = (function () { function defineProperties(target, props) { for
44

55
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
66

7-
var assign = require('react/lib/Object.assign');
7+
var assign = require('object-assign');
88
var invariant = require('invariant');
99
var warning = require('./warning');
1010
var PathUtils = require('./PathUtils');

build/lib/components/ActiveHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
1010

1111
var React = require('react');
1212
var ContextWrapper = require('./ContextWrapper');
13-
var assign = require('react/lib/Object.assign');
13+
var assign = require('object-assign');
1414
var PropTypes = require('../PropTypes');
1515

1616
var REF_NAME = '__routeHandler__';

build/lib/components/Link.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
99
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
1010

1111
var React = require('react');
12-
var assign = require('react/lib/Object.assign');
12+
var assign = require('object-assign');
1313
var PropTypes = require('../PropTypes');
1414

1515
function isLeftClickEvent(event) {
@@ -107,6 +107,12 @@ var Link = (function (_React$Component) {
107107

108108
if (props.activeStyle && this.getActiveState()) props.style = props.activeStyle;
109109

110+
delete props.to;
111+
delete props.params;
112+
delete props.query;
113+
delete props.activeClassName;
114+
delete props.activeStyle;
115+
110116
return React.DOM.a(props, this.props.children);
111117
}
112118
}]);

build/lib/components/RouteHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
1010

1111
var React = require('react');
1212
var ContextWrapper = require('./ContextWrapper');
13-
var assign = require('react/lib/Object.assign');
13+
var assign = require('object-assign');
1414
var PropTypes = require('../PropTypes');
1515

1616
var REF_NAME = '__routeHandler__';

build/lib/createRoutesFromReactChildren.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
var React = require('react');
5-
var assign = require('react/lib/Object.assign');
5+
var assign = require('object-assign');
66
var warning = require('./warning');
77
var DefaultRoute = require('./components/DefaultRoute');
88
var NotFoundRoute = require('./components/NotFoundRoute');

build/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.13.5",
3+
"version": "0.13.6",
44
"description": "A complete routing library for React.js",
55
"main": "lib",
66
"repository": {
@@ -15,7 +15,7 @@
1515
],
1616
"license": "MIT",
1717
"peerDependencies": {
18-
"react": "0.13.x||0.14.x"
18+
"react": "0.13.x || 0.14.x || ^15.0.1"
1919
},
2020
"dependencies": {
2121
"can-use-dom": "0.1.0",

0 commit comments

Comments
 (0)