Merge branch 'keystonejs#9183#2-withn15' into temp-publish

gautamsi · Dec 15, 2024 · e63a8ae · e63a8ae
2 parents fce170b + aeafdc5
commit e63a8ae
Show file tree

Hide file tree

Showing 200 changed files with 3,199 additions and 2,464 deletions.
diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
@@ -12,14 +12,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3"
+    "@types/react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
     "@keystone-ui/loading": "workspace:^",
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/button"
 }
diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
@@ -12,17 +12,17 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
-    "@emotion/react": "^11.7.1",
+    "@emotion/react": "^11.14.0",
     "@types/facepaint": "^1.2.2",
     "facepaint": "^1.2.1"
   },

diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
@@ -12,19 +12,19 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3"
+    "@types/react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
     "@keystone-ui/popover": "workspace:^",
     "date-fns": "^4.0.0",
-    "react": "^18.3.1",
-    "react-day-picker": "^9.0.0",
-    "react-dom": "^18.3.1",
-    "react-focus-lock": "^2.7.1",
-    "react-select": "^5.2.1"
+    "react": "^19.0.0",
+    "react-day-picker": "^9.4.2",
+    "react-dom": "^19.0.0",
+    "react-focus-lock": "^2.13.2",
+    "react-select": "^5.9.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/fields"
 }
diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
@@ -1162,18 +1162,18 @@
     "@svgr/core": "^8.0.0",
     "@svgr/plugin-jsx": "^8.0.0",
     "@svgr/plugin-svgo": "^8.0.0",
-    "@types/react": "^18.3.3",
+    "@types/react": "^19.0.0",
     "feather-icons": "^4.28.0",
     "globby": "^14.0.0",
-    "react": "^18.3.1",
+    "react": "^19.0.0",
     "to-pascal-case": "^1.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "preconstruct": {
     "entrypoints": [

diff --git a/design-system/packages/loading/package.json b/design-system/packages/loading/package.json
@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3"
+    "@types/react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/loading"
 }
diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
@@ -12,16 +12,16 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
+    "@types/react": "^19.0.0",
     "@types/react-transition-group": "4.4.11"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/button": "workspace:^",
     "@keystone-ui/core": "workspace:^",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-focus-lock": "^2.7.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-focus-lock": "^2.13.2",
     "react-remove-scroll": "^2.4.3",
     "react-transition-group": "^4.4.2"
   },

diff --git a/design-system/packages/modals/src/DrawerController.tsx b/design-system/packages/modals/src/DrawerController.tsx
@@ -24,12 +24,15 @@ export const useDrawerControllerContext = () => {
 }
 
 export const DrawerController = ({ isOpen, children }: DrawerControllerProps) => {
+  const nodeRef = React.useRef(null)
   return (
-    <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150}>
+    <Transition appear mountOnEnter unmountOnExit in={isOpen} timeout={150} nodeRef={nodeRef}>
       {transitionState => (
-        <DrawerControllerContextProvider value={transitionState}>
-          {children}
-        </DrawerControllerContextProvider>
+        <div ref={nodeRef}>
+          <DrawerControllerContextProvider value={transitionState}>
+            {children}
+          </DrawerControllerContextProvider>
+        </div>
       )}
     </Transition>
   )

diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
@@ -12,14 +12,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3"
+    "@types/react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/button": "workspace:^",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/notice"
 }
diff --git a/design-system/packages/options/package.json b/design-system/packages/options/package.json
@@ -12,19 +12,19 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/fields": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
-    "react-select": "^5.2.1"
+    "react-select": "^5.9.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/options"
 }
diff --git a/design-system/packages/pill/package.json b/design-system/packages/pill/package.json
@@ -12,10 +12,10 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "devDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

diff --git a/design-system/packages/popover/package.json b/design-system/packages/popover/package.json
@@ -12,19 +12,19 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@popperjs/core": "^2.10.2",
     "focus-trap": "^7.0.0",
-    "react-popper": "^2.2.5"
+    "react-popper": "^2.3.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/popover"
 }
diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
@@ -12,15 +12,15 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
-    "react": "^18.3.1"
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/segmented-control"
 }
diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
@@ -12,16 +12,16 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "^18.3.3",
-    "react": "^18.3.1"
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/toast"
 }
