Merge branch 'master' into new-interface-trust-proxy

.changeset/brown-bikes-destroy.md

@@ -0,0 +1,5 @@
+---
+'@keystonejs/test-utils': patch
+---
+
+Updated `multiAdapterRunners().before()` to return a `context` object when using `setupFromConfig()`.

.changeset/fast-meals-ring.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/auth': patch
+---
+
+Fixed a bug which prevented accessing the '/init` path from behind a reverse proxy.

.changeset/light-scissors-agree.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields': minor
+---
+
+Added float field type for keystone-next

.changeset/mean-lions-suffer.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Removed `itemId` from `FieldAccessArgs` and no longer pass this value into field level imperative access control rules.

.changeset/modern-squids-move.md

@@ -0,0 +1,6 @@
+---
+'@keystone-next/keystone': major
+'@keystone-next/types': major
+---
+
+Removed the `context` argument from `KeystoneContext.graphql.raw` and `KeystoneContext.graphql.run`.

.changeset/moody-windows-bake.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/auth': patch
+---
+
+Updated import of `KeystoneContext` to use top level `types` package API.

.changeset/perfect-pillows-prove.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/types': patch
+---
+
+Refactored `KeystoneContext` definition to make documentation easier. No functional changes.

.changeset/red-boxes-kick.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/website': minor
+---
+
+Added access control API docs.

.changeset/selfish-singers-swim.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Removed `itemIds` from `FieldAccessArgs` and no longer pass this value into field level imperative access control rules.

.changeset/sharp-news-speak.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/types': minor
+---
+
+Deprecated `KeystoneContext.keystone`.

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           filters: |
             shouldRunTests:
-              - '!{{website,docs,examples,packages-next,examples-next,design-system}/**,**/*.md}'
+              - '!{{website,docs,examples,design-system}/**,**/*.md}'
       - run: echo "SHOULD_RUN_TESTS=$SHOULD_RUN" >> $GITHUB_ENV
         if: github.event_name == 'pull_request'
         env:
@@ -203,10 +203,11 @@ jobs:
       fail-fast: false
       matrix:
         project:
-          - test-projects/basic
-          - test-projects/login
-          - test-projects/access-control
-          - test-projects/client-validation
+          - tests/test-projects/basic
+          - tests/test-projects/login
+          - tests/test-projects/access-control
+          - tests/test-projects/client-validation
+          - docs-next
     steps:
       - name: Checkout Repo
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
@@ -236,9 +237,9 @@ jobs:
       - name: Install Dependencies
         run: yarn
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
-      - run: yarn --cwd tests/${{ matrix.project }} cypress install
+      - run: yarn --cwd ${{ matrix.project }} cypress install
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
-      - run: yarn --cwd tests/${{ matrix.project }} cypress:run:ci
+      - run: yarn --cwd ${{ matrix.project }} cypress:run:ci
         if: needs.should_run_tests.outputs.shouldRunTests == 'true'
       - uses: actions/upload-artifact@v2
         if: failure()

docs-next/components/Navigation.tsx

@@ -64,9 +64,7 @@ export const Navigation = () => {
         <NavItem href="/apis/config">Config API</NavItem>
         <NavItem href="/apis/schema">Schema API</NavItem>
         <NavItem href="/apis/fields">Fields API</NavItem>
-        <NavItem href="/apis/access-control" isPlaceholder>
-          Access Control API
-        </NavItem>
+        <NavItem href="/apis/access-control">Access Control API</NavItem>
         <NavItem href="/apis/hooks" isPlaceholder>
           Hooks API
         </NavItem>
@@ -80,6 +78,9 @@ export const Navigation = () => {
         <NavItem href="/apis/graphql" isPlaceholder>
           GraphQL API
         </NavItem>
+        <NavItem href="/apis/items" isPlaceholder>
+          List Item API
+        </NavItem>
       </Section>
     </div>
   );

docs-next/cypress.json

@@ -0,0 +1 @@
+{}

docs-next/cypress/.gitignore

@@ -0,0 +1,3 @@
+videos
+screenshots
+reports

docs-next/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "[email protected]",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

docs-next/cypress/integration/examples/home_spec.js

@@ -0,0 +1,10 @@
+/// <reference types="cypress" />
+
+describe('basic docs tests', () => {
+  beforeEach(() => {
+    cy.visit('http://localhost:8000');
+  });
+  it('finds the Welcome content', () => {
+    cy.contains('Welcome');
+  });
+});

docs-next/cypress/plugins/index.js

@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+};

docs-next/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

docs-next/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

docs-next/package.json

@@ -4,7 +4,10 @@
   "private": true,
   "license": "MIT",
   "scripts": {
-    "dev": "next -p 8000"
+    "dev": "next -p 8000",
+    "cy:open": "cypress open",
+    "cy:run": "cypress run",
+    "cypress:run:ci": "start-server-and-test dev http://localhost:8000 cy:run"
   },
   "dependencies": {
     "@babel/runtime": "^7.12.18",
@@ -32,6 +35,7 @@
     "autoprefixer": "^10.2.4",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.3.1",
+    "cypress": "^5.6.0",
     "facepaint": "^1.2.1",
     "next": "10.0.7",
     "next-compose-plugins": "^2.2.1",
@@ -43,6 +47,7 @@
     "unist-builder": "^2.0.3"
   },
   "devDependencies": {
+    "start-server-and-test": "^1.12.0",
     "typescript": "^4.1.5"
   },
   "engines": {