Merge branch 'develop' into develop

.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": {

.gitignore

@@ -18,7 +18,7 @@ pids
 /doc.json
 
 # bundled files
-/packages/*/dist
+/packages/*/**/dist
 /packages/*/errors
 
 # editor specific

README.md

@@ -116,6 +116,11 @@ This is our current release process. It's not perfect, but it has almost the rig
 $ yarn build
 $ yarn test
 
+# If you aren't already on the main branch, be sure to check it out
+# and merge release changes from `develop`
+$ git checkout main
+$ git merge develop
+
 # Generate the changelog and copy it somewhere for later. We'll
 # automate this part eventually, but for now you can get the changelog
 # with:

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",
+  };
+}

lerna.json

@@ -1,9 +1,15 @@
 {
-  "version": "0.13.1",
+  "version": "0.15.0",
   "registry": "https://registry.npmjs.org/",
   "publishConfig": {
     "access": "public"
   },
   "npmClient": "yarn",
-  "useWorkspaces": true
+  "useWorkspaces": true,
+  "ignoreChanges": [
+    "**/__fixtures__/**",
+    "**/__tests__/**",
+    "**/*.md",
+    "**/examples/**"
+  ]
 }

package.json

@@ -10,52 +10,55 @@
   },
   "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",
     "ver": "lerna version --no-push --exact",
     "changes": "dotenv lerna-changelog",
     "clean": "git clean -e '!/.env' -e '!/website-deploy-key' -e '!/website-deploy-key.pub' -fdX .",
-    "lint": "eslint .",
+    "lint:packages": "eslint packages",
+    "lint": "yarn lint:packages",
     "fix": "manypkg fix && preconstruct fix",
-    "dev": "yarn start",
+    "dev": "preconstruct dev && yarn start",
+    "pc": "preconstruct",
     "postinstall": "manypkg check && preconstruct dev",
     "release": "lerna publish from-git --yes --pre-dist-tag next"
   },
   "dependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.12.10",
-    "@babel/preset-typescript": "^7.12.7",
+    "@babel/core": "^7.13.14",
+    "@babel/plugin-proposal-class-properties": "^7.13.0",
+    "@babel/preset-env": "^7.13.12",
+    "@babel/preset-react": "^7.13.13",
+    "@babel/preset-typescript": "^7.13.0",
     "@manypkg/cli": "^0.17.0",
-    "@preconstruct/cli": "^2.0.1",
+    "@preconstruct/cli": "^2.0.6",
     "@reach/router": "^1.3.4",
     "@storybook/addon-actions": "^6.0.28",
     "@storybook/addon-docs": "^6.0.28",
     "@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",
-    "@types/eslint": "^7.2.0",
-    "@types/highlight-words-core": "^1.2.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.7",
     "@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",
     "@types/styled-components": "^5.1.2",
     "@types/tabbable": "^3.1.0",
     "@types/warning": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
+    "@typescript-eslint/eslint-plugin": "^4.20.0",
+    "@typescript-eslint/parser": "^4.20.0",
     "autoprefixer": "^9.8.6",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
@@ -65,40 +68,44 @@
     "babel-plugin-macros": "^3.0.1",
     "cross-env": "^7.0.2",
     "dotenv-cli": "^3.2.0",
-    "eslint": "^7.7.0",
-    "eslint-config-react-app": "^5.2.1",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.20.6",
-    "eslint-plugin-react-hooks": "^4.1.0",
+    "eslint": "^7.23.0",
+    "eslint-config-react-app": "^6.0.0",
+    "eslint-plugin-flowtype": "^5.4.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.3.2",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-testing-library": "^3.10.2",
     "husky": "^4.2.5",
-    "jest": "^26.4.1",
-    "jest-axe": "^3.5.0",
-    "jest-watch-typeahead": "0.6.0",
+    "jest": "^26.6.3",
+    "jest-axe": "^4.1.0",
+    "jest-watch-typeahead": "0.6.1",
     "lerna": "^3.22.1",
     "lerna-changelog": "^1.0.1",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "match-sorter": "^6.0.1",
     "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",
     "react-test-renderer": "^16.13.1",
     "sinon": "^9.0.3",
     "styled-components": "^5.1.1",
-    "ts-jest": "^26.3.0",
-    "ts-loader": "^8.0.2",
-    "ts-node": "^8.10.2",
-    "typescript": "^4.0.2"
+    "ts-jest": "^26.5.4",
+    "typescript": "^4.2.3"
   },
   "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/*"
@@ -131,15 +138,8 @@
       "__DEV__": "readonly"
     },
     "rules": {
-      "no-unused-vars": [
-        1,
-        {
-          "args": "after-used",
-          "ignoreRestSiblings": true,
-          "argsIgnorePattern": "^(event|_)$"
-        }
-      ],
       "import/first": 0,
+      "import/no-anonymous-default-export": 0,
       "jsx-a11y/no-static-element-interactions": [
         1,
         {
@@ -157,7 +157,7 @@
   },
   "eslintIgnore": [
     "node_modules",
-    "packages/*/dist"
+    "packages/*/**/dist"
   ],
   "prettier": {
     "singleQuote": false