Skip to content

Commit 9e8eff0

Browse files
Merge branch 'master' of https://github.com/nestjs/nest
2 parents cce8c45 + ac5a556 commit 9e8eff0

6 files changed

Lines changed: 771 additions & 2307 deletions

File tree

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
5858

5959
#### Sponsors
6060

61-
<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="34" /></a>
61+
<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="110" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="30" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="40" /> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="30" /></a> &nbsp; <a href="https://genuinebee.com/"><img src="https://nestjs.com/img/genuinebee.svg" height="38" /></a> &nbsp; <a href="http://architectnow.net/"><img src="https://nestjs.com/img/architectnow.png" height="24" /></a> &nbsp; <a href="https://quander.io/"><img src="https://nestjs.com/img/quander.png" height="28" /></a>
6262

6363

6464
## Backers

sample/22-graphql-prisma/.graphqlconfig.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ projects:
22
database:
33
schemaPath: src/prisma/prisma-types.graphql
44
extensions:
5-
prisma: database/prisma.yml
5+
endpoints:
6+
default: https://eu1.prisma.sh/public-agatepuma-476/my-app/dev
67
codegen:
78
- generator: prisma-binding
89
language: typescript

sample/22-graphql-prisma/graphql.schema.d.ts

Lines changed: 0 additions & 247 deletions
This file was deleted.

sample/22-graphql-prisma/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@
1212
"start:prod": "node dist/main.js"
1313
},
1414
"dependencies": {
15-
"@nestjs/common": "5.3.7",
16-
"@nestjs/core": "5.3.7",
17-
"@nestjs/graphql": "5.3.1",
18-
"apollo-server-express": "2.0.6",
15+
"@nestjs/common": "5.3.9",
16+
"@nestjs/core": "5.3.10",
17+
"@nestjs/graphql": "5.4.0",
18+
"apollo-server-express": "2.1.0",
1919
"graphql": "0.13.2",
20-
"graphql-tools": "3.1.1",
21-
"prisma": "1.16.2",
22-
"prisma-binding": "2.1.5",
20+
"graphql-tools": "4.0.0",
21+
"prisma-binding": "2.1.6",
2322
"reflect-metadata": "0.1.12",
24-
"rxjs": "6.3.2",
25-
"typescript": "3.0.3"
23+
"rxjs": "6.3.3",
24+
"typescript": "3.1.1"
2625
},
2726
"devDependencies": {
2827
"nodemon": "1.18.4",
29-
"prettier": "1.14.2",
28+
"prettier": "1.14.3",
3029
"ts-node": "7.0.1",
3130
"tsconfig-paths": "3.6.0",
3231
"tslint": "5.11.0"

sample/22-graphql-prisma/src/graphql.schema.d.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,4 @@ export abstract class ISubscription {
168168
abstract post(where?: PostSubscriptionWhereInput): PostSubscriptionPayload | Promise<PostSubscriptionPayload>;
169169
}
170170

171-
export class User {
172-
id: string;
173-
name: string;
174-
}
175-
176171
export type Long = any;

0 commit comments

Comments
 (0)