Inline prismaClientPath for examples/ (#9300)

keystonejs · Aug 20, 2024 · 7dda360 · 7dda360
1 parent 19a734c
commit 7dda360
Show file tree

Hide file tree

Showing 108 changed files with 125 additions and 184 deletions.
diff --git a/examples/assets-local/keystone.ts b/examples/assets-local/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -8,7 +7,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
   storage: {

diff --git a/examples/assets-local/schema.prisma b/examples/assets-local/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/assets-s3/keystone.ts b/examples/assets-s3/keystone.ts
@@ -1,6 +1,5 @@
 import 'dotenv/config'
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 const {
@@ -16,7 +15,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
   storage: {

diff --git a/examples/assets-s3/schema.prisma b/examples/assets-s3/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/auth/keystone.ts b/examples/auth/keystone.ts
@@ -1,7 +1,6 @@
 import { config } from '@keystone-6/core'
 import { statelessSessions } from '@keystone-6/core/session'
 import { createAuth } from '@keystone-6/auth'
-import { fixPrismaPath } from '../example-utils'
 import { type Session, lists } from './schema'
 import { type TypeInfo } from '.keystone/types'
 
@@ -55,7 +54,7 @@ export default withAuth<TypeInfo<Session>>(
       url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
       // WARNING: this is only needed for our monorepo examples, dont do this
-      ...fixPrismaPath,
+      prismaClientPath: 'node_modules/myprisma',
     },
     lists,
     ui: {

diff --git a/examples/auth/schema.prisma b/examples/auth/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model User {

diff --git a/examples/cloudinary/keystone.ts b/examples/cloudinary/keystone.ts
@@ -1,6 +1,5 @@
 import 'dotenv/config'
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -9,7 +8,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/cloudinary/schema.prisma b/examples/cloudinary/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/custom-admin-ui-logo/keystone.ts b/examples/custom-admin-ui-logo/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -8,7 +7,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-admin-ui-logo/schema.prisma b/examples/custom-admin-ui-logo/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Task {

diff --git a/examples/custom-admin-ui-navigation/keystone.ts b/examples/custom-admin-ui-navigation/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -8,7 +7,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-admin-ui-navigation/schema.prisma b/examples/custom-admin-ui-navigation/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Task {

diff --git a/examples/custom-admin-ui-pages/keystone.ts b/examples/custom-admin-ui-pages/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -8,7 +7,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-admin-ui-pages/schema.prisma b/examples/custom-admin-ui-pages/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Task {

diff --git a/examples/custom-esbuild/keystone.ts b/examples/custom-esbuild/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 import type { TypeInfo } from '.keystone/types'
 
@@ -9,7 +8,7 @@ export default config<TypeInfo>({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, don't do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-esbuild/schema.prisma b/examples/custom-esbuild/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/custom-field-view/keystone.ts b/examples/custom-field-view/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 export default config({
@@ -8,7 +7,7 @@ export default config({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-field-view/schema.prisma b/examples/custom-field-view/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Task {

diff --git a/examples/custom-field/keystone.ts b/examples/custom-field/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 import type { TypeInfo } from '.keystone/types'
 
@@ -9,7 +8,7 @@ export default config<TypeInfo>({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-field/schema.prisma b/examples/custom-field/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/custom-id/keystone.ts b/examples/custom-id/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 import type { TypeInfo } from '.keystone/types'
 
@@ -12,7 +11,7 @@ export default config<TypeInfo>({
     idField: { kind: 'random', bytes: 16, encoding: 'hex' },
 
     // WARNING: this is only needed for our monorepo examples, don't do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
 })
diff --git a/examples/custom-id/schema.prisma b/examples/custom-id/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model Task {

diff --git a/examples/custom-session-invalidation/keystone.ts b/examples/custom-session-invalidation/keystone.ts
@@ -1,7 +1,6 @@
 import { config } from '@keystone-6/core'
 import { statelessSessions } from '@keystone-6/core/session'
 import { createAuth } from '@keystone-6/auth'
-import { fixPrismaPath } from '../example-utils'
 import { lists, type Session } from './schema'
 import type { Config, Context, TypeInfo } from '.keystone/types'
 
@@ -74,7 +73,7 @@ export default withSessionInvalidation(
         url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
         // WARNING: this is only needed for our monorepo examples, dont do this
-        ...fixPrismaPath,
+        prismaClientPath: 'node_modules/myprisma',
       },
       lists,
       // you can find out more at https://keystonejs.com/docs/apis/session#session-api

diff --git a/examples/custom-session-invalidation/schema.prisma b/examples/custom-session-invalidation/schema.prisma
@@ -9,7 +9,7 @@ datasource sqlite {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.myprisma/client"
+  output   = "node_modules/myprisma"
 }
 
 model User {

diff --git a/examples/custom-session-jwt/keystone.ts b/examples/custom-session-jwt/keystone.ts
@@ -1,6 +1,5 @@
 import jwt from 'jsonwebtoken'
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists, type Session } from './schema'
 import type { Context, TypeInfo } from '.keystone/types'
 
@@ -83,7 +82,7 @@ export default config<TypeInfo>({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
 
     onConnect: async () => {
       // WARNING: remove this

diff --git a/examples/custom-session-jwt/schema.prisma b/examples/custom-session-jwt/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/custom-session-next-auth/keystone.ts b/examples/custom-session-next-auth/keystone.ts
@@ -1,5 +1,4 @@
 import { config } from '@keystone-6/core'
-import { fixPrismaPath } from '../example-utils'
 import { lists } from './schema'
 
 import { type Session, nextAuthSessionStrategy } from './session'
@@ -15,7 +14,7 @@ export default config<TypeInfo<Session>>({
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   ui: {
     // the following api routes are required for nextauth.js

diff --git a/examples/custom-session-next-auth/schema.prisma b/examples/custom-session-next-auth/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/custom-session-next-auth/session.ts b/examples/custom-session-next-auth/session.ts
@@ -23,7 +23,7 @@ async function getKeystoneContext () {
     // We use the prisma client from the .myprisma folder in order to support multiple Prisma Clients in our examples
     // your project will only have one Prisma Client, so you can use the following instead:
     // await import('@prisma/client')
-    await import('.myprisma/client')
+    await import('myprisma')
   )
   if (process.env.NODE_ENV !== 'production') {
     (globalThis as any)._keystoneContext = _keystoneContext

diff --git a/examples/custom-session-passport/auth.ts b/examples/custom-session-passport/auth.ts
@@ -6,7 +6,7 @@ import { Passport } from 'passport'
 import { type VerifyCallback } from 'passport-oauth2'
 import { Strategy, StrategyOptions, Profile } from 'passport-github2'
 
-import { type Author } from '.myprisma/client'
+import { type Author } from 'myprisma'
 import { type TypeInfo } from '.keystone/types'
 
 export type Session = Author

diff --git a/examples/custom-session-passport/keystone.ts b/examples/custom-session-passport/keystone.ts
@@ -8,15 +8,14 @@ import {
   session,
   passportMiddleware
 } from './auth'
-import { fixPrismaPath } from '../example-utils'
 
 export default config<TypeInfo<Session>>({
   db: {
     provider: 'sqlite',
     url: 'file:./keystone.db',
 
     // WARNING: this is only needed for our monorepo examples, dont do this
-    ...fixPrismaPath,
+    prismaClientPath: 'node_modules/myprisma',
   },
   lists,
   session,

diff --git a/examples/custom-session-passport/schema.prisma b/examples/custom-session-passport/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 {