Merge branch 'master' into meetup-demo-hooks

.changeset/curly-pets-care.md

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

.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/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.

.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,14 +19,14 @@ 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:

.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

@@ -275,8 +275,11 @@ We also build commonjs builds to run in node (for testing with jest or etc.) and
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+
 <!-- prettier-ignore-start -->
+
 <!-- markdownlint-disable -->
+
 <table>
   <tr>
     <td align="center"><a href="http://www.thinkmill.com.au"><img src="https://avatars3.githubusercontent.com/u/872310?v=4" width="80px;" alt=""/><br /><sub><b>Jed Watson</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=JedWatson" title="Code">💻</a></td>
@@ -335,7 +338,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 </table>
 
 <!-- markdownlint-enable -->
+
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

README.md

@@ -66,8 +66,11 @@ We'd like to start by thanking all our wonderful contributors:
 ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+
 <!-- prettier-ignore-start -->
+
 <!-- markdownlint-disable -->
+
 <table>
   <tr>
     <td align="center"><a href="http://www.thinkmill.com.au"><img src="https://avatars3.githubusercontent.com/u/872310?v=4" width="80px;" alt=""/><br /><sub><b>Jed Watson</b></sub></a><br /><a href="https://github.com/keystonejs/keystone/commits?author=JedWatson" title="Code">💻</a></td>
@@ -126,7 +129,9 @@ We'd like to start by thanking all our wonderful contributors:
 </table>
 
 <!-- markdownlint-enable -->
+
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ### Demo Projects

api-tests/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @keystonejs/api-tests
 
+## 5.1.0
+
+### Minor Changes
+
+- [`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf) [#2391](https://github.com/keystonejs/keystone/pull/2391) Thanks [@timleslie](https://github.com/timleslie)! - Removed support for Node 8.x, as it is [no longer in maintenance mode](https://nodejs.org/en/about/releases/).
+
+### Patch Changes
+
+- Updated dependencies [[`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf)]:
+  - @keystonejs/adapter-knex@6.3.0
+  - @keystonejs/adapter-mongoose@5.2.0
+  - @keystonejs/app-graphql@5.1.0
+  - @keystonejs/auth-password@5.1.0
+  - @keystonejs/fields@6.3.0
+  - @keystonejs/keystone@5.5.0
+  - @keystonejs/session@5.1.0
+  - @keystonejs/test-utils@5.1.0
+
 ## 5.0.3
 
 ### Patch Changes

api-tests/package.json

@@ -2,30 +2,30 @@
   "name": "@keystonejs/api-tests",
   "description": "A set of tests for running against the KeystoneJS API.",
   "private": true,
-  "version": "5.0.3",
+  "version": "5.1.0",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
-    "node": ">=8.4.0"
+    "node": ">=10.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone.git",
   "homepage": "https://github.com/keystonejs/keystone",
   "devDependencies": {
-    "@keystonejs/adapter-knex": "^6.2.0",
-    "@keystonejs/adapter-mongoose": "^5.1.4",
-    "@keystonejs/app-graphql": "^5.0.3",
-    "@keystonejs/fields": "^6.2.0",
-    "@keystonejs/keystone": "^5.4.3",
-    "@keystonejs/session": "^5.0.0",
-    "@keystonejs/test-utils": "^5.0.3",
+    "@keystonejs/adapter-knex": "^6.3.0",
+    "@keystonejs/adapter-mongoose": "^5.2.0",
+    "@keystonejs/app-graphql": "^5.1.0",
+    "@keystonejs/fields": "^6.3.0",
+    "@keystonejs/keystone": "^5.5.0",
+    "@keystonejs/session": "^5.1.0",
+    "@keystonejs/test-utils": "^5.1.0",
     "body-parser": "^1.18.2",
     "cookie-signature": "^1.1.0",
     "cuid": "^2.1.6",
     "supertest-light": "^1.0.2",
     "testcheck": "^1.0.0-rc.2"
   },
   "dependencies": {
-    "@keystonejs/auth-password": "^5.0.1",
+    "@keystonejs/auth-password": "^5.1.0",
     "express": "^4.17.1"
   }
 }

