update deps + allow testing in React 16

Chance Strickland · Chance Strickland · commit 856db5c30694 · 2021-03-29T12:54:57.000-07:00
diff --git a/.codesandbox/templates/reach-ui/package.json b/.codesandbox/templates/reach-ui/package.json
@@ -30,10 +30,10 @@
     "@reach/utils": "latest",
     "@reach/visually-hidden": "latest",
     "@reach/window-size": "latest",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-scripts": "3.4.1"
   },
   "devDependencies": {
diff --git a/jest.config.js b/jest.config.js
@@ -25,3 +25,13 @@ module.exports = {
     require.resolve("jest-watch-typeahead/testname"),
   ],
 };
+
+if (process.env.USE_REACT_16 === "true") {
+  module.exports.cacheDirectory = ".cache/jest-cache-react-16";
+  module.exports.moduleNameMapper = {
+    ...module.exports.moduleNameMapper,
+    "^react-is((\\/.*)?)$": "react-is-16$1",
+    "^react-dom((\\/.*)?)$": "react-dom-16$1",
+    "^react((\\/.*)?)$": "react-16$1",
+  };
+}
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   },
   "scripts": {
     "start": "start-storybook -p 9001 -c .storybook",
+    "test:react-16": "USE_REACT_16=true jest",
     "test": "jest",
     "build": "yarn build:packages",
     "build:packages": "preconstruct build",
@@ -36,18 +37,19 @@
     "@storybook/addon-links": "^6.0.28",
     "@storybook/addons": "^6.0.28",
     "@storybook/react": "^6.0.28",
-    "@testing-library/dom": "^7.29.0",
-    "@testing-library/jest-dom": "^5.11.6",
-    "@testing-library/react": "^11.2.2",
-    "@testing-library/user-event": "^12.6.0",
+    "@testing-library/dom": "^7.30.1",
+    "@testing-library/jest-dom": "^5.11.10",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/react-hooks": "^5.1.0",
+    "@testing-library/user-event": "^13.0.16",
     "@types/eslint": "^7.2.0",
     "@types/highlight-words-core": "^1.2.0",
     "@types/invariant": "^2.2.33",
     "@types/jest": "^26.0.0",
     "@types/lodash": "^4.14.155",
     "@types/node": "^12.12.47",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.1",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
     "@types/react-router-dom": "^5.1.7",
     "@types/react-test-renderer": "^17.0.1",
     "@types/sinon": "^9.0.4",
@@ -83,8 +85,12 @@
     "prettier": "^2.0.5",
     "pretty-quick": "^3.0.0",
     "prop-types": "^15.7.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^17.0.2",
+    "react-16": "npm:react@^16.14.0",
+    "react-dom": "^17.0.2",
+    "react-dom-16": "npm:react-dom@^16.14.0",
+    "react-is": "^17.0.2",
+    "react-is-16": "npm:react-is@^16.13.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-spring": "^8.0.27",
@@ -95,8 +101,8 @@
     "typescript": "^4.1.5"
   },
   "resolutions": {
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.1"
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3"
   },
   "workspaces": [
     "packages/*"
diff --git a/packages/accordion/package.json b/packages/accordion/package.json
@@ -19,8 +19,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/alert-dialog/package.json b/packages/alert-dialog/package.json
@@ -19,8 +19,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/alert/package.json b/packages/alert/package.json
@@ -17,8 +17,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/auto-id/package.json b/packages/auto-id/package.json
@@ -15,8 +15,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json
@@ -20,8 +20,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/combobox/package.json b/packages/combobox/package.json
@@ -21,8 +21,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/component-component/package.json b/packages/component-component/package.json
@@ -14,8 +14,8 @@
     "prop-types": "^15.7.2"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.4.0 || 17.x",
diff --git a/packages/descendants/package.json b/packages/descendants/package.json
@@ -15,8 +15,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/dialog/package.json b/packages/dialog/package.json
@@ -19,8 +19,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/disclosure/package.json b/packages/disclosure/package.json
@@ -18,8 +18,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/listbox/package.json b/packages/listbox/package.json
@@ -19,8 +19,8 @@
     "prop-types": "^15.7.2"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/machine/package.json b/packages/machine/package.json
@@ -16,8 +16,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/menu-button/package.json b/packages/menu-button/package.json
@@ -19,8 +19,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/popover/package.json b/packages/popover/package.json
@@ -18,8 +18,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/portal/package.json b/packages/portal/package.json
@@ -15,8 +15,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/rect/package.json b/packages/rect/package.json
@@ -18,8 +18,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/skip-nav/package.json b/packages/skip-nav/package.json
@@ -15,8 +15,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/slider/package.json b/packages/slider/package.json
@@ -18,8 +18,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.9.0 || 17.x",
diff --git a/packages/tabs/package.json b/packages/tabs/package.json
@@ -18,8 +18,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json
@@ -21,8 +21,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -14,8 +14,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/visually-hidden/package.json b/packages/visually-hidden/package.json
@@ -15,8 +15,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/packages/window-size/package.json b/packages/window-size/package.json
@@ -16,8 +16,8 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || 17.x",
diff --git a/test/setupTests.ts b/test/setupTests.ts
@@ -23,14 +23,10 @@ expect.extend({
 });
 
 beforeEach(() => {
-  jest.unmock("@reach/utils/dev-utils");
   jest.unmock("@reach/auto-id");
   jest.unmock("@reach/rect");
-  const devUtils = require("@reach/utils/dev-utils");
   const autoId = require("@reach/auto-id");
   const rect = require("@reach/rect");
-  devUtils.checkStyles = jest.fn();
-  devUtils.useCheckStyles = jest.fn();
   autoId.useId = (fallback: string) => fallback || "REACH-ID";
   rect.useRect = () => ({ height: 1, width: 1, x: 0, y: 0 });
 });
diff --git a/yarn.lock b/yarn.lock
