diff --git a/packages/react-router-config/jest.config.js b/packages/react-router-config/jest.config.js index e2accae217..c3a7915b99 100644 --- a/packages/react-router-config/jest.config.js +++ b/packages/react-router-config/jest.config.js @@ -7,7 +7,7 @@ switch (process.env.TEST_ENV) { mappedModule = "/umd/react-router-config.js"; break; default: - mappedModule = "/modules/index"; + mappedModule = "/modules/index.js"; } module.exports = { diff --git a/packages/react-router-dom/.size-snapshot.json b/packages/react-router-dom/.size-snapshot.json index e9eda53a06..f350e4a180 100644 --- a/packages/react-router-dom/.size-snapshot.json +++ b/packages/react-router-dom/.size-snapshot.json @@ -14,13 +14,13 @@ } }, "umd/react-router-dom.js": { - "bundled": 159681, + "bundled": 159709, "minified": 57597, - "gzipped": 16538 + "gzipped": 16540 }, "umd/react-router-dom.min.js": { - "bundled": 97431, - "minified": 34632, - "gzipped": 10211 + "bundled": 97476, + "minified": 34651, + "gzipped": 10216 } } diff --git a/packages/react-router-dom/jest.config.js b/packages/react-router-dom/jest.config.js index 9515b9282a..e94b5a03ff 100644 --- a/packages/react-router-dom/jest.config.js +++ b/packages/react-router-dom/jest.config.js @@ -7,7 +7,7 @@ switch (process.env.TEST_ENV) { mappedModule = "/umd/react-router-dom.js"; break; default: - mappedModule = "/modules/index"; + mappedModule = "/modules/index.js"; } module.exports = { diff --git a/packages/react-router-dom/rollup.config.js b/packages/react-router-dom/rollup.config.js index 5396c069f9..c7781aef06 100644 --- a/packages/react-router-dom/rollup.config.js +++ b/packages/react-router-dom/rollup.config.js @@ -21,7 +21,10 @@ const babelOptionsESM = { plugins: [["@babel/transform-runtime", { useESModules: true }]] }; const commonjsOptions = { - include: /node_modules/ + include: /node_modules/, + namedExports: { + "../react-router/node_modules/react-is/index.js": ["isValidElementType"] + } }; const external = id => !id.startsWith(".") && !id.startsWith("/"); diff --git a/packages/react-router/.size-snapshot.json b/packages/react-router/.size-snapshot.json index cd47747112..cc5cce3239 100644 --- a/packages/react-router/.size-snapshot.json +++ b/packages/react-router/.size-snapshot.json @@ -1,8 +1,8 @@ { "esm/react-router.js": { - "bundled": 24714, - "minified": 14466, - "gzipped": 3780, + "bundled": 24721, + "minified": 14469, + "gzipped": 3778, "treeshaked": { "rollup": { "code": 4464, @@ -14,13 +14,13 @@ } }, "umd/react-router.js": { - "bundled": 99917, + "bundled": 99946, "minified": 35992, "gzipped": 11338 }, "umd/react-router.min.js": { - "bundled": 63384, - "minified": 22374, - "gzipped": 7857 + "bundled": 63430, + "minified": 22393, + "gzipped": 7861 } } diff --git a/packages/react-router/jest.config.js b/packages/react-router/jest.config.js index dd6db748d9..09b538358c 100644 --- a/packages/react-router/jest.config.js +++ b/packages/react-router/jest.config.js @@ -7,7 +7,7 @@ switch (process.env.TEST_ENV) { mappedModule = "/umd/react-router.js"; break; default: - mappedModule = "/modules/index"; + mappedModule = "/modules/index.js"; } module.exports = { diff --git a/packages/react-router/modules/Route.js b/packages/react-router/modules/Route.js index 9ecba7e9d1..3493a67ff8 100644 --- a/packages/react-router/modules/Route.js +++ b/packages/react-router/modules/Route.js @@ -1,5 +1,5 @@ import React from "react"; -import ReactIs from "react-is"; +import { isValidElementType } from "react-is"; import PropTypes from "prop-types"; import invariant from "tiny-invariant"; import warning from "tiny-warning"; @@ -128,8 +128,8 @@ if (!React.createContext) { if (__DEV__) { Route.propTypes = { children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]), - component: function(props, propName) { - if (props[propName] && !ReactIs.isValidElementType(props[propName])) { + component: (props, propName) => { + if (props[propName] && !isValidElementType(props[propName])) { return new Error( `Invalid prop 'component' supplied to 'Route': the prop is not a valid React component` ); diff --git a/packages/react-router/rollup.config.js b/packages/react-router/rollup.config.js index 28181feccf..50f6f0a419 100644 --- a/packages/react-router/rollup.config.js +++ b/packages/react-router/rollup.config.js @@ -21,7 +21,10 @@ const babelOptionsESM = { plugins: [["@babel/transform-runtime", { useESModules: true }]] }; const commonjsOptions = { - include: /node_modules/ + include: /node_modules/, + namedExports: { + "node_modules/react-is/index.js": ["isValidElementType"] + } }; const external = id => !id.startsWith(".") && !id.startsWith("/");