Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with upstream #8

Merged
merged 11 commits into from
Apr 30, 2024
Merged

sync with upstream #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b26c8ad
fix(deps): update dependency slate to ^0.103.0 (#9109)
renovate[bot] Apr 22, 2024
54b9ef9
chore(deps): update pnpm to v9.0.5 (#9108)
renovate[bot] Apr 22, 2024
2613769
Update image reference on Enterprise page (#9111)
raveling Apr 23, 2024
a9d1d22
feat(core/db): allow to extend PrismaClient (#9114)
iamandrewluca Apr 25, 2024
6727a9e
chore(deps): lock file maintenance (#9116)
renovate[bot] Apr 29, 2024
002409c
fix(deps): update prisma monorepo to v5.13.0 (#9112)
renovate[bot] Apr 29, 2024
98b1bff
Add missing `--shadow-database-url` for `keystone migrate` (#9117)
dcousens Apr 29, 2024
175dfd4
chore(deps): update pnpm to v9.0.6 (#9118)
renovate[bot] Apr 29, 2024
64f7220
fix(deps): update dependency date-fns to v3 (#8970)
renovate[bot] Apr 29, 2024
e0aecbb
Add `context.transaction` for interactive Prisma transactions when u…
dcousens Apr 30, 2024
bd33f07
Version Packages (#9123)
dcousens Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/add-keystone-migrate.md
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/contributors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
"gathanase",
"gautamsi",
"georgekrax",
"ggpwnkthx",
"github-actions[bot]",
"gwyneplaine",
"hmmhmmhm",
"iamandrewluca",
"januzis",
"jesstelford",
"jhohlfeld",
Expand Down
5 changes: 0 additions & 5 deletions .changeset/fix-prisma-logging.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fix-usage-text.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .codesandbox/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packages": ["packages/*", "design-system/packages/*"],
"sandboxes": ["/tests/sandbox"],
"node": "18"
"node": "20"
}
2 changes: 1 addition & 1 deletion design-system/packages/fields/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@keystone-ui/core": "workspace:^",
"@keystone-ui/icons": "workspace:^",
"@keystone-ui/popover": "workspace:^",
"date-fns": "^2.26.0",
"date-fns": "^3.0.0",
"react": "^18.2.0",
"react-day-picker": "^8.0.4",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/markdoc/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs/promises'
import isMatch from 'date-fns/isMatch'
import { isMatch } from 'date-fns'
import Markdoc, { type Config, type Tag, type ValidateError } from '@markdoc/markdoc'
import { isNonEmptyArray } from 'emery/guards'
import { assert } from 'emery/assertions'
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@vercel/og": "^0.6.0",
"classnames": "^2.3.1",
"clipboard-copy": "^4.0.1",
"date-fns": "^2.26.0",
"date-fns": "^3.0.0",
"dedent": "^1.0.0",
"emery": "^1.4.1",
"facepaint": "^1.2.1",
Expand Down
3 changes: 1 addition & 2 deletions docs/pages/blog/[post].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
} from 'next'
import Link from 'next/link'
import { useRouter } from 'next/router'
import parse from 'date-fns/parse'
import format from 'date-fns/format'
import { parse, format } from 'date-fns'
import { globby } from 'globby'
import { type BlogContent, readBlogContent } from '../../markdoc'
import { extractHeadings, Markdoc } from '../../components/Markdoc'
Expand Down
3 changes: 1 addition & 2 deletions docs/pages/blog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import fs from 'fs/promises'
import { globby } from 'globby'
import { type InferGetStaticPropsType, type GetStaticPropsResult } from 'next'
import Link from 'next/link'
import parse from 'date-fns/parse'
import format from 'date-fns/format'
import { parse, format } from 'date-fns'
import { jsx } from '@emotion/react'

import { MWrapper } from '../../components/content/MWrapper'
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/enterprise.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export default function ForOrganisations () {

<Quote
name="Kevin Stafford"
img="https://thinkmill.com.au/_astro/kevin-stafford[email protected]"
img="/assets/kevin-stafford.jpg"
title="CTO, Rugby Australia"
grad="grad6"
css={{
Expand Down
2 changes: 1 addition & 1 deletion examples/assets-local/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/assets-s3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"dotenv": "^16.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/cloudinary/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/cloudinary": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/cloudinary": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"dotenv": "^16.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-admin-ui-logo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-ui/core": "^5.0.1",
"@keystone-6/core": "workspace:^",
"@keystone-ui/core": "workspace:^",
"@prisma/client": "^5.0.0",
"next": "^13.3.0",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-admin-ui-navigation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"react": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-admin-ui-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-ui/core": "^5.0.1",
"@keystone-6/core": "workspace:^",
"@keystone-ui/core": "workspace:^",
"@prisma/client": "^5.0.0",
"next": "^13.3.0",
"react": "^18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions examples/custom-field-view/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
},
"dependencies": {
"@emotion/css": "^11.7.1",
"@keystone-6/core": "^6.0.0",
"@keystone-ui/button": "^7.0.1",
"@keystone-ui/core": "^5.0.1",
"@keystone-ui/fields": "^7.1.1",
"@keystone-ui/icons": "^6.0.1",
"@keystone-6/core": "workspace:^",
"@keystone-ui/button": "workspace:^",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/fields": "workspace:^",
"@keystone-ui/icons": "workspace:^",
"@prisma/client": "^5.0.0",
"next": "^13.3.0",
"react": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-field/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-ui/fields": "^7.1.1",
"@keystone-6/core": "workspace:^",
"@keystone-ui/fields": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-id/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"seed-data": "tsx seed-data.tsx"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@paralleldrive/cuid2": "^2.2.1",
"@prisma/client": "^5.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-output-paths/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"next": "^13.3.0",
"react": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-invalidation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-jwt/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"jsonwebtoken": "^9.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-session-next-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"next-auth": "^4.22.1"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"@redis/client": "^1.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/default-values/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/document-field-customisation/keystone-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/fields-document": "^9.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@keystone-6/fields-document": "workspace:^",
"@keystone-ui/button": "^7.0.1",
"@keystone-ui/core": "^5.0.1",
"@keystone-ui/fields": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/document-field-customisation/nextjs-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "next start --port 8000"
},
"dependencies": {
"@keystone-6/document-renderer": "^1.1.0",
"@keystone-6/document-renderer": "workspace:^",
"@preconstruct/next": "^4.0.0",
"graphql": "^16.8.1",
"next": "^13.3.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/document-field/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/document-renderer": "^1.1.0",
"@keystone-6/fields-document": "^9.0.0",
"@keystone-6/core": "workspace:^",
"@keystone-6/document-renderer": "workspace:^",
"@keystone-6/fields-document": "workspace:^",
"@preconstruct/next": "^4.0.0",
"@prisma/client": "^5.0.0",
"next": "^13.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/extend-express-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"@types/express": "^4.17.14",
"express": "^4.17.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/extend-graphql-schema-graphql-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@graphql-tools/schema": "^9.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"graphql": "^16.8.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/extend-graphql-schema-graphql-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/extend-graphql-schema-nexus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@graphql-tools/schema": "^9.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"graphql": "^16.8.1",
"nexus": "^1.3.0"
Expand Down
8 changes: 4 additions & 4 deletions examples/extend-graphql-subscriptions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"@apollo/client": "^3.7.0",
"@emotion/css": "^11.7.1",
"@graphql-tools/schema": "^9.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-ui/button": "^7.0.1",
"@keystone-ui/core": "^5.0.1",
"@keystone-ui/fields": "^7.1.1",
"@keystone-6/core": "workspace:^",
"@keystone-ui/button": "workspace:^",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/fields": "workspace:^",
"@prisma/client": "^5.0.0",
"graphql": "^16.8.1",
"graphql-subscriptions": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/extend-prisma-schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/fields-document": "^9.0.0",
"@keystone-6/core": "workspace:^",
"@keystone-6/fields-document": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/field-groups/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"start": "astro dev"
},
"dependencies": {
"@keystone-6/core": "^6.0.0",
"@keystone-6/core": "workspace:^",
"@prisma/client": "^5.0.0",
"astro": "^2.2.1"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/framework-nextjs-app-directory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"start": "next start"
},
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.0.0",
"@keystone-6/document-renderer": "^1.1.0",
"@keystone-6/fields-document": "^9.0.0",
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@keystone-6/document-renderer": "workspace:^",
"@keystone-6/fields-document": "workspace:^",
"@preconstruct/next": "^4.0.0",
"@prisma/client": "^5.0.0",
"graphql": "^16.8.1",
Expand Down
Loading