Skip to content

Commit

Permalink
Merge branch 'main' into feat/DA-1908
Browse files Browse the repository at this point in the history
  • Loading branch information
@jharrell
jharrell authored Dec 16, 2024
2 parents 42c9de2 + 7ceb531 commit 7628df1
Show file tree
Hide file tree
Showing 12 changed files with 116 additions and 148 deletions.
6 changes: 3 additions & 3 deletions ...setup-prisma/100-start-from-scratch/110-relational-databases/300-next-steps.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ The [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository c

| Demo | Stack | Description |
| :------------------------------------------------------------------------------------------------------------------ | :----------- | --------------------------------------------------------------------------------------------------- |
| [`rest-nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`graphql-nextjs`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`nextjs-graphql`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`graphql-nexus`](https://pris.ly/e/ts/graphql-nexus) | Backend only | GraphQL server based on [`@apollo/server`](https://www.apollographql.com/docs/apollo-server) |
| [`rest-express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`grpc`](https://pris.ly/e/ts/grpc) | Backend only | Simple gRPC API |
6 changes: 3 additions & 3 deletions ...g-started/02-setup-prisma/100-start-from-scratch/120-mongodb/300-next-steps.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ The [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository c

| Demo | Stack | Description |
| :------------------------------------------------------------------------------------------------------------------ | :----------- | --------------------------------------------------------------------------------------------------- |
| [`rest-nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`graphql-nextjs`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`nextjs-graphql`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`graphql-nexus`](https://pris.ly/e/ts/graphql-nexus) | Backend only | GraphQL server based on [`@apollo/server`](https://www.apollographql.com/docs/apollo-server) |
| [`rest-express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`grpc`](https://pris.ly/e/ts/grpc) | Backend only | Simple gRPC API |
6 changes: 3 additions & 3 deletions ...-prisma/200-add-to-existing-project/110-relational-databases/300-next-steps.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ The [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository c
| Demo | Stack | Description |
| :------------------------------------------------------------------------------------------------------------------ | :----------- | --------------------------------------------------------------------------------------------------- |
| [`rest-nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`graphql-nextjs`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`nextjs-graphql`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`graphql-nexus`](https://pris.ly/e/ts/graphql-nexus) | Backend only | GraphQL server based on [`@apollo/server`](https://www.apollographql.com/docs/apollo-server) |
| [`rest-express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`grpc`](https://pris.ly/e/ts/grpc) | Backend only | Simple gRPC API |
6 changes: 3 additions & 3 deletions ...rted/02-setup-prisma/200-add-to-existing-project/120-mongodb/300-next-steps.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ The [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository c

| Demo | Stack | Description |
| :------------------------------------------------------------------------------------------------------------------ | :----------- | --------------------------------------------------------------------------------------------------- |
| [`rest-nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`graphql-nextjs`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a REST API |
| [`nextjs-graphql`](https://pris.ly/e/ts/graphql-nextjs) | Fullstack | Simple [Next.js](https://nextjs.org/) app (React) with a GraphQL API |
| [`graphql-nexus`](https://pris.ly/e/ts/graphql-nexus) | Backend only | GraphQL server based on [`@apollo/server`](https://www.apollographql.com/docs/apollo-server) |
| [`rest-express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`express`](https://pris.ly/e/ts/rest-express) | Backend only | Simple REST API with Express.JS |
| [`grpc`](https://pris.ly/e/ts/grpc) | Backend only | Simple gRPC API |
12 changes: 5 additions & 7 deletions content/200-orm/050-overview/300-prisma-in-your-stack/01-rest.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,8 @@ You can find several ready-to-run examples that show how to implement a REST API

| **Example** | **Stack** | **Description** |
| ----------------------------------------------------------------------------------------------------------------------------- | ------------ | ---------------------------------------------- |
| [`rest-express`](https://pris.ly/e/ts/rest-express) | Backend only | REST API with Express for TypeScript |
| [`rest-fastify`](https://pris.ly/e/ts/rest-fastify) | Backend only | REST API using Fastify and Prisma Client. |
| [`rest-hapi`](https://pris.ly/e/ts/rest-hapi) | Backend only | REST API using hapi and Prisma Client |
| [`rest-nestjs`](https://pris.ly/e/ts/rest-nestjs) | Backend only | Nest.js app (Express) with a REST API |
| [`rest-nextjs-express`](https://pris.ly/e/ts/rest-nextjs-express) | Fullstack | Next.js app (React, Express) and Prisma Client |
| [`rest-nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Next.js app (React) with a REST API |
| [`rest-nextjs-api-routes-auth`](https://pris.ly/e/ts/rest-nextjs-api-routes-auth) | Fullstack | Implement authentication using NextAuth.js |
| [`express`](https://pris.ly/e/ts/rest-express) | Backend only | REST API with Express for TypeScript |
| [`fastify`](https://pris.ly/e/ts/rest-fastify) | Backend only | REST API using Fastify and Prisma Client. |
| [`hapi`](https://pris.ly/e/ts/rest-hapi) | Backend only | REST API using hapi and Prisma Client |
| [`nestjs`](https://pris.ly/e/ts/rest-nestjs) | Backend only | Nest.js app (Express) with a REST API |
| [`nextjs-api-routes`](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack | Next.js app (React) with a REST API |
3 changes: 1 addition & 2 deletions content/200-orm/050-overview/300-prisma-in-your-stack/03-fullstack.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ You can find several ready-to-run examples that show how to fullstack apps with
| [Next.js (API Routes)](https://pris.ly/e/ts/rest-nextjs-api-routes) | Fullstack Next.js app using `getServerSideProps` & API Routes |
| [Next.js (GraphQL)](https://pris.ly/e/ts/graphql-nextjs) | Fullstack Next.js app using GraphQL Yoga, Pothos, & Apollo Client |
| [Next.js (tRPC)](https://pris.ly/e/ts/trpc-nextjs) | Fullstack Next.js app using tRPC |
| [Next.js (API Routes with auth)](https://pris.ly/e/ts/rest-nextjs-api-routes-auth) | Fullstack Next.js app using `getServerSideProps`, API Routes, & [NextAuth](https://next-auth.js.org/) |
| [Remix](https://pris.ly/e/ts/remix) | Fullstack Remix app using actions and loaders |
| [SvelteKit](https://pris.ly/e/ts/sveltekit) | Fullstack Sveltekit app using actions and loaders |
| [Nuxt (REST API)](https://pris.ly/e/ts/rest-nuxtjs) | Fullstack Nuxt app using API routes |
| [Nuxt](https://pris.ly/e/ts/rest-nuxtjs) | Fullstack Nuxt app using API routes |
2 changes: 1 addition & 1 deletion ...-client/000-setup-and-configuration/050-databases-connections/200-pgbouncer.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ To use Prisma Client with PgBouncer, add the `?pgbouncer=true` flag to the Postg

```shell
postgresql://USER:PASSWORD@HOST:PORT/DATABASE?pgbouncer=true
``` ```
```

:::info
`PORT` specified for PgBouncer pooling is sometimes different from the default `5432` port. Check your database provider docs for the correct port number.
Expand Down
2 changes: 1 addition & 1 deletion ...0-more/300-upgrade-guides/800-upgrade-from-prisma-1/07-upgrading-a-rest-api.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ If this is not what your project structure looks like, you'll need to adjust the

## 1. Adjust the application to use Prisma Client 2

For the purpose of this guide, we'll use the sample API calls from the [`rest-express`](https://github.com/prisma/prisma1-examples/tree/master/typescript/rest-express) example in the [`prisma1-examples`](https://github.com/prisma/prisma1-examples/) repository.
For the purpose of this guide, we'll use the sample API calls from the [`express`](https://github.com/prisma/prisma1-examples/tree/master/typescript/rest-express) example in the [`prisma1-examples`](https://github.com/prisma/prisma1-examples/) repository.

The application code in our example is located in a single file and looks as follows:

Expand Down
4 changes: 2 additions & 2 deletions docusaurus.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ const config: Config = {
],
},
algolia: {
appId: process.env.ALGOLIA_APP_ID,
apiKey: process.env.ALGOLIA_API_KEY,
appId: "MF58UJZ648",
apiKey: "fd3d0a05bfe5d280348060ca5ea416be",
indexName: "prisma",
contextualSearch: false,
replaceSearchResultPathname: {
Expand Down
Loading

0 comments on commit 7628df1

Please sign in to comment.