Merge fce2dc0 into b1b7a55

.npmrc

@@ -0,0 +1 @@
+save-exact=true

jest-base.config.js

@@ -8,5 +8,5 @@ module.exports = {
   moduleFileExtensions: ['js', 'jsx', 'json', 'ts', 'tsx', 'node'],
   modulePathIgnorePatterns: ['dist/'],
   collectCoverage: true,
-  coverageReporters: ['json', 'html'],
+  coverageReporters: ['json', 'html', 'lcov'],
 };

package.json

@@ -11,15 +11,16 @@
   "sideEffects": false,
   "scripts": {
     "____ LIFECYCLE HOOKS _______________________________________________": "",
-    "prepare": "lerna bootstrap --ignore-scripts && lerna exec yarn prepare",
+    "prepare": "lerna bootstrap",
     "prepublishOnly": "yarn checkup",
     "prerelease": "yon clean",
     "pretest": "yon test:clean",
     "____ INTEGRATION ___________________________________________________": "",
+    "bootstrap": "yon run packages:prepare && lerna bootstrap",
     "clean": "rimraf storybook-static/ && yon test:clean && yon packages:clean",
     "checkup": "yon run format:checkup && yon run types && yon run lint",
     "dev": "yon run format && yon run types && yon run lint",
-    "ci": "yon run checkup && yon run packages:checkup && yon run test:report && yon run build-storybook",
+    "ci": "yon run bootstrap && yon run checkup && yon run packages:checkup && yon run test:report && yon run build-storybook",
     "all": "lerna bootstrap && yon run dev && yon run test && yon run build-storybook",
     "____ BATCH COMMANDS FOR PACKAGES ___________________________________": "",
     "packages:prepare": "lerna exec yon prepare",
@@ -43,54 +44,54 @@
     "release:postpublish": "standard-version --commit-all --sign --skip.changelog --release-as ",
     "test": "jest --coverage",
     "test:clean": "rimraf coverage/",
-    "test:report": "jest --coverage --coverageReporters=text-lcov | coveralls",
+    "test:report": "jest --coverage && coveralls < coverage/lcov.info",
     "test:watch": "jest --coverage --watch",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.11.1",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@storybook/addon-actions": "^6.0.10",
-    "@storybook/addon-essentials": "^6.0.10",
-    "@storybook/addon-links": "^6.0.10",
-    "@storybook/react": "^6.0.10",
-    "@testing-library/jest-dom": "^5.11.3",
-    "@testing-library/react": "^10.4.8",
-    "@types/jest": "^26.0.10",
-    "@types/node": "^14.0.27",
-    "@types/react": "^16.9.46",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-is": "^16.7.1",
-    "@typescript-eslint/eslint-plugin": "^3.9.0",
-    "@typescript-eslint/parser": "^3.9.0",
-    "babel-loader": "^8.1.0",
-    "coveralls": "^3.1.0",
-    "eslint": "^7.7.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.20.6",
-    "fork-ts-checker-webpack-plugin": "^5.0.14",
-    "gh-pages": "^3.1.0",
-    "husky": "^4.2.5",
-    "jest": "^26.4.0",
-    "lerna": "^3.22.1",
-    "lint-staged": "^10.2.11",
-    "microbundle": "^0.12.3",
-    "prettier": "^2.0.5",
-    "react": "^16.13.1",
-    "react-docgen-typescript-loader": "^3.7.2",
-    "react-dom": "^16.13.1",
-    "react-is": "^16.13.1",
-    "react-test-renderer": "^16.13.1",
-    "rimraf": "^3.0.2",
-    "standard-version": "^9.0.0",
-    "ts-jest": "^26.2.0",
-    "ts-loader": "^8.0.2",
-    "tslib": "^2.0.1",
-    "typescript": "^3.9.7",
-    "yarn-or-npm": "^3.0.1"
+    "@babel/core": "7.11.6",
+    "@babel/preset-react": "7.10.4",
+    "@babel/preset-typescript": "7.10.4",
+    "@storybook/addon-actions": "6.0.22",
+    "@storybook/addon-essentials": "6.0.22",
+    "@storybook/addon-links": "6.0.22",
+    "@storybook/react": "6.0.22",
+    "@testing-library/jest-dom": "5.11.4",
+    "@testing-library/react": "11.0.4",
+    "@types/react-dom": "16.9.8",
+    "@types/react-is": "16.7.1",
+    "@types/react-redux": "7.1.9",
+    "@types/react-router": "5.1.8",
+    "@types/react-router-dom": "5.1.5",
+    "@typescript-eslint/eslint-plugin": "4.3.0",
+    "@typescript-eslint/parser": "4.3.0",
+    "babel-loader": "8.1.0",
+    "coveralls": "3.1.0",
+    "eslint": "7.10.0",
+    "eslint-config-prettier": "6.12.0",
+    "eslint-plugin-prettier": "3.1.4",
+    "eslint-plugin-react": "7.21.2",
+    "fork-ts-checker-webpack-plugin": "5.2.0",
+    "gh-pages": "3.1.0",
+    "husky": "4.3.0",
+    "jest": "26.4.2",
+    "lerna": "3.22.1",
+    "lint-staged": "10.4.0",
+    "microbundle": "0.12.4",
+    "prettier": "2.1.2",
+    "react": "16.13.1",
+    "react-docgen-typescript-loader": "3.7.2",
+    "react-dom": "16.13.1",
+    "react-is": "16.13.1",
+    "react-test-renderer": "16.13.1",
+    "rimraf": "3.0.2",
+    "standard-version": "9.0.0",
+    "ts-jest": "26.4.1",
+    "ts-loader": "8.0.4",
+    "tslib": "2.0.1",
+    "typescript": "4.0.3",
+    "yarn-or-npm": "3.0.1"
   },
   "lint-staged": {
     "**/*.{css,html,js,jsx,json,less,md,scss,ts,tsx}": [

packages/dev-helpers/package.json

@@ -54,8 +54,6 @@
   },
   "dependencies": {
     "@material-ui/core": "^4.11.0",
-    "@testing-library/react": "^10.4.8",
-    "history": "^4.10.1",
     "prop-types": "^15.7.2",
     "react-is": "^16.13.1",
     "react-redux": "^7.2.1",
@@ -64,11 +62,7 @@
     "redux-devtools-extension": "^2.13.8",
     "typeface-roboto": "^0.0.75"
   },
-  "devDependencies": {
-    "@types/history": "^4.7.7",
-    "@types/react-redux": "^7.1.9",
-    "@types/react-router": "^5.1.8"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"

packages/dev-helpers/src/jest/renderWithRouterContext.tsx

@@ -1,17 +1,14 @@
 import React, { ReactElement, ComponentType } from 'react';
-import { createMemoryHistory, MemoryHistoryBuildOptions } from 'history';
 import { isElement } from 'react-is';
-import { Router } from 'react-router';
+import { MemoryRouter, MemoryRouterProps } from 'react-router';
 import { render } from '@testing-library/react';
 
 const renderWithRouterContext = (
   AppRoot: ReactElement | ComponentType,
-  historyOptions?: MemoryHistoryBuildOptions,
+  routerProps: MemoryRouterProps = {},
 ): ReturnType<typeof render> => {
-  const history = createMemoryHistory(historyOptions);
-
   const renderResult = render(
-    <Router history={history}>{isElement(AppRoot) ? AppRoot : <AppRoot />}</Router>,
+    <MemoryRouter {...routerProps}>{isElement(AppRoot) ? AppRoot : <AppRoot />}</MemoryRouter>,
   );
   return {
     ...renderResult,

packages/react-hibernate/package.json

@@ -58,10 +58,10 @@
     "limited-cache": "^1.0.0",
     "prop-types": "^15.7.2",
     "react-is": "^16.12.0",
-    "react-reverse-portal": "^2.0.0"
+    "react-reverse-portal": "^2.0.1"
   },
   "devDependencies": {
-    "react-hibernate-dev-helpers": "^0.1.0"
+    "react-hibernate-dev-helpers": "0.1.0"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

packages/react-pauseable-containers/package.json

@@ -63,14 +63,17 @@
     "redux-pauseable-store": "^0.1.0"
   },
   "devDependencies": {
-    "react-hibernate-dev-helpers": "^0.1.0"
+    "react-hibernate-dev-helpers": "0.1.0"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "react-redux": ">=7.0.0"
   },
   "peerDependenciesMeta": {
+    "react-dom": {
+      "optional": true
+    },
     "react-redux": {
       "optional": true
     }

packages/react-router-hibernate/package.json

@@ -61,12 +61,11 @@
     "limited-cache": "^1.0.0",
     "prop-types": "^15.7.2",
     "react-is": "^16.12.0",
-    "react-reverse-portal": "^2.0.0"
+    "react-reverse-portal": "^2.0.1"
   },
   "devDependencies": {
-    "@types/react-router-dom": "^5.1.5",
-    "react-hibernate-dev-helpers": "^0.1.0",
-    "react-router-dom": "^5.2.0"
+    "react-hibernate-dev-helpers": "0.1.0",
+    "react-router-dom": "5.2.0"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

packages/react-router-hibernate/src/HibernatingSwitch.tsx

@@ -1,5 +1,6 @@
-import React, { ReactNode, useMemo } from 'react';
 import { LimitedCache } from 'limited-cache';
+import { ReactComponentLike } from 'prop-types';
+import React, { ReactNode, useMemo } from 'react';
 import { isElement } from 'react-is';
 import { createHtmlPortalNode, InPortal, OutPortal, HtmlPortalNode } from 'react-reverse-portal';
 import {
@@ -13,7 +14,6 @@ import {
 
 import HibernatingRoute from './HibernatingRoute';
 import renderRoute from './renderRoute';
-import { ReactComponentLike } from 'prop-types';
 
 interface HibernatingSwitchProps extends SwitchProps {
   children: ReactNode;

packages/react-router-hibernate/src/renderRoute.ts

@@ -2,7 +2,7 @@ import React, { ReactNode } from 'react';
 import { RouteComponentProps, RouteProps } from 'react-router';
 
 // This is based on how <Route> itself renders things, in react-router v5:
-// https://github.com/ReactTraining/react-router/blob/7a9170d759af1a02a473d631f411459aeaa562c2/packages/react-router/modules/Route.js#L56-L72 */}
+// https://github.com/ReactTraining/react-router/blob/f20cd62495c7bc4f8949ae6d28afe587f62b557a/packages/react-router/modules/Route.js#L56-L72
 const renderRoute = (routerProps: RouteComponentProps, routeProps: RouteProps): ReactNode => {
   const { children, component, render } = routeProps;
 
@@ -14,7 +14,8 @@ const renderRoute = (routerProps: RouteComponentProps, routeProps: RouteProps):
           : children(routerProps)
         : children
       : component
-      ? React.createElement(component, routerProps)
+      ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        React.createElement(component as any, routerProps)
       : render
       ? render(routerProps)
       : null