Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: keystonejs/keystone
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @keystone-6/auth@7.0.0
Choose a base ref
...
head repository: keystonejs/keystone
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @keystone-6/auth@7.0.1
Choose a head ref

Commits on Feb 26, 2023

  1. Copy the full SHA
    142b464 View commit details

Commits on Feb 27, 2023

  1. Remove yarn from repository, add packageManager field to package.json (

    …#8336)
    
    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Feb 27, 2023
    Copy the full SHA
    663b8ac View commit details
  2. Fix Release descriptions assuming 1-commit to 1-changeset (#8337)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Feb 27, 2023
    Copy the full SHA
    279a50c View commit details
  3. Update file-type to 18.2.0 (#8304)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    Co-authored-by: Emma Hamilton <git@emmas.town>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    4 people authored Feb 27, 2023
    Copy the full SHA
    aad6314 View commit details
  4. chore(deps): update dependency start-server-and-test to v2 (#8341)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Feb 27, 2023
    Copy the full SHA
    facca40 View commit details

Commits on Feb 28, 2023

  1. fix(deps): update dependency @vercel/og to ^0.2.0 (#8235)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Feb 28, 2023
    Copy the full SHA
    fcf318c View commit details
  2. fix packageManager specification (#8343)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Feb 28, 2023
    Copy the full SHA
    0d73d57 View commit details
  3. remove process.cwd change in tests (#8344)

    Josh Calder authored Feb 28, 2023
    Copy the full SHA
    fa32a14 View commit details
  4. fix(deps): update dependency @graphql-typed-document-node/core to v3.…

    …1.2 (#8340)
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    renovate[bot] and Josh Calder authored Feb 28, 2023
    Copy the full SHA
    d7bfbad View commit details
  5. fix(deps): update prisma monorepo to v4.11.0 (#7964)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
    3 people authored Feb 28, 2023
    Copy the full SHA
    33ec1fc View commit details

Commits on Mar 1, 2023

  1. fix(deps): update dependency @hapi/iron to v7 (#7553)

    * fix(deps): update dependency @hapi/iron to v7
    
    * update @hapi/iron to ^7.0.0
    
    ---------
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
    renovate[bot] and dcousens authored Mar 1, 2023
    Copy the full SHA
    aec152c View commit details
  2. Remove prismaClient.$on('beforeExit'...) to assist with Prisma Data…

    … Proxy support (#8347)
    
    * Fix dataproxy not supporting beforeExit event
    
    * drop prisma onExit
    
    * Add changeset
    
    ---------
    
    Co-authored-by: Markus Machatschek <mmachatschek@users.noreply.github.com>
    Josh Calder and mmachatschek authored Mar 1, 2023
    Copy the full SHA
    5051e5a View commit details

Commits on Mar 2, 2023

  1. Fix list-level graphql.omit syntax. (#8352)

    Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    3 people authored Mar 2, 2023
    Copy the full SHA
    f4d4f5c View commit details
  2. Fix behavior of keystone start --with-migrations (#8354)

    Co-authored-by: Josh Calder <josh@opensaas.com.au>
    acburdine and borisno2 authored Mar 2, 2023
    Copy the full SHA
    c3ce0da View commit details
  3. Update schema-type-printer to output "never" for omitted GraphQL types (

    #8355)
    
    Co-authored-by: Josh Calder <josh@opensaas.com.au>
    acburdine and borisno2 authored Mar 2, 2023
    Copy the full SHA
    ce600cf View commit details
  4. update yarn.lock (#8358)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Mar 2, 2023
    Copy the full SHA
    9f82f67 View commit details
  5. Prepare for minor release (#8348)

    ---------
    
    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    3 people authored Mar 2, 2023
    Copy the full SHA
    7fb3fe5 View commit details
  6. Version Packages (#8338)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    Copy the full SHA
    344d4eb View commit details
  7. add start --with-migrations tests (#8360)

    Josh Calder authored Mar 2, 2023
    Copy the full SHA
    4ed64da View commit details
  8. remove dead link (#8361)

    dcousens authored Mar 2, 2023
    Copy the full SHA
    bd4d8ad View commit details

Commits on Mar 3, 2023

  1. Add Vercel GitHub CI action (#8362)

    * add Vercel CI actions
    
    * rename to vercel.*.yml
    
    * add missing env
    dcousens authored Mar 3, 2023
    Copy the full SHA
    6a0d351 View commit details
  2. Copy the full SHA
    72529e8 View commit details

Commits on Mar 5, 2023

  1. docs: Fix a few typos (#8367)

    There are small typos in:
    - docs/pages/docs/guides/auth-and-access-control.md
    - docs/pages/docs/guides/custom-admin-ui-pages.md
    - examples/nextjs-keystone/next.config.js
    - examples/script/README.md
    - packages/core/src/admin-ui/TODO.md
    
    Fixes:
    - Should read `explicitly` rather than `explicity`.
    - Should read `escape` rather than `esacape`.
    - Should read `dynamically` rather than `dyamically`.
    - Should read `alignment` rather than `allignment`.
    - Should read `adhere` rather than `ahdere`.
    
    Signed-off-by: Tim Gates <tim.gates@iress.com>
    timgates42 authored Mar 5, 2023
    Copy the full SHA
    83eb8e9 View commit details

Commits on Mar 6, 2023

  1. Update Vercel action name (#8363)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Mar 6, 2023
    Copy the full SHA
    cbe15c4 View commit details
  2. Resolves type error in generated types when using `db.prismaClientPat…

    …h` on windows (#8373)
    
    Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
    Josh Calder and dcousens authored Mar 6, 2023
    Copy the full SHA
    c6c9078 View commit details

Commits on Mar 7, 2023

  1. Reduce Nexus example to define extension inline (#8375)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Mar 7, 2023
    Copy the full SHA
    b91c11e View commit details

Commits on Mar 8, 2023

  1. fix(deps): update dependency @vercel/og to ^0.4.0 (#8378)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 8, 2023
    Copy the full SHA
    0e6b3e4 View commit details
  2. chore(deps): update dependency next-sitemap to v4 (#8379)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 8, 2023
    Copy the full SHA
    df91337 View commit details
  3. Add support for Prisma Data Proxy engines (#8370)

    Josh Calder authored Mar 8, 2023
    Copy the full SHA
    730ee79 View commit details
  4. Copy the full SHA
    4fc5e43 View commit details

Commits on Mar 10, 2023

  1. Copy the full SHA
    81dccce View commit details

Commits on Mar 15, 2023

  1. Add new types.path property (#8381)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    3 people authored Mar 15, 2023
    Copy the full SHA
    6b338c4 View commit details

Commits on Mar 16, 2023

  1. Copy the full SHA
    f118e70 View commit details
  2. Copy the full SHA
    cbd9a79 View commit details

Commits on Mar 17, 2023

  1. Copy the full SHA
    2ec8700 View commit details

Commits on Mar 20, 2023

  1. add corepack enable (#8399)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Mar 20, 2023
    Copy the full SHA
    d538b94 View commit details

Commits on Mar 22, 2023

  1. fix(deps): update dependency typescript to v5 (#8400)

    ---------
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    3 people authored Mar 22, 2023
    Copy the full SHA
    7cfe118 View commit details

Commits on Mar 23, 2023

  1. Copy the full SHA
    1af39b9 View commit details
  2. Use pnpm (#8398)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    Co-authored-by: Josh Calder <josh.calder@thinkmill.com.au>
    3 people authored Mar 23, 2023
    Copy the full SHA
    1501892 View commit details

Commits on Mar 25, 2023

  1. Fix typo in resolveData hook documentation (#8411)

    Ash Woods authored Mar 25, 2023
    Copy the full SHA
    8c30717 View commit details

Commits on Mar 27, 2023

  1. chore(deps): lock file maintenance (#8229)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    renovate[bot] and dcousens authored Mar 27, 2023
    Copy the full SHA
    73a5a62 View commit details
  2. chore(deps): update dependency @svgr/plugin-prettier to v7 (#8427)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    c577fa1 View commit details
  3. chore(deps): update dependency @types/mime to v3 (#8429)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    3524aa2 View commit details
  4. chore(deps): update dependency @svgr/plugin-svgo to v7 (#8428)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    e53035f View commit details
  5. fix(deps): update dependency @types/babel__core to v7.20.0 (#8424)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    bcf1d27 View commit details
  6. chore(deps): update pnpm to v7.30.5 (#8421)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    4c020ed View commit details
  7. chore(deps): update dependency @svgr/plugin-jsx to v7 (#8426)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 27, 2023
    Copy the full SHA
    52ec9ed View commit details

Commits on Mar 28, 2023

  1. chore(deps): update dependency @preconstruct/cli to v2.4.1 (#8423)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 28, 2023
    Copy the full SHA
    d84e943 View commit details
  2. chore(deps): update dependency @svgr/core to v7 (#8425)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Mar 28, 2023
    Copy the full SHA
    fbb5664 View commit details
  3. use pnpm for GitHub actions (#8431)

    Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com>
    dcousens and dcousens authored Mar 28, 2023
    Copy the full SHA
    460824c View commit details
Showing 696 changed files with 36,037 additions and 180,383 deletions.
15 changes: 15 additions & 0 deletions .changeset/contributors.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
[
"Achisingh",
"AlanBreck",
"AliceRossa",
"CarlQLange",
"ChrisLaneAU",
"DiesIrae",
"DustinWoods",
"Greenheart",
"JedWatson",
"MadeByMike",
"Meetcpatel",
"MohammadKurjieh",
"MurzNN",
"Noviny",
"SeanDoyleGit",
@@ -15,19 +20,22 @@
"Vultraz",
"acburdine",
"adamjkb",
"adrianbienias",
"allcontributors[bot]",
"austin047",
"bartduisters",
"bketelsen",
"bladey",
"borisno2",
"ciruz",
"dcousens",
"dependabot",
"dependabot[bot]",
"dominikwilkowski",
"emmatown",
"fkrauthan",
"flexdinesh",
"ganobrega",
"gautamsi",
"georgekrax",
"github-actions[bot]",
@@ -40,25 +48,32 @@
"jossmac",
"kennedybaird",
"keystonejs-release-bot",
"kporten",
"lukebennett88",
"marekryb",
"mikehazell",
"mitchellhamilton",
"mkarkachov",
"mmachatschek",
"molomby",
"moselhy",
"nathsimpson",
"nderkim",
"nya1",
"olejech",
"pahaz",
"pnxdxt",
"raveling",
"renovate",
"renovate[bot]",
"sarneaud",
"serranoarevalo",
"shusiner",
"simonswiss",
"singhArmani",
"stall84",
"ticidesign",
"timgates42",
"timleslie",
"u-ishii",
"willemmulder"
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packages": ["packages/*", "design-system/packages/*"],
"sandboxes": ["/tests/sandbox"],
"node": "16"
"node": "18"
}
9 changes: 2 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -9,17 +9,12 @@

"settings": {},

"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"gamunu.vscode-yarn",
"prisma.prisma"
],
"extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "prisma.prisma"],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

"postCreateCommand": "yarn install",
"postCreateCommand": "pnpm install",

"remoteUser": "node"
}
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ coverage
dist
reports
docs/public/assets/
nexus-typegen.ts
examples/extend-graphql-schema-nexus/nexus-types.ts
examples/framework-remix/build/index.js
tests/test-projects/live-reloading/schemas/syntax-error.js
__generated__

27 changes: 10 additions & 17 deletions .github/actions/ci-setup/action.yml
Original file line number Diff line number Diff line change
@@ -2,28 +2,21 @@ name: 'CI setup'
runs:
using: 'composite'
steps:
- name: Setup Node.js LTS
uses: actions/setup-node@v3
- run: corepack enable
shell: bash

- uses: actions/setup-node@main
with:
# preferably lts/*, but we hit API limits when querying that
node-version: 18
registry-url: 'https://registry.npmjs.org'
cache: pnpm

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
# limited to 1 child process, preventing Prisma postinstall races
- run: pnpm install --child-concurrency 1
shell: bash
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1'

- uses: actions/cache@main
id: yarn-cache
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install Dependencies
run: yarn --frozen-lockfile
- run: pnpm run build
shell: bash
File renamed without changes
5 changes: 2 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -11,20 +11,19 @@ jobs:
steps:
- uses: actions/checkout@main
with:
fetch-depth: 0
persist-credentials: true # needed for git push

- uses: ./.github/actions/ci-setup

- run: yarn build
- run: pnpm build

- name: git config
run: |
git config --global user.name 'Keystonejs Release Bot'
git config --global user.email 'automation+keystonejs@thinkmill.com.au'
- name: npm publish, git tag
run: yarn changeset publish --tag latest
run: pnpm changeset publish --tag latest
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

7 changes: 3 additions & 4 deletions .github/workflows/publish_snapshot.yml
Original file line number Diff line number Diff line change
@@ -15,13 +15,12 @@ jobs:
steps:
- uses: actions/checkout@main
with:
fetch-depth: 0
persist-credentials: true # needed for git push

- uses: ./.github/actions/ci-setup

- name: version packages
run: yarn changeset version --snapshot ${{ inputs.tag }}
run: pnpm changeset version --snapshot ${{ inputs.tag }}
env:
GITHUB_TOKEN: ${{ secrets.KEYSTONE_RELEASE_BOT_GITHUB_TOKEN }}

@@ -31,10 +30,10 @@ jobs:
git config --global user.email 'automation+keystonejs@thinkmill.com.au'
git commit -a -m 'rc'
- run: yarn build
- run: pnpm build

- name: npm publish, git tag
run: yarn changeset publish --tag ${{ inputs.tag }}
run: pnpm changeset publish --tag ${{ inputs.tag }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

130 changes: 0 additions & 130 deletions .github/workflows/skip_core_tests.yml

This file was deleted.

Loading