Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 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 .github/get-ppg-dev/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { context, trace } from "@opentelemetry/api";
import { AsyncLocalStorageContextManager } from "@opentelemetry/context-async-hooks";
import { BasicTracerProvider } from "@opentelemetry/sdk-trace-base";
import { unstable_startServer } from '@prisma/dev'

context.setGlobalContextManager(new AsyncLocalStorageContextManager());
trace.setGlobalTracerProvider(new BasicTracerProvider());

async function main() {
const server = await unstable_startServer({
persistenceMode: 'stateless',
Expand Down
3 changes: 3 additions & 0 deletions .github/get-ppg-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"author": "",
"license": "ISC",
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^2.2.0",
"@opentelemetry/sdk-trace-base": "^2.2.0",
"@prisma/dev": "latest"
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# projects-specific .gitignore).

node_modules/
generated/prisma/
generated/
yarn-error.log/
vendor/
tmp/
Expand Down
18 changes: 9 additions & 9 deletions orm/fastify-graphql-sdl-first/package.json
Comment thread
AmanVarshney01 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
"name": "graphql",
"scripts": {
"start": "node dist/server",
"dev": "ts-node-dev --no-notify --respawn --transpile-only src/server"
"dev": "tsx src/server"
},
"prettier": {
"semi": false,
"singleQuote": true,
"trailingComma": "all"
},
"dependencies": {
"fastify": "5.6.1",
"@graphql-tools/schema": "10.0.25",
"@prisma/client": "6.9.0",
"@prisma/client": "^6.18.0",
"@prisma/extension-accelerate": "^2.0.2",
"dotenv": "^16.4.7",
"fastify": "5.6.1",
"graphql": "16.11.0",
"graphql-scalars": "1.24.2",
"mercurius": "16.2.0",
"@prisma/extension-accelerate": "2.0.2"
"mercurius": "16.2.0"
},
"devDependencies": {
"@types/node": "22.15.32",
"prisma": "6.9.0",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"prisma": "^6.18.0",
"tsx": "^4.20.6",
"typescript": "5.8.2"
},
"prisma": {
"seed": "ts-node prisma/seed.ts"
"seed": "tsx prisma/seed.ts"
}
}
4 changes: 3 additions & 1 deletion orm/fastify-graphql-sdl-first/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
generator client {
provider = "prisma-client-js"
provider = "prisma-client"
output = "./generated"
engineType = "client"
previewFeatures = ["relationJoins"]
}

Expand Down
2 changes: 1 addition & 1 deletion orm/fastify-graphql-sdl-first/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient, Prisma } from '@prisma/client'
import { PrismaClient, Prisma } from './generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
2 changes: 1 addition & 1 deletion orm/fastify-graphql-sdl-first/src/context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient } from '@prisma/client'
import { PrismaClient } from '../prisma/generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
3 changes: 2 additions & 1 deletion orm/fastify-graphql-sdl-first/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dotenv/config'
import fastify from 'fastify'
import mercurius, {
IFieldResolver,
Expand All @@ -7,7 +8,7 @@ import mercurius, {
import { schema } from './schema'
import { context } from './context'

declare module 'mercurius' {}
declare module 'mercurius' { }
const app = fastify()

app.register(mercurius, {
Expand Down
16 changes: 8 additions & 8 deletions orm/fastify-graphql/package.json
Comment thread
AmanVarshney01 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"license": "MIT",
"scripts": {
"start": "node dist/server",
"dev": "ts-node-dev --no-notify --respawn --transpile-only src/server"
"dev": "tsx src/server"
},
"dependencies": {
"@prisma/client": "^6.18.0",
"@prisma/extension-accelerate": "^2.0.2",
"dotenv": "^16.4.7",
"fastify": "5.6.1",
"@prisma/client": "6.9.0",
"graphql": "16.11.0",
"graphql-scalars": "1.24.2",
"mercurius": "16.2.0",
"nexus": "1.3.0",
"@prisma/extension-accelerate": "2.0.2"
"nexus": "1.3.0"
},
"devDependencies": {
"@types/node": "22.15.32",
"prisma": "6.9.0",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"prisma": "^6.18.0",
"tsx": "^4.20.6",
"typescript": "5.8.2"
},
"prisma": {
"seed": "ts-node prisma/seed.ts"
"seed": "tsx prisma/seed.ts"
}
}
6 changes: 4 additions & 2 deletions orm/fastify-graphql/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
generator client {
provider = "prisma-client-js"
provider = "prisma-client"
output = "./generated"
engineType = "client"
Comment thread
AmanVarshney01 marked this conversation as resolved.
}

datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
}

model User {
id Int @id @default(autoincrement())
email String @unique
Expand All @@ -24,4 +27,3 @@ model Post {
author User? @relation(fields: [authorId], references: [id])
authorId Int?
}

2 changes: 1 addition & 1 deletion orm/fastify-graphql/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient, Prisma } from '@prisma/client'
import { PrismaClient, Prisma } from './generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
2 changes: 1 addition & 1 deletion orm/fastify-graphql/src/context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient } from '@prisma/client'
import { PrismaClient } from '../prisma/generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
14 changes: 7 additions & 7 deletions orm/fastify-graphql/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from 'nexus'
import { DateTimeResolver } from 'graphql-scalars'
import { Context } from './context'
import { Post } from '.prisma/client'
import { Post } from '../prisma/generated/client'

export const DateTime = asNexusMethod(DateTimeResolver, 'date')

Expand Down Expand Up @@ -50,11 +50,11 @@ const Query = objectType({
resolve: (_parent, args, context) => {
const or = args.searchString
? {
OR: [
{ title: { contains: args.searchString } },
{ content: { contains: args.searchString } },
],
}
OR: [
{ title: { contains: args.searchString } },
{ content: { contains: args.searchString } },
],
}
: {}

return context.prisma.post.findMany({
Expand Down Expand Up @@ -306,7 +306,7 @@ export const schema = makeSchema({
sourceTypes: {
modules: [
{
module: '@prisma/client',
module: require.resolve('../prisma/generated/client'),
alias: 'prisma',
},
],
Expand Down
1 change: 1 addition & 0 deletions orm/fastify-graphql/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dotenv/config'
import fastify from 'fastify'
import mercurius from 'mercurius'
import { schema } from './schema'
Expand Down
18 changes: 9 additions & 9 deletions orm/graphql-auth/package.json
Comment thread
AmanVarshney01 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@
"name": "graphql-auth",
"license": "MIT",
"scripts": {
"dev": "ts-node-dev --no-notify --respawn --transpile-only src/server",
"dev": "tsx src/server",
"start": "node dist/server",
"clean": "rm -rf dist",
"build": "npm -s run clean && npm -s run generate && tsc",
"generate": "npm -s run generate:prisma && npm -s run generate:nexus",
"generate:prisma": "prisma generate",
"generate:nexus": "ts-node --transpile-only src/schema"
"generate:nexus": "tsx src/schema"
},
"prettier": {
"semi": false,
"singleQuote": true,
"trailingComma": "all"
},
"dependencies": {
"@prisma/client": "6.9.0",
"@apollo/server": "4.12.2",
"@prisma/client": "^6.18.0",
"@prisma/extension-accelerate": "^2.0.2",
"bcryptjs": "3.0.2",
"dotenv": "^16.4.7",
"graphql": "16.11.0",
"graphql-middleware": "6.1.35",
"graphql-scalars": "1.24.2",
"graphql-shield": "7.6.5",
"jsonwebtoken": "9.0.2",
"nexus": "1.3.0",
"@prisma/extension-accelerate": "2.0.2"
"nexus": "1.3.0"
},
"devDependencies": {
"@types/bcryptjs": "3.0.0",
"@types/jsonwebtoken": "9.0.10",
"@types/node": "22.15.32",
"prisma": "6.9.0",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"prisma": "^6.18.0",
"tsx": "^4.20.6",
"typescript": "5.8.2"
},
"prisma": {
"seed": "ts-node prisma/seed.ts"
"seed": "tsx prisma/seed.ts"
}
}
4 changes: 3 additions & 1 deletion orm/graphql-auth/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
generator client {
provider = "prisma-client-js"
provider = "prisma-client"
output = "./generated"
engineType = "client"
Comment thread
AmanVarshney01 marked this conversation as resolved.
}

datasource db {
Expand Down
2 changes: 1 addition & 1 deletion orm/graphql-auth/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient, Prisma } from '@prisma/client'
import { PrismaClient, Prisma } from './generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
2 changes: 1 addition & 1 deletion orm/graphql-auth/src/context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient } from '@prisma/client'
import { PrismaClient } from '../prisma/generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
12 changes: 6 additions & 6 deletions orm/graphql-auth/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ const Query = objectType({
resolve: (_parent, args, context: Context) => {
const or = args.searchString
? {
OR: [
{ title: { contains: args.searchString } },
{ content: { contains: args.searchString } },
],
}
OR: [
{ title: { contains: args.searchString } },
{ content: { contains: args.searchString } },
],
}
: {}

return context.prisma.post.findMany({
Expand Down Expand Up @@ -355,7 +355,7 @@ const schemaWithoutPermissions = makeSchema({
sourceTypes: {
modules: [
{
module: '@prisma/client',
module: require.resolve('../prisma/generated/client'),
alias: 'prisma',
},
],
Expand Down
1 change: 1 addition & 0 deletions orm/graphql-auth/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dotenv/config'
import { ApolloServer } from '@apollo/server'
import { startStandaloneServer } from '@apollo/server/standalone'
import { Context, createContext } from './context'
Expand Down
18 changes: 9 additions & 9 deletions orm/graphql-nexus/package.json
Comment thread
AmanVarshney01 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "typescript-graphql-nexus",
"license": "MIT",
"scripts": {
"dev": "ts-node-dev --no-notify --respawn --transpile-only src/server",
"dev": "tsx src/server",
Comment thread
AmanVarshney01 marked this conversation as resolved.
"start": "node dist/server",
"clean": "rm -rf dist",
"build": "npm -s run clean && npm -s run generate && tsc",
"generate": "npm -s run generate:prisma && npm -s run generate:nexus",
"generate:prisma": "prisma generate",
"generate:nexus": "ts-node --transpile-only src/schema"
"generate:nexus": "tsx src/schema"
},
"prettier": {
"semi": false,
Expand All @@ -17,20 +17,20 @@
},
"dependencies": {
"@apollo/server": "4.12.2",
"@prisma/client": "6.9.0",
"@prisma/client": "^6.18.0",
"@prisma/extension-accelerate": "^2.0.2",
"dotenv": "^16.4.7",
"graphql": "16.11.0",
"graphql-scalars": "1.24.2",
"nexus": "1.3.0",
"@prisma/extension-accelerate": "2.0.2"
"nexus": "1.3.0"
},
"devDependencies": {
"@types/node": "22.15.32",
"prisma": "6.9.0",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"prisma": "^6.18.0",
"tsx": "^4.20.6",
"typescript": "5.8.2"
},
"prisma": {
"seed": "ts-node --transpile-only prisma/seed.ts"
"seed": "tsx prisma/seed.ts"
}
}
4 changes: 3 additions & 1 deletion orm/graphql-nexus/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
generator client {
provider = "prisma-client-js"
provider = "prisma-client"
output = "./generated"
engineType = "client"
}

datasource db {
Expand Down
2 changes: 1 addition & 1 deletion orm/graphql-nexus/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient, Prisma } from '@prisma/client'
import { PrismaClient, Prisma } from './generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
2 changes: 1 addition & 1 deletion orm/graphql-nexus/src/context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PrismaClient } from '@prisma/client'
import { PrismaClient } from '../prisma/generated/client'
import { withAccelerate } from '@prisma/extension-accelerate'

const prisma = new PrismaClient().$extends(withAccelerate())
Expand Down
Loading
Loading