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.

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

[temp for test suites] v-next merge test #9233

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/blue-balloons-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@keystone-6/core": major
---

Renamed `__ResolvedKeystoneConfig` to `ResolvedKeystoneConfig`.
Changed `config` function to return config with defaults instead of just type casting. This now returns `ResolvedKeystoneConfig` instead of `KeystoneConfig`
6 changes: 6 additions & 0 deletions .changeset/chilled-moons-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@keystone-6/core": major
---

Removed deprecated list and field hooks.
Fixed field hooks of all the in built types
5 changes: 5 additions & 0 deletions .changeset/rotten-vans-vanish.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@keystone-6/core": major
---

Removed deprecated `fix` option from `postinstall` script
5 changes: 5 additions & 0 deletions .changeset/shaggy-beds-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@keystone-6/auth": major
---

Changed type of `withAuth` input to `ResolvedKeystoneConfig` instead of `KeystoneConfig`
6 changes: 3 additions & 3 deletions design-system/website/components/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { Fragment, type ReactNode } from 'react'
import { jsx, useTheme } from '@keystone-ui/core'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { usePathname } from 'next/navigation'

const Brand = () => {
const { palette } = useTheme()
Expand Down Expand Up @@ -37,8 +37,8 @@ const Section = ({ label, children }: SectionProps) => {
type NavItemProps = { href: string, children: ReactNode }
const NavItem = ({ href, children }: NavItemProps) => {
const { palette, radii, spacing } = useTheme()
const router = useRouter()
const isSelected = router.pathname === href
const pathname = usePathname()
const isSelected = pathname === href
return (
<li
css={{
Expand Down
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = tseslint.config(
{
ignores: [
'**/.keystone/',
'**/.next/',
'**/dist/',
'**/node_modules/',
'**/syntax-error.js',
Expand Down
21 changes: 21 additions & 0 deletions examples/auth/app/(admin)/.admin/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* eslint-disable */
import * as view0 from "@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view"
import * as view1 from "@keystone-6/core/fields/types/text/views"
import * as view2 from "@keystone-6/core/fields/types/password/views"
import * as view3 from "@keystone-6/core/fields/types/checkbox/views"
import * as view4 from "@keystone-6/core/fields/types/timestamp/views"
import * as view5 from "@keystone-6/core/fields/types/relationship/views"
import * as view6 from "@keystone-6/core/fields/types/integer/views"
import * as view7 from "@keystone-6/core/fields/types/select/views"
import * as view8 from "@keystone-6/core/fields/types/json/views"

const adminConfig = {}

export const config = {
lazyMetadataQuery: {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"keystone","loc":{"start":22,"end":30}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminMeta","loc":{"start":39,"end":48}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"lists","loc":{"start":59,"end":64}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key","loc":{"start":77,"end":80}},"arguments":[],"directives":[],"loc":{"start":77,"end":80}},{"kind":"Field","name":{"kind":"Name","value":"isHidden","loc":{"start":91,"end":99}},"arguments":[],"directives":[],"loc":{"start":91,"end":99}},{"kind":"Field","name":{"kind":"Name","value":"fields","loc":{"start":110,"end":116}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path","loc":{"start":131,"end":135}},"arguments":[],"directives":[],"loc":{"start":131,"end":135}},{"kind":"Field","name":{"kind":"Name","value":"createView","loc":{"start":148,"end":158}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fieldMode","loc":{"start":175,"end":184}},"arguments":[],"directives":[],"loc":{"start":175,"end":184}}],"loc":{"start":159,"end":198}},"loc":{"start":148,"end":198}}],"loc":{"start":117,"end":210}},"loc":{"start":110,"end":210}}],"loc":{"start":65,"end":220}},"loc":{"start":59,"end":220}}],"loc":{"start":49,"end":228}},"loc":{"start":39,"end":228}}],"loc":{"start":31,"end":234}},"loc":{"start":22,"end":234}},{"kind":"Field","name":{"kind":"Name","value":"authenticatedItem"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]},
fieldViews: [view0,view1,view2,view3,view4,view5,view6,view7,view8],
adminMetaHash: '1c8ah28',
adminConfig,
apiPath: '/api/graphql',
adminPath: '',
};
4 changes: 4 additions & 0 deletions examples/auth/app/(admin)/[listKey]/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
'use client'
import { ItemPage } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage'

export default ItemPage
4 changes: 4 additions & 0 deletions examples/auth/app/(admin)/[listKey]/create/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
'use client'
import { CreateItemPage } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/CreateItemPage'

export default CreateItemPage
4 changes: 4 additions & 0 deletions examples/auth/app/(admin)/[listKey]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
'use client'
import { ListPage } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage'

export default ListPage
7 changes: 7 additions & 0 deletions examples/auth/app/(admin)/init/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use client'
/* eslint-disable */
import { getInitPage } from '@keystone-6/auth/pages/InitPage'

const fieldPaths = ["name","password"]

export default getInitPage({"listKey":"User","fieldPaths":["name","password"],"enableWelcome":true})
16 changes: 16 additions & 0 deletions examples/auth/app/(admin)/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use client'
import { Layout } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/App'
import { config } from './.admin'


export default function AdminLayout ({
children,
}: {
children: React.ReactNode
}) {
return (
<Layout config={config as any}>
{children}
</Layout>
)
}
4 changes: 4 additions & 0 deletions examples/auth/app/(admin)/no-access/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
'use client'
import { getNoAccessPage } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/NoAccessPage'

export default getNoAccessPage({ sessionsEnabled: true })
2 changes: 2 additions & 0 deletions examples/auth/app/(admin)/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
'use client'
export { HomePage as default } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage'
5 changes: 5 additions & 0 deletions examples/auth/app/(admin)/signin/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use client'
/* eslint-disable */
import { getSigninPage } from '@keystone-6/auth/pages/SigninPage'

export default getSigninPage({"identityField":"name","secretField":"password","mutationName":"authenticateUserWithPassword","successTypename":"UserAuthenticationWithPasswordSuccess","failureTypename":"UserAuthenticationWithPasswordFailure"})
11 changes: 11 additions & 0 deletions examples/auth/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export default function RootLayout ({
children,
}: {
children: React.ReactNode
}) {
return (
<html lang="en">
<body>{children}</body>
</html>
)
}
2 changes: 1 addition & 1 deletion examples/auth/keystone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ export default withAuth<TypeInfo<Session>>(
// the session secret is used to encrypt cookie data
secret: sessionSecret,
}),
})
}) as any
)
5 changes: 5 additions & 0 deletions examples/auth/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
10 changes: 10 additions & 0 deletions examples/auth/next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// you don't need this if you're building something outside of the Keystone repo

export default {
eslint: {
ignoreDuringBuilds: true,
},
typescript: {
ignoreBuildErrors: true,
},
}
3 changes: 2 additions & 1 deletion examples/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"dependencies": {
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.2.0",
"@prisma/client": "5.17.0"
"@prisma/client": "5.17.0",
"next": "^14.2.0"
},
"devDependencies": {
"prisma": "5.17.0",
Expand Down
Loading
Loading