Use app router template

.changeset/config.json

@@ -5,6 +5,9 @@
   "baseBranch": "main",
   "linked": [],
   "access": "public",
+  "privatePackages": {
+    "version": false
+  },
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
   }

.changeset/contributors.json

@@ -4,6 +4,7 @@
   "AliceRossa",
   "CarlQLange",
   "ChrisLaneAU",
+  "DavidMulder0",
   "DiesIrae",
   "DustinWoods",
   "Greenheart",
@@ -38,6 +39,7 @@
   "dcousens",
   "dependabot",
   "dependabot[bot]",
+  "direisc",
   "dominikwilkowski",
   "duidae",
   "emmatown",

.changeset/short-rocks-design.md

@@ -0,0 +1,5 @@
+---
+"@keystone-6/core": patch
+---
+
+Fixes `decimal` field bug (#8597) by parsing to `Decimal` before lessThan / greaterThan checks

.github/workflows/tests_ci.yml

@@ -31,6 +31,16 @@ jobs:
       - name: Prisma Filters
         run: pnpm test:filters
 
+  linting-examples:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - uses: ./.github/actions/ci-setup-examples
+
+      - name: TypeScript
+        run: pnpm test:types
+
   unit_tests:
     name: Package Unit Tests
     runs-on: ubuntu-latest
@@ -87,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mariadb:11.4
+        image: mariadb:11.5
         env:
           MYSQL_ROOT_PASSWORD: testpass
         ports:
@@ -163,7 +173,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mariadb:11.4
+        image: mariadb:11.5
         env:
           MYSQL_ROOT_PASSWORD: testpass
         ports:

.gitignore

@@ -3,6 +3,7 @@
 dist/
 node_modules/
 *.db
+.env
 
 # ts-gql
 __generated__

.npmrc

@@ -0,0 +1,2 @@
+link-workspace-packages=true
+prefer-workspace-packages=true

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Thinkmill Labs Pty Ltd
+Copyright (c) 2024 Thinkmill Labs Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -87,4 +87,4 @@ For vulnerability reporting, please refer to our [security policy](/SECURITY.md)
 
 <a href="https://thinkmill.com.au" target="_blank"><img height="48" alt="Thinkmill" src="https://thinkmill.github.io/badge/brandmark.svg"></a>
 
-Copyright (c) 2023 [Thinkmill Labs](https://www.thinkmill.com.au/labs?utm_campaign=keystone-github) Pty Ltd. Licensed under the MIT License.
+Copyright (c) 2024 [Thinkmill Labs](https://www.thinkmill.com.au/labs?utm_campaign=keystone-github) Pty Ltd. Licensed under the MIT License.

design-system/packages/button/package.json

@@ -12,14 +12,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:"
+    "@types/react": "^18.3.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
     "@keystone-ui/loading": "workspace:^",
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/button"
 }

design-system/packages/core/package.json

@@ -12,13 +12,13 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "@types/react": "^18.3.3",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "peerDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

design-system/packages/fields/package.json

@@ -12,17 +12,17 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:"
+    "@types/react": "^18.3.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
     "@keystone-ui/popover": "workspace:^",
     "date-fns": "^3.0.0",
-    "react": "catalog:",
+    "react": "^18.3.1",
     "react-day-picker": "^8.0.4",
-    "react-dom": "catalog:",
+    "react-dom": "^18.3.1",
     "react-focus-lock": "^2.7.1",
     "react-select": "^5.2.1"
   },

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": "catalog:",
+    "@types/react": "^18.3.3",
     "feather-icons": "^4.28.0",
     "globby": "^14.0.0",
-    "react": "catalog:",
+    "react": "^18.3.1",
     "to-pascal-case": "^1.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^"
   },
   "peerDependencies": {
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "preconstruct": {
     "entrypoints": [

design-system/packages/loading/package.json

@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:"
+    "@types/react": "^18.3.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/loading"
 }

design-system/packages/modals/package.json

@@ -12,15 +12,15 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:",
-    "@types/react-transition-group": "4.4.10"
+    "@types/react": "^18.3.3",
+    "@types/react-transition-group": "4.4.11"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/button": "workspace:^",
     "@keystone-ui/core": "workspace:^",
-    "react": "catalog:",
-    "react-dom": "catalog:",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-focus-lock": "^2.7.1",
     "react-remove-scroll": "^2.4.3",
     "react-transition-group": "^4.4.2"

design-system/packages/notice/package.json

@@ -12,14 +12,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:"
+    "@types/react": "^18.3.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/button": "workspace:^",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^",
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/notice"
 }

design-system/packages/options/package.json

@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

design-system/packages/pill/package.json

@@ -12,10 +12,10 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "devDependencies": {
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

design-system/packages/popover/package.json

@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

design-system/packages/segmented-control/package.json

@@ -12,15 +12,15 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:",
-    "react": "catalog:"
+    "@types/react": "^18.3.3",
+    "react": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^"
   },
   "peerDependencies": {
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/segmented-control"
 }

design-system/packages/toast/package.json

@@ -12,16 +12,16 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@types/react": "catalog:",
-    "react": "catalog:"
+    "@types/react": "^18.3.3",
+    "react": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@keystone-ui/core": "workspace:^",
     "@keystone-ui/icons": "workspace:^"
   },
   "peerDependencies": {
-    "react": "catalog:"
+    "react": "^18.3.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/toast"
 }

design-system/packages/tooltip/package.json

@@ -12,12 +12,12 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.7",

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={{