bump astro and remix, fix builds

dcousens · dcousens · commit 188b1b6b9285 · 2024-08-01T16:53:40.000+10:00
diff --git a/examples/framework-astro/.gitignore b/examples/framework-astro/.gitignore
@@ -0,0 +1,4 @@
+node_modules
+.astro/
+# Keep environment variables out of version control
+.env
diff --git a/examples/framework-astro/astro.config.mjs b/examples/framework-astro/astro.config.mjs
@@ -1,12 +1,22 @@
 import { defineConfig } from 'astro/config'
+import node from '@astrojs/node'
 
 // https://astro.build/config
 export default defineConfig({
   output: 'server',
+  adapter: node({
+    mode: 'standalone',
+  }),
+
   // WARNING: this is only needed for our monorepo examples, dont do this
   vite: {
     ssr: {
-      external: ['@keystone-6/core/context', '@keystone-6/core', '@keystone-6/core/fields'],
+      external: [
+        '@keystone-6/core',
+        '@keystone-6/core/context',
+        '@keystone-6/core/fields',
+        'myprisma'
+      ],
     },
   },
 })
diff --git a/examples/framework-astro/keystone.ts b/examples/framework-astro/keystone.ts
@@ -7,8 +7,9 @@
 
 import { config } from '@keystone-6/core'
 import { lists } from './src/keystone/schema'
+import type { TypeInfo } from '.keystone/types'
 
-export default config({
+export default config<TypeInfo>({
   db: {
     // we're using sqlite for the fastest startup experience
     //   for more information on what database might be appropriate for you
@@ -18,7 +19,7 @@ export default config({
 
     // WARNING: this is only needed for our monorepo examples, dont do this
     //   we use using myprisma, not .myprisma, because vite
-    prismaClientPath: 'node_modules/myprisma/client',
+    prismaClientPath: 'node_modules/myprisma',
   },
   server: {
     // We're using a custom port for this example so Astro and Keystone can run at the same time
diff --git a/examples/framework-astro/package.json b/examples/framework-astro/package.json
@@ -12,15 +12,16 @@
     "start": "astro dev"
   },
   "dependencies": {
+    "@astrojs/node": "^8.3.2",
     "@keystone-6/core": "workspace:^",
     "@prisma/client": "catalog:",
-    "astro": "^2.2.1"
+    "astro": "^4.12.3"
   },
   "devDependencies": {
     "@types/node": "catalog:",
-    "react": "catalog:",
     "@types/react-dom": "catalog:",
     "prisma": "catalog:",
+    "react": "catalog:",
     "typescript": "catalog:"
   }
 }
diff --git a/examples/framework-astro/schema.prisma b/examples/framework-astro/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Post {
diff --git a/examples/framework-astro/src/keystone/context.ts b/examples/framework-astro/src/keystone/context.ts
@@ -1,7 +1,5 @@
 import { getContext } from '@keystone-6/core/context'
-// Using myprisma/client as vite does not like .
-// This should be @prisma/client in a project outside of the Keystone monorepo
-import * as PrismaModule from 'myprisma/client'
+import * as PrismaModule from 'myprisma'
 import config from '../../keystone'
 import type { Context } from '.keystone/types'
 
diff --git a/examples/framework-astro/src/pages/index.astro b/examples/framework-astro/src/pages/index.astro
@@ -1,23 +1,23 @@
 ---
-import { keystoneContext } from '../keystone/context';
+import { keystoneContext } from '../keystone/context'
 
 // Using Broswer Name from the user-agent request header to illustrate how to use the keystone context
 // with a customised session from Astro.
 // This is a contrived example of how Keystone's Access Control can work within Astro.
-const userAgent = Astro.request.headers.get('user-agent');
+const userAgent = Astro.request.headers.get('user-agent')
 
 // Match the browser name using a regular expression
-const browserName = userAgent?.match(/(Chrome|Firefox)/)?.pop() ?? 'unknown';
-console.log('Browser name in Astro from userAgent header', browserName);
+const browserName = userAgent?.match(/(Chrome|Firefox)/)?.pop() ?? 'unknown'
+console.log('Browser name in Astro from userAgent header', browserName)
 
 // Create a new context with a customised session
 const context = keystoneContext.withSession({
   browser: browserName.toLowerCase(),
   user: 'astro',
-});
+})
 const posts = await context.query.Post.findMany({
   query: 'title id',
-});
+})
 ---
 
 <html lang="en">
diff --git a/examples/framework-remix/app/utils/keystone.server.ts b/examples/framework-remix/app/utils/keystone.server.ts
@@ -1,6 +1,6 @@
 import { getContext } from '@keystone-6/core/context'
 import config from '../../keystone'
-import * as PrismaModule from '.myprisma/client'
+import * as PrismaModule from 'myprisma'
 import type { Context } from '.keystone/types'
 
 // Making sure multiple prisma clients are not created during hot reloading
diff --git a/examples/framework-remix/keystone.ts b/examples/framework-remix/keystone.ts
@@ -1,16 +1,19 @@
 import { list, config } from '@keystone-6/core'
 import { allowAll } from '@keystone-6/core/access'
 import { text } from '@keystone-6/core/fields'
-import { fixPrismaPath } from '../example-utils'
-
 import type { TypeInfo } from '.keystone/types'
 
 export default config<TypeInfo>({
   db: {
+    // we're using sqlite for the fastest startup experience
+    //   for more information on what database might be appropriate for you
+    //   see https://keystonejs.com/docs/guides/choosing-a-database#title
     provider: 'sqlite',
     url: `file:${process.cwd()}/keystone.db`,
 
-    ...fixPrismaPath,
+    // WARNING: this is only needed for our monorepo examples, dont do this
+    //   we use using myprisma, not .myprisma, because vite
+    prismaClientPath: 'node_modules/myprisma',
   },
   server: {
     port: 4000,
diff --git a/examples/framework-remix/package.json b/examples/framework-remix/package.json
@@ -11,18 +11,18 @@
   "dependencies": {
     "@keystone-6/core": "workspace:^",
     "@prisma/client": "catalog:",
-    "@remix-run/node": "^1.15.0",
-    "@remix-run/react": "^1.15.0",
-    "@remix-run/serve": "^1.15.0",
-    "react": "catalog:",
-    "react-dom": "catalog:"
+    "@remix-run/node": "^1.18.0",
+    "@remix-run/react": "^1.18.0",
+    "@remix-run/serve": "^1.18.0",
+    "isbot": "^5.1.13",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.15.0",
+    "@remix-run/dev": "^1.18.0",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "prisma": "catalog:",
     "typescript": "catalog:"
-  },
-  "version": null
+  }
 }
diff --git a/examples/framework-remix/schema.prisma b/examples/framework-remix/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Post {
diff --git a/package.json b/package.json
@@ -33,8 +33,8 @@
     "@types/jest": "^29.0.0",
     "@types/node": "^20.0.0",
     "@types/node-fetch": "^2.5.12",
-    "@types/react": "^18.0.9",
-    "@types/react-dom": "^18.0.4",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "esbuild": "catalog:",
     "esbuild-jest": "^0.5.0",
     "eslint": "^9.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ datasource sqlite {`
`9`	`9`
`10`	`10`	`generator client {`
`11`	`11`	`provider = "prisma-client-js"`
`12`		`- output = "node_modules/myprisma/client"`
	`12`	`+ output = "node_modules/myprisma"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`model Post {`