Merge branch 'master' into consume-field-hooks

.all-contributorsrc

@@ -172,7 +172,8 @@
       "profile": "http://www.wesbos.com",
       "contributions": [
         "doc",
-        "ideas"
+        "ideas",
+        "maintenance"
       ]
     },
     {
@@ -361,6 +362,43 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "justintemps",
+      "name": "Justin Smith",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12401179?v=4",
+      "profile": "https://github.com/justintemps",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gabipetrovay",
+      "name": "Gabriel Petrovay",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1170398?v=4",
+      "profile": "https://github.com/gabipetrovay",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "LiamAttClarke",
+      "name": "Liam Clarke",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/9361948?v=4",
+      "profile": "https://atticus.dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "wbarcovsky",
+      "name": "Vladimir Barcovsky",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5498761?v=4",
+      "profile": "https://github.com/wbarcovsky",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/curly-pets-care.md

@@ -0,0 +1,5 @@
+---
+'@keystonejs/build-field-types': patch
+---
+
+Upgraded to latest `jest` packages.

.changeset/few-cameras-end.md

@@ -0,0 +1,7 @@
+---
+'@keystonejs/keystone': patch
+---
+Made sure `createRelationships` function in `relationship-utils.js` uses the correct relatedListKey by splitting out possible field name;
+
+This fixes an issue where createItems throws an Error when using Lists Back References.
+Fixes #2360

.changeset/green-spies-argue.md

@@ -0,0 +1,12 @@
+---
+'@keystonejs/demo-project-blog': patch
+'@keystonejs/demo-project-meetup': patch
+'@keystonejs/demo-project-todo': patch
+'create-keystone-app': patch
+'@keystonejs/cypress-project-access-control': patch
+'@keystonejs/cypress-project-basic': patch
+'@keystonejs/cypress-project-client-validation': patch
+'@keystonejs/cypress-project-login': patch
+---
+
+Update `cross-env` dependency to 7.0.0.

.changeset/loud-monkeys-return.md

@@ -0,0 +1,6 @@
+---
+'@keystonejs/mongo-join-builder': patch
+'@keystonejs/test-utils': patch
+---
+
+Updated `mongodb` dependency to 3.5.3 and `mongodb-memory-server` dependency to 6.2.4.

.changeset/modern-cats-trade.md

@@ -0,0 +1,5 @@
+---
+'@keystonejs/fields': patch
+---
+
+Fixed invalid argument dereference in Virtual Field

.changeset/small-queens-do.md

@@ -0,0 +1,43 @@
+---
+'@keystonejs/apollo-helpers': patch
+'@keystonejs/app-admin-ui': patch
+'@arch-ui/badge': patch
+'@arch-ui/button': patch
+'@arch-ui/card': patch
+'@arch-ui/confirm': patch
+'@arch-ui/controls': patch
+'@arch-ui/day-picker': patch
+'@arch-ui/dialog': patch
+'@arch-ui/drawer': patch
+'@arch-ui/dropdown': patch
+'@arch-ui/fields': patch
+'@arch-ui/filters': patch
+'@arch-ui/hooks': patch
+'@arch-ui/icons': patch
+'@arch-ui/input': patch
+'@arch-ui/layout': patch
+'@arch-ui/loading': patch
+'@arch-ui/lozenge': patch
+'@arch-ui/modal-utils': patch
+'@arch-ui/navbar': patch
+'@arch-ui/options': patch
+'@arch-ui/pagination': patch
+'@arch-ui/pill': patch
+'@arch-ui/popout': patch
+'@arch-ui/select': patch
+'@arch-ui/theme': patch
+'@arch-ui/tooltip': patch
+'@arch-ui/typography': patch
+'@keystonejs/build-field-types': patch
+'@keystonejs/field-content': patch
+'@keystonejs/fields-auto-increment': patch
+'@keystonejs/fields-datetime-utc': patch
+'@keystonejs/fields-markdown': patch
+'@keystonejs/fields-mongoid': patch
+'@keystonejs/fields-wysiwyg-tinymce': patch
+'@keystonejs/fields': patch
+'@keystonejs/oembed-adapters': patch
+'@keystonejs/utils': patch
+---
+
+Updated `@babel/*` dependency packages to latest versions.

.changeset/strong-apricots-drum.md

@@ -0,0 +1,8 @@
+---
+'@keystonejs/app-admin-ui': patch
+---
+
+Cleaned up a few React hook-related things:
+- Replaced custom `useRouter` hook with official `react-router` hooks.
+- Removed `withAdminMeta` HOC.
+- Added a `useKeyboardManager` hook.

.changeset/strong-dots-exist.md

@@ -0,0 +1,5 @@
+---
+'create-keystone-app': patch
+---
+
+Upgraded to latest `cfonts` version.

.changeset/young-trains-fail.md

@@ -0,0 +1,5 @@
+---
+'@keystonejs/fields': patch
+---
+
+Converted most field React components to functional ones.

.circleci/config.yml

@@ -7,7 +7,7 @@ version: 2
 x-job-setup: &job-setup
   docker:
     # specify the version you desire here
-    - image: circleci/node:carbon-browsers
+    - image: circleci/node:dubnium-browsers
       environment:
         TEST_DATABASE_URL: postgresql://root@localhost/circle_test
         KNEX_URI: 'postgres://keystone5:k3yst0n3@localhost:5432/circle_test'
@@ -19,25 +19,25 @@ x-job-setup: &job-setup
 # Download and cache dependencies
 x-restore-cache: &restore-cache
   keys:
-    - v14-dependencies-{{ checksum "yarn.lock" }}
+    - v15-dependencies-{{ checksum "yarn.lock" }}
       # fallback to using the latest cache if no exact match is found
-    - v14-dependencies-
+    - v15-dependencies-
 
 x-save-cache: &save-cache
   paths:
     - node_modules
-  key: v14-dependencies-{{ checksum "yarn.lock" }}
+  key: v15-dependencies-{{ checksum "yarn.lock" }}
 
 x-integration-steps: &integration-steps
   steps:
     - checkout
-    - run:
-        name: 'Is test required'
-        command: node ./.circleci/run-or-bail.js
     - run:
         name: Yarn - Install packages
         command: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
     - save_cache: *save-cache
+    - run:
+        name: 'Is test required'
+        command: node ./.circleci/run-or-bail.js
     - run:
         name: E2E Cypress tests
         command: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn --cwd $PROJECT_DIRECTORY cypress:run:ci
@@ -64,6 +64,14 @@ x-integration-steps: &integration-steps
 x-simple-tests: &simple-tests
   steps:
     - checkout
+    # Set Cypress cache dir here, in case this job runs/completes first, and
+    # hence clobbers the `node_modules` cache with a non-cypress version,
+    # causing the other job to fail with a "Missing Cypress" error.
+    - run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
+    - save_cache: *save-cache
+    - run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
+    - run: yarn lint:prettier
+    - run: yarn lint:markdown
     - run:
         name: 'Is test required'
         command: node ./.circleci/run-or-bail.js
@@ -72,15 +80,7 @@ x-simple-tests: &simple-tests
     - run: psql -d $TEST_DATABASE_URL -c "CREATE SCHEMA keystone;"
     - run: psql -d $TEST_DATABASE_URL -c "CREATE USER keystone5 PASSWORD 'k3yst0n3';"
     - run: psql -d $TEST_DATABASE_URL -c "GRANT ALL ON SCHEMA keystone TO keystone5;"
-    # Set Cypress cache dir here, in case this job runs/completes first, and
-    # hence clobbers the `node_modules` cache with a non-cypress version,
-    # causing the other job to fail with a "Missing Cypress" error.
-    - run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
-    - save_cache: *save-cache
     # run tests!
-    - run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
-    - run: yarn lint:prettier
-    - run: yarn lint:markdown
     - run:
         name: Unit tests
         command: yarn jest --ci --reporters=default --reporters=jest-junit --maxWorkers=1

.eslintrc.js

@@ -8,6 +8,11 @@ module.exports = {
     'cypress/globals': true,
   },
   plugins: ['react', 'react-hooks', 'jest', 'cypress', 'import', 'emotion'],
+  settings: {
+    react: {
+      version: 'detect',
+    },
+  },
   rules: {
     curly: ['error', 'multi-line'],
     'jsx-quotes': 'error',

CONTRIBUTING.md

@@ -303,7 +303,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/aghaabbasq"><img src="https://avatars2.githubusercontent.com/u/17919384?v=4" width="80px;" alt=""/><br /><sub><b>aghaabbasq</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=aghaabbasq" title="Code">💻</a></td>
     <td align="center"><a href="http://ajaymathur.github.io/"><img src="https://avatars1.githubusercontent.com/u/9667784?v=4" width="80px;" alt=""/><br /><sub><b>Ajay Narain Mathur</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=ajaymathur" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/mshavliuk"><img src="https://avatars0.githubusercontent.com/u/6589665?v=4" width="80px;" alt=""/><br /><sub><b>mshavliuk</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3Amshavliuk" title="Bug reports">🐛</a> <a href="https://github.com/keystonejs/keystone/commits?author=mshavliuk" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.wesbos.com"><img src="https://avatars2.githubusercontent.com/u/176013?v=4" width="80px;" alt=""/><br /><sub><b>Wes Bos</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wesbos" title="Documentation">📖</a> <a href="#ideas-wesbos" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://www.wesbos.com"><img src="https://avatars2.githubusercontent.com/u/176013?v=4" width="80px;" alt=""/><br /><sub><b>Wes Bos</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wesbos" title="Documentation">📖</a> <a href="#ideas-wesbos" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-wesbos" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/vlad-elagin"><img src="https://avatars1.githubusercontent.com/u/28232030?v=4" width="80px;" alt=""/><br /><sub><b>vlad-elagin</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=vlad-elagin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/Olya-Yer"><img src="https://avatars3.githubusercontent.com/u/33322677?v=4" width="80px;" alt=""/><br /><sub><b>Olya-Yer </b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3AOlya-Yer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/1337cookie"><img src="https://avatars2.githubusercontent.com/u/15826769?v=4" width="80px;" alt=""/><br /><sub><b>1337cookie</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=1337cookie" title="Documentation">📖</a></td>
@@ -330,6 +330,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://ginkgoch.com"><img src="https://avatars1.githubusercontent.com/u/41072618?v=4" width="80px;" alt=""/><br /><sub><b>Ginkgoch</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=ginkgoch" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/MaisaMilena"><img src="https://avatars2.githubusercontent.com/u/28612369?v=4" width="80px;" alt=""/><br /><sub><b>MaisaMilena</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=MaisaMilena" title="Documentation">📖</a></td>
     <td align="center"><a href="http://www.marxvn.com"><img src="https://avatars2.githubusercontent.com/u/4975208?v=4" width="80px;" alt=""/><br /><sub><b>Martin Pham</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3Amarxvn" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/justintemps"><img src="https://avatars3.githubusercontent.com/u/12401179?v=4" width="80px;" alt=""/><br /><sub><b>Justin Smith</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=justintemps" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gabipetrovay"><img src="https://avatars0.githubusercontent.com/u/1170398?v=4" width="80px;" alt=""/><br /><sub><b>Gabriel Petrovay</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=gabipetrovay" title="Code">💻</a> <a href="https://github.com/keystonejs/keystone/commits?author=gabipetrovay" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://atticus.dev"><img src="https://avatars1.githubusercontent.com/u/9361948?v=4" width="80px;" alt=""/><br /><sub><b>Liam Clarke</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=LiamAttClarke" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/wbarcovsky"><img src="https://avatars2.githubusercontent.com/u/5498761?v=4" width="80px;" alt=""/><br /><sub><b>Vladimir Barcovsky</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wbarcovsky" title="Code">💻</a></td>
   </tr>
 </table>
 

README.md

@@ -94,7 +94,7 @@ We'd like to start by thanking all our wonderful contributors:
     <td align="center"><a href="https://github.com/aghaabbasq"><img src="https://avatars2.githubusercontent.com/u/17919384?v=4" width="80px;" alt=""/><br /><sub><b>aghaabbasq</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=aghaabbasq" title="Code">💻</a></td>
     <td align="center"><a href="http://ajaymathur.github.io/"><img src="https://avatars1.githubusercontent.com/u/9667784?v=4" width="80px;" alt=""/><br /><sub><b>Ajay Narain Mathur</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=ajaymathur" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/mshavliuk"><img src="https://avatars0.githubusercontent.com/u/6589665?v=4" width="80px;" alt=""/><br /><sub><b>mshavliuk</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3Amshavliuk" title="Bug reports">🐛</a> <a href="https://github.com/keystonejs/keystone/commits?author=mshavliuk" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.wesbos.com"><img src="https://avatars2.githubusercontent.com/u/176013?v=4" width="80px;" alt=""/><br /><sub><b>Wes Bos</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wesbos" title="Documentation">📖</a> <a href="#ideas-wesbos" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://www.wesbos.com"><img src="https://avatars2.githubusercontent.com/u/176013?v=4" width="80px;" alt=""/><br /><sub><b>Wes Bos</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wesbos" title="Documentation">📖</a> <a href="#ideas-wesbos" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-wesbos" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/vlad-elagin"><img src="https://avatars1.githubusercontent.com/u/28232030?v=4" width="80px;" alt=""/><br /><sub><b>vlad-elagin</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=vlad-elagin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/Olya-Yer"><img src="https://avatars3.githubusercontent.com/u/33322677?v=4" width="80px;" alt=""/><br /><sub><b>Olya-Yer </b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3AOlya-Yer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/1337cookie"><img src="https://avatars2.githubusercontent.com/u/15826769?v=4" width="80px;" alt=""/><br /><sub><b>1337cookie</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=1337cookie" title="Documentation">📖</a></td>
@@ -121,6 +121,10 @@ We'd like to start by thanking all our wonderful contributors:
     <td align="center"><a href="https://ginkgoch.com"><img src="https://avatars1.githubusercontent.com/u/41072618?v=4" width="80px;" alt=""/><br /><sub><b>Ginkgoch</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=ginkgoch" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/MaisaMilena"><img src="https://avatars2.githubusercontent.com/u/28612369?v=4" width="80px;" alt=""/><br /><sub><b>MaisaMilena</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=MaisaMilena" title="Documentation">📖</a></td>
     <td align="center"><a href="http://www.marxvn.com"><img src="https://avatars2.githubusercontent.com/u/4975208?v=4" width="80px;" alt=""/><br /><sub><b>Martin Pham</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/issues?q=author%3Amarxvn" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/justintemps"><img src="https://avatars3.githubusercontent.com/u/12401179?v=4" width="80px;" alt=""/><br /><sub><b>Justin Smith</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=justintemps" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gabipetrovay"><img src="https://avatars0.githubusercontent.com/u/1170398?v=4" width="80px;" alt=""/><br /><sub><b>Gabriel Petrovay</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=gabipetrovay" title="Code">💻</a> <a href="https://github.com/keystonejs/keystone/commits?author=gabipetrovay" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://atticus.dev"><img src="https://avatars1.githubusercontent.com/u/9361948?v=4" width="80px;" alt=""/><br /><sub><b>Liam Clarke</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=LiamAttClarke" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/wbarcovsky"><img src="https://avatars2.githubusercontent.com/u/5498761?v=4" width="80px;" alt=""/><br /><sub><b>Vladimir Barcovsky</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=wbarcovsky" title="Code">💻</a></td>
   </tr>
 </table>