benchmarks/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @keystonejs/benchmarks
 
+## 5.1.0
+
+### Minor Changes
+
+- [`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf) [#2391](https://github.com/keystonejs/keystone/pull/2391) Thanks [@timleslie](https://github.com/timleslie)! - Removed support for Node 8.x, as it is [no longer in maintenance mode](https://nodejs.org/en/about/releases/).
+
+### Patch Changes
+
+- Updated dependencies [[`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf)]:
+  - @keystonejs/adapter-knex@6.3.0
+  - @keystonejs/adapter-mongoose@5.2.0
+  - @keystonejs/app-graphql@5.1.0
+  - @keystonejs/fields@6.3.0
+  - @keystonejs/keystone@5.5.0
+  - @keystonejs/session@5.1.0
+  - @keystonejs/test-utils@5.1.0
+
 ## 5.0.1
 
 ### Patch Changes

benchmarks/package.json

@@ -2,25 +2,25 @@
   "name": "@keystonejs/benchmarks",
   "description": "A set of benchmarks for running against the KeystoneJS API.",
   "private": true,
-  "version": "5.0.1",
+  "version": "5.1.0",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
-    "node": ">=8.4.0"
+    "node": ">=10.0.0"
   },
   "scripts": {
     "go": "node fixtures/index.js"
   },
   "repository": "https://github.com/keystonejs/keystone.git",
   "homepage": "https://github.com/keystonejs/keystone",
   "dependencies": {
-    "@keystonejs/adapter-knex": "^6.0.0",
-    "@keystonejs/adapter-mongoose": "^5.1.3",
-    "@keystonejs/app-graphql": "^5.0.1",
-    "@keystonejs/fields": "^6.0.0",
-    "@keystonejs/keystone": "^5.3.0",
-    "@keystonejs/session": "^5.0.0",
-    "@keystonejs/test-utils": "^5.0.2",
+    "@keystonejs/adapter-knex": "^6.3.0",
+    "@keystonejs/adapter-mongoose": "^5.2.0",
+    "@keystonejs/app-graphql": "^5.1.0",
+    "@keystonejs/fields": "^6.3.0",
+    "@keystonejs/keystone": "^5.5.0",
+    "@keystonejs/session": "^5.1.0",
+    "@keystonejs/test-utils": "^5.1.0",
     "body-parser": "^1.18.2",
     "cookie-signature": "^1.1.0",
     "cuid": "^2.1.6",

demo-projects/blog/CHANGELOG.md

@@ -1,5 +1,46 @@
 # keystone_demo_blog
 
+## 5.2.0
+
+### Minor Changes
+
+- [`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf) [#2391](https://github.com/keystonejs/keystone/pull/2391) Thanks [@timleslie](https://github.com/timleslie)! - Removed support for Node 8.x, as it is [no longer in maintenance mode](https://nodejs.org/en/about/releases/).
+
+### Patch Changes
+
+- Updated dependencies [[`517b23e4`](https://github.com/keystonejs/keystone/commit/517b23e4b17414ed1807e8d7af1e67377ba3b7bf)]:
+  - @keystonejs/adapter-mongoose@5.2.0
+  - @keystonejs/app-admin-ui@5.8.0
+  - @keystonejs/app-graphql@5.1.0
+  - @keystonejs/app-next@5.1.0
+  - @keystonejs/app-static@5.1.0
+  - @keystonejs/auth-password@5.1.0
+  - @keystonejs/fields-markdown@5.1.0
+  - @keystonejs/fields-wysiwyg-tinymce@5.1.0
+  - @keystonejs/fields@6.3.0
+  - @keystonejs/file-adapters@5.5.0
+  - @keystonejs/keystone@5.5.0
+  - @keystonejs/oembed-adapters@5.1.0
+
+## 5.1.5
+
+### Patch Changes
+
+- [`36a3e6a0`](https://github.com/keystonejs/keystone/commit/36a3e6a089b81a37276bbbe87dea7cf24dd5db9e) [#2323](https://github.com/keystonejs/keystone/pull/2323) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated Apollo-related dependencies:
+
+  apollo-boost: 0.4.4 -> 0.4.7
+  apollo-cache-inmemory: 1.5.1 -> 1.6.5
+  apollo-client: 2.6.4 -> 2.6.8
+  apollo-server-express: 2.9.1 -> 2.9.16
+  apollo-upload-client: 10.0.0 -> 12.1.0
+  apollo-utilities: 1.3.2 -> 1.3.3
+
+- Updated dependencies [[`b8631cf7`](https://github.com/keystonejs/keystone/commit/b8631cf770db14b90f83300358213b7572ca01f2), [`29845426`](https://github.com/keystonejs/keystone/commit/29845426cb699afcc003f6a0b9ef540a61f808b4), [`ae4cf2d1`](https://github.com/keystonejs/keystone/commit/ae4cf2d108768d7ccbd23a409e7170fc92c81316), [`36a3e6a0`](https://github.com/keystonejs/keystone/commit/36a3e6a089b81a37276bbbe87dea7cf24dd5db9e), [`6c25d331`](https://github.com/keystonejs/keystone/commit/6c25d3319f89351568ad9d007b985a230e54b5b3), [`92d77eac`](https://github.com/keystonejs/keystone/commit/92d77eac59649430c2db810d2c701e5eab8b6e24)]:
+  - @keystonejs/app-admin-ui@5.7.3
+  - @keystonejs/app-graphql@5.0.4
+  - @keystonejs/fields@6.2.3
+  - @keystonejs/keystone@5.4.4
+
 ## 5.1.4
 
 ### Patch Changes

demo-projects/blog/package.json

@@ -2,11 +2,11 @@
   "name": "@keystonejs/demo-project-blog",
   "description": "An example KeystoneJS project showcasing a Blogging Site.",
   "private": true,
-  "version": "5.1.4",
+  "version": "5.2.0",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
-    "node": ">=8.4.0"
+    "node": ">=10.0.0"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development DISABLE_LOGGING=true keystone dev",
@@ -18,22 +18,22 @@
     "@arch-ui/typography": "^0.0.12",
     "@emotion/core": "^10.0.22",
     "@emotion/styled": "^10.0.22",
-    "@keystonejs/adapter-mongoose": "^5.1.5",
-    "@keystonejs/app-admin-ui": "^5.6.0",
-    "@keystonejs/app-graphql": "^5.0.2",
-    "@keystonejs/app-next": "^5.0.2",
-    "@keystonejs/app-static": "^5.0.0",
-    "@keystonejs/auth-password": "^5.0.1",
-    "@keystonejs/fields": "^6.0.5",
-    "@keystonejs/fields-markdown": "^5.0.4",
-    "@keystonejs/fields-wysiwyg-tinymce": "^5.0.4",
-    "@keystonejs/file-adapters": "^5.3.2",
-    "@keystonejs/keystone": "^5.4.1",
-    "@keystonejs/oembed-adapters": "^5.0.4",
-    "apollo-boost": "^0.4.4",
-    "apollo-client": "^2.6.4",
-    "apollo-upload-client": "^10.0.0",
-    "cross-env": "^5.2.0",
+    "@keystonejs/adapter-mongoose": "^5.2.0",
+    "@keystonejs/app-admin-ui": "^5.8.0",
+    "@keystonejs/app-graphql": "^5.1.0",
+    "@keystonejs/app-next": "^5.1.0",
+    "@keystonejs/app-static": "^5.1.0",
+    "@keystonejs/auth-password": "^5.1.0",
+    "@keystonejs/fields": "^6.3.0",
+    "@keystonejs/fields-markdown": "^5.1.0",
+    "@keystonejs/fields-wysiwyg-tinymce": "^5.1.0",
+    "@keystonejs/file-adapters": "^5.5.0",
+    "@keystonejs/keystone": "^5.5.0",
+    "@keystonejs/oembed-adapters": "^5.1.0",
+    "apollo-boost": "^0.4.7",
+    "apollo-client": "^2.6.8",
+    "apollo-upload-client": "^12.1.0",
+    "cross-env": "^7.0.0",
     "date-fns": "^1.30.1",
     "dotenv": "^8.0.0",
     "express": "^4.17.1",