diff --git a/design-system/packages/tooltip/package.json b/design-system/packages/tooltip/package.json
@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

diff --git a/design-system/website/components/Navigation.tsx b/design-system/website/components/Navigation.tsx
@@ -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()
@@ -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={{

diff --git a/design-system/website/package.json b/design-system/website/package.json
@@ -21,12 +21,12 @@
     "@keystone-ui/toast": "workspace:^",
     "@keystone-ui/tooltip": "workspace:^",
     "@preconstruct/next": "^4.0.0",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
     "@types/tinycolor2": "^1.4.3",
-    "next": "^14.2.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "next": "^15.1.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "tinycolor2": "^1.4.2"
   },
   "devDependencies": {

diff --git a/docs/app/(site)/blog/[post]/page.tsx b/docs/app/(site)/blog/[post]/page.tsx
@@ -19,7 +19,8 @@ export type BlogPost = NonNullable<
 >
 
 export default async function Page ({ params }) {
-  const post = await reader.collections.posts.read(params!.post, {
+  const _params = await params
+  const post = await reader.collections.posts.read(_params!.post, {
     resolveLinkedFiles: true,
   })
 
@@ -40,7 +41,8 @@ export default async function Page ({ params }) {
 
 // Dynamic SEO page metadata
 export async function generateMetadata ({ params }): Promise<Metadata> {
-  const post = await reader.collections.posts.read(params!.post)
+  const _params = await params
+  const post = await reader.collections.posts.read(_params!.post)
 
   const title = post?.title ? `${post.title} - Keystone 6 Blog` : 'Keystone 6 Blog'
 

diff --git a/docs/app/(site)/docs/[...rest]/page.tsx b/docs/app/(site)/docs/[...rest]/page.tsx
@@ -19,7 +19,8 @@ export type Document = NonNullable<
 >
 
 export default async function DocPage ({ params }) {
-  const doc = await reader.collections.docs.read(params!.rest.join('/'), {
+  const _params = await params
+  const doc = await reader.collections.docs.read(_params!.rest.join('/'), {
     resolveLinkedFiles: true,
   })
   if (!doc) return notFound()
@@ -35,15 +36,16 @@ export default async function DocPage ({ params }) {
   ]
 
   return (
-    <DocsLayout headings={headings} editPath={`docs/${(params?.rest as string[]).join('/')}.md`}>
+    <DocsLayout headings={headings} editPath={`docs/${(_params?.rest as string[]).join('/')}.md`}>
       <PageClient document={JSON.parse(JSON.stringify(transformedDoc))} />
     </DocsLayout>
   )
 }
 
 // Dynamic SEO page metadata
 export async function generateMetadata ({ params }) {
-  const doc = await reader.collections.docs.read(params!.rest.join('/'))
+  const _params = await params
+  const doc = await reader.collections.docs.read(_params!.rest.join('/'))
   return {
     title: doc?.title ? `${doc.title} - Keystone 6 Documentation` : 'Keystone 6 Documentation',
     description: doc?.description,

diff --git a/docs/components/Header.tsx b/docs/components/Header.tsx
@@ -117,7 +117,7 @@ function LinkItem ({
   )
 }
 
-function useClickOutside (ref: RefObject<HTMLElement>, cb: () => void) {
+function useClickOutside (ref: RefObject<HTMLElement | null>, cb: () => void) {
   useEffect(() => {
     /**
      * Alert if clicked on outside of element

diff --git a/docs/components/Markdoc.tsx b/docs/components/Markdoc.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import React, { type ElementType, type ReactNode } from 'react'
+import React, { type ElementType, type ReactNode, type JSX } from 'react'
 import type { RenderableTreeNodes, Scalar, RenderableTreeNode, Tag } from '@markdoc/markdoc'
 import { isTag } from '../markdoc/isTag'
 import { Code, InlineCode } from './primitives/Code'

diff --git a/docs/components/content/CustomerCard.tsx b/docs/components/content/CustomerCard.tsx
@@ -1,6 +1,6 @@
 /** @jsxImportSource @emotion/react */
 
-import type { HTMLAttributes } from 'react'
+import type { HTMLAttributes, JSX } from 'react'
 
 import { Type } from '../primitives/Type'
 import { type IconProps } from '../icons/util'