Skip to content

Commit

Permalink
generate prisma clients into custom locations to avoid conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
hayes committed Dec 15, 2021
1 parent 5aaed1b commit 67880cb
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 95 deletions.
2 changes: 2 additions & 0 deletions examples/prisma-relay/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
prisma/generated.ts
prisma/client/*
6 changes: 5 additions & 1 deletion examples/prisma-relay/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ datasource db {

generator client {
provider = "prisma-client-js"
// Generate into custom location because this repo has multiple prisma schemas
output = "./client"
}

generator giraphql {
// In a real app use `provider = "prisma-giraphql-types"` instead
provider = "ts-node node_modules/@giraphql/plugin-prisma/src/generator.ts"
clientOutput = "@prisma/client"
// Match client output location from above
clientOutput = "./client"
output = "./generated.ts"
}

model User {
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma-relay/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-await-in-loop */
/* eslint-disable no-magic-numbers */
import faker from 'faker';
import { PrismaClient } from '@prisma/client';
import { PrismaClient } from './client';

const prisma = new PrismaClient();

Expand Down
3 changes: 0 additions & 3 deletions examples/prisma-relay/prisma/tsconfig.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/prisma-relay/src/db.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { PrismaClient } from '@prisma/client';
import { PrismaClient } from '../prisma/client';

export const db = new PrismaClient();
1 change: 1 addition & 0 deletions examples/prisma-relay/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"allowSyntheticDefaultImports": true
},
"include": [
"prisma/*.ts",
"src/**/*"
]
}
2 changes: 2 additions & 0 deletions examples/prisma/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
prisma/generated.ts
prisma/client/*
6 changes: 5 additions & 1 deletion examples/prisma/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ datasource db {

generator client {
provider = "prisma-client-js"
// Generate into custom location because this repo has multiple prisma schemas
output = "./client"
}

generator giraphql {
// In a real app use `provider = "prisma-giraphql-types"` instead
provider = "ts-node node_modules/@giraphql/plugin-prisma/src/generator.ts"
clientOutput = "@prisma/client"
// Match client output location from above
clientOutput = "./client"
output = "./generated.ts"
}

model User {
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-await-in-loop */
/* eslint-disable no-magic-numbers */
import faker from 'faker';
import { PrismaClient } from '@prisma/client';
import { PrismaClient } from './client';

const prisma = new PrismaClient();

Expand Down
3 changes: 0 additions & 3 deletions examples/prisma/prisma/tsconfig.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/prisma/src/db.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { PrismaClient } from '@prisma/client';
import { PrismaClient } from '../prisma/client';

export const db = new PrismaClient();
1 change: 1 addition & 0 deletions examples/prisma/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"allowSyntheticDefaultImports": true
},
"include": [
"prisma/*.ts",
"src/**/*"
]
}
3 changes: 2 additions & 1 deletion packages/plugin-prisma/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ datasource db {

generator client {
provider = "prisma-client-js"
output = "../tests/client"
}

generator giraphql {
provider = "ts-node ./src/generator.ts"
clientOutput = "@prisma/client"
clientOutput = "../tests/client"
output = "../tests/generated.ts"
}

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-prisma/prisma/seed.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-ignore
import faker from 'faker';
import { PrismaClient } from '@prisma/client';
import { PrismaClient } from '../tests/client';

const prisma = new PrismaClient();

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-prisma/src/refs.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ObjectRef, SchemaTypes } from '@giraphql/core';
import { Prisma } from '@prisma/client';
import { Prisma } from '../tests/client';
import { PrismaDelegate } from './types';

export const refMap = new WeakMap<object, Map<string, ObjectRef<unknown>>>();
Expand Down
2 changes: 2 additions & 0 deletions packages/plugin-prisma/tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
generated.ts
client/*
2 changes: 1 addition & 1 deletion packages/plugin-prisma/tests/example/builder.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import SchemaBuilder from '@giraphql/core';
import ErrorsPlugin from '@giraphql/plugin-errors';
import RelayPlugin from '@giraphql/plugin-relay';
import { PrismaClient } from '@prisma/client';
// eslint-disable-next-line import/no-named-as-default
import PrismaPlugin from '../../src';
import { PrismaClient } from '../client';
import PrismaTypes from '../generated';

export const prisma = new PrismaClient({
Expand Down
79 changes: 0 additions & 79 deletions packages/plugin-prisma/tests/generated.ts

This file was deleted.

0 comments on commit 67880cb

Please sign in to comment.