react-router 4.0.0 → 4.2.0

package/es/Route.js

@@ -7,9 +7,15 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 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; }
 
 import warning from 'warning';
-import React, { PropTypes } from 'react';
+import invariant from 'invariant';
+import React from 'react';
+import PropTypes from 'prop-types';
 import matchPath from './matchPath';
 
+var isEmptyChildren = function isEmptyChildren(children) {
+  return React.Children.count(children) === 0;
+};
+
 /**
  * The public API for matching a single path and rendering.
  */
@@ -32,8 +38,6 @@ var Route = function (_React$Component) {
   }
 
   Route.prototype.getChildContext = function getChildContext() {
-    var router = this.context.router;
-
     return {
       router: _extends({}, this.context.router, {
         route: {
@@ -44,33 +48,31 @@ var Route = function (_React$Component) {
     };
   };
 
-  Route.prototype.computeMatch = function computeMatch(_ref, _ref2) {
+  Route.prototype.computeMatch = function computeMatch(_ref, router) {
     var computedMatch = _ref.computedMatch,
         location = _ref.location,
         path = _ref.path,
         strict = _ref.strict,
-        exact = _ref.exact;
-    var route = _ref2.route;
+        exact = _ref.exact,
+        sensitive = _ref.sensitive;
 
     if (computedMatch) return computedMatch; // <Switch> already computed the match for us
 
+    invariant(router, 'You should not use <Route> or withRouter() outside a <Router>');
+
+    var route = router.route;
+
     var pathname = (location || route.location).pathname;
 
-    return path ? matchPath(pathname, { path: path, strict: strict, exact: exact }) : route.match;
+    return path ? matchPath(pathname, { path: path, strict: strict, exact: exact, sensitive: sensitive }) : route.match;
   };
 
   Route.prototype.componentWillMount = function componentWillMount() {
-    var _props = this.props,
-        component = _props.component,
-        render = _props.render,
-        children = _props.children;
-
-
-    warning(!(component && render), 'You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored');
+    warning(!(this.props.component && this.props.render), 'You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored');
 
-    warning(!(component && children), 'You should not use <Route component> and <Route children> in the same route; <Route children> will be ignored');
+    warning(!(this.props.component && this.props.children && !isEmptyChildren(this.props.children)), 'You should not use <Route component> and <Route children> in the same route; <Route children> will be ignored');
 
-    warning(!(render && children), 'You should not use <Route render> and <Route children> in the same route; <Route children> will be ignored');
+    warning(!(this.props.render && this.props.children && !isEmptyChildren(this.props.children)), 'You should not use <Route render> and <Route children> in the same route; <Route children> will be ignored');
   };
 
   Route.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps, nextContext) {
@@ -85,10 +87,10 @@ var Route = function (_React$Component) {
 
   Route.prototype.render = function render() {
     var match = this.state.match;
-    var _props2 = this.props,
-        children = _props2.children,
-        component = _props2.component,
-        render = _props2.render;
+    var _props = this.props,
+        children = _props.children,
+        component = _props.component,
+        render = _props.render;
     var _context$router = this.context.router,
         history = _context$router.history,
         route = _context$router.route,
@@ -100,8 +102,7 @@ var Route = function (_React$Component) {
     return component ? // component prop gets first priority, only called if there's a match
     match ? React.createElement(component, props) : null : render ? // render prop is next, only called if there's a match
     match ? render(props) : null : children ? // children come last, always called
-    typeof children === 'function' ? children(props) : !Array.isArray(children) || children.length ? // Preact defaults to empty children array
-    React.Children.only(children) : null : null;
+    typeof children === 'function' ? children(props) : !isEmptyChildren(children) ? React.Children.only(children) : null : null;
   };
 
   return Route;
@@ -112,6 +113,7 @@ Route.propTypes = {
   path: PropTypes.string,
   exact: PropTypes.bool,
   strict: PropTypes.bool,
+  sensitive: PropTypes.bool,
   component: PropTypes.func,
   render: PropTypes.func,
   children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),

package/es/Router.js

@@ -8,7 +8,8 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 import warning from 'warning';
 import invariant from 'invariant';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * The public API for putting history on context.

package/es/StaticRouter.js

@@ -8,8 +8,10 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
+import warning from 'warning';
 import invariant from 'invariant';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { addLeadingSlash, createPath, parsePath } from 'history/PathUtils';
 import Router from './Router';
 
@@ -117,6 +119,10 @@ var StaticRouter = function (_React$Component) {
     };
   };
 
+  StaticRouter.prototype.componentWillMount = function componentWillMount() {
+    warning(!this.props.history, '<StaticRouter> ignores the history prop. To use a custom history, ' + 'use `import { Router }` instead of `import { StaticRouter as Router }`.');
+  };
+
   StaticRouter.prototype.render = function render() {
     var _props = this.props,
         basename = _props.basename,

package/es/Switch.js

@@ -4,8 +4,10 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import warning from 'warning';
+import invariant from 'invariant';
 import matchPath from './matchPath';
 
 /**
@@ -21,6 +23,10 @@ var Switch = function (_React$Component) {
     return _possibleConstructorReturn(this, _React$Component.apply(this, arguments));
   }
 
+  Switch.prototype.componentWillMount = function componentWillMount() {
+    invariant(this.context.router, 'You should not use <Switch> outside a <Router>');
+  };
+
   Switch.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
     warning(!(nextProps.location && !this.props.location), '<Switch> elements should not change from uncontrolled to controlled (or vice versa). You initially used no "location" prop and then provided one on a subsequent render.');
 
@@ -36,17 +42,20 @@ var Switch = function (_React$Component) {
     var match = void 0,
         child = void 0;
     React.Children.forEach(children, function (element) {
+      if (!React.isValidElement(element)) return;
+
       var _element$props = element.props,
           pathProp = _element$props.path,
           exact = _element$props.exact,
           strict = _element$props.strict,
+          sensitive = _element$props.sensitive,
           from = _element$props.from;
 
       var path = pathProp || from;
 
       if (match == null) {
         child = element;
-        match = path ? matchPath(location.pathname, { path: path, exact: exact, strict: strict }) : route.match;
+        match = path ? matchPath(location.pathname, { path: path, exact: exact, strict: strict, sensitive: sensitive }) : route.match;
       }
     });
 

package/es/matchPath.js

@@ -5,7 +5,7 @@ var cacheLimit = 10000;
 var cacheCount = 0;
 
 var compilePath = function compilePath(pattern, options) {
-  var cacheKey = '' + options.end + options.strict;
+  var cacheKey = '' + options.end + options.strict + options.sensitive;
   var cache = patternCache[cacheKey] || (patternCache[cacheKey] = {});
 
   if (cache[pattern]) return cache[pattern];
@@ -36,9 +36,11 @@ var matchPath = function matchPath(pathname) {
       _options$exact = _options.exact,
       exact = _options$exact === undefined ? false : _options$exact,
       _options$strict = _options.strict,
-      strict = _options$strict === undefined ? false : _options$strict;
+      strict = _options$strict === undefined ? false : _options$strict,
+      _options$sensitive = _options.sensitive,
+      sensitive = _options$sensitive === undefined ? false : _options$sensitive;
 
-  var _compilePath = compilePath(path, { end: exact, strict: strict }),
+  var _compilePath = compilePath(path, { end: exact, strict: strict, sensitive: sensitive }),
       re = _compilePath.re,
       keys = _compilePath.keys;
 

package/es/withRouter.js

@@ -1,6 +1,10 @@
 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; };
 
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 import React from 'react';
+import PropTypes from 'prop-types';
+import hoistStatics from 'hoist-non-react-statics';
 import Route from './Route';
 
 /**
@@ -8,14 +12,21 @@ import Route from './Route';
  */
 var withRouter = function withRouter(Component) {
   var C = function C(props) {
+    var wrappedComponentRef = props.wrappedComponentRef,
+        remainingProps = _objectWithoutProperties(props, ['wrappedComponentRef']);
+
     return React.createElement(Route, { render: function render(routeComponentProps) {
-        return React.createElement(Component, _extends({}, props, routeComponentProps));
+        return React.createElement(Component, _extends({}, remainingProps, routeComponentProps, { ref: wrappedComponentRef }));
       } });
   };
 
   C.displayName = 'withRouter(' + (Component.displayName || Component.name) + ')';
+  C.WrappedComponent = Component;
+  C.propTypes = {
+    wrappedComponentRef: PropTypes.func
+  };
 
-  return C;
+  return hoistStatics(C, Component);
 };
 
 export default withRouter;

package/matchPath.js

@@ -13,7 +13,7 @@ var cacheLimit = 10000;
 var cacheCount = 0;
 
 var compilePath = function compilePath(pattern, options) {
-  var cacheKey = '' + options.end + options.strict;
+  var cacheKey = '' + options.end + options.strict + options.sensitive;
   var cache = patternCache[cacheKey] || (patternCache[cacheKey] = {});
 
   if (cache[pattern]) return cache[pattern];
@@ -44,9 +44,11 @@ var matchPath = function matchPath(pathname) {
       _options$exact = _options.exact,
       exact = _options$exact === undefined ? false : _options$exact,
       _options$strict = _options.strict,
-      strict = _options$strict === undefined ? false : _options$strict;
+      strict = _options$strict === undefined ? false : _options$strict,
+      _options$sensitive = _options.sensitive,
+      sensitive = _options$sensitive === undefined ? false : _options$sensitive;
 
-  var _compilePath = compilePath(path, { end: exact, strict: strict }),
+  var _compilePath = compilePath(path, { end: exact, strict: strict, sensitive: sensitive }),
       re = _compilePath.re,
       keys = _compilePath.keys;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "Declarative routing for React",
   "repository": "ReactTraining/react-router",
   "license": "MIT",
@@ -16,11 +16,10 @@
     "Router.js",
     "StaticRouter.js",
     "Switch.js",
+    "es",
     "index.js",
     "matchPath.js",
     "withRouter.js",
-    "README.md",
-    "es",
     "umd"
   ],
   "main": "index.js",
@@ -28,51 +27,47 @@
   "scripts": {
     "build": "node ./tools/build.js",
     "watch": "babel ./modules -d . --ignore __tests__ --watch",
-    "prepublish": "node ./tools/build.js",
-    "clean": "git clean -e '!node_modules' -fdX .",
+    "prepublishOnly": "node ./tools/build.js",
+    "clean": "git clean -fdX .",
     "lint": "eslint modules",
-    "test": "karma start --single-run"
+    "test": "jest"
   },
   "peerDependencies": {
-    "react": "^15"
+    "react": ">=15"
   },
   "dependencies": {
-    "history": "^4.6.0",
+    "history": "^4.7.2",
+    "hoist-non-react-statics": "^2.3.0",
     "invariant": "^2.2.2",
     "loose-envify": "^1.3.1",
-    "path-to-regexp": "^1.5.3",
+    "path-to-regexp": "^1.7.0",
+    "prop-types": "^15.5.4",
     "warning": "^3.0.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-eslint": "^6.0.4",
-    "babel-loader": "^6.2.10",
+    "babel-cli": "^6.26.0",
+    "babel-eslint": "^7.0.4",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-transform-react-remove-prop-types": "^0.2.11",
+    "babel-plugin-external-helpers": "^6.22.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
     "babel-preset-es2015": "^6.14.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-1": "^6.5.0",
-    "eslint": "^2.13.1",
-    "eslint-plugin-import": "^1.15.0",
-    "eslint-plugin-react": "^5.2.2",
-    "expect": "^1.20.1",
+    "eslint": "^4.5.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-react": "^7.3.0",
     "gzip-size": "^3.0.0",
-    "in-publish": "^2.0.0",
-    "karma": "^0.13.22",
-    "karma-browserstack-launcher": "^1.0.1",
-    "karma-chrome-launcher": "^1.0.1",
-    "karma-mocha": "^1.0.1",
-    "karma-mocha-reporter": "^2.0.4",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^1.7.0",
-    "mocha": "^2.5.3",
-    "pretty-bytes": "^3.0.1",
+    "jest": "^20.0.4",
+    "pretty-bytes": "^4.0.2",
     "react": "^15.4.2",
     "react-addons-test-utils": "^15.4.2",
     "react-dom": "^15.3.0",
-    "readline-sync": "^1.4.4",
-    "webpack": "^1.13.1",
-    "webpack-dev-server": "^1.14.1"
+    "rollup": "^0.48.2",
+    "rollup-plugin-babel": "^3.0.2",
+    "rollup-plugin-commonjs": "^8.2.0",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-replace": "^1.1.1",
+    "rollup-plugin-uglify": "^2.0.1"
   },
   "browserify": {
     "transform": [