Skip to content

fix: add callout to Prisma Config DC-4961 #7095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 2, 2025
Merged

fix: add callout to Prisma Config DC-4961 #7095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c3ff71
fix: add callout to Prisma Config DC-4961
ankur-arch Sep 2, 2025
6b1c142
fix: add callouts to the new prisma-client generator
ankur-arch Sep 2, 2025
e2ee0aa
fix: replace grammarbook link
ankur-arch Sep 2, 2025
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
9 changes: 7 additions & 2 deletions content/200-orm/100-prisma-schema/10-overview/04-location.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@ You can do this in either of three ways:
import type { PrismaConfig } from 'prisma'

export default {
earlyAccess: true,
schema: path.join('prisma'),
} satisfies PrismaConfig<Env>
} satisfies PrismaConfig
```

:::note

We recommend using the [Prisma Config file](/orm/reference/prisma-config-reference#schema) to specify the location of your Prisma schema. This is the most flexible way to specify the location of your Prisma schema alongside other configuration options.

:::

All examples above assume that your `datasource` block is defined in a `.prisma` file inside the `prisma` directory.

You also must place the `migrations` directory next to the `.prisma` file that defines the `datasource` block.
Expand Down
10 changes: 10 additions & 0 deletions content/200-orm/500-reference/100-prisma-schema-reference.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ Defines a [generator](/orm/prisma-schema/overview/generators) in the Prisma sche

### Fields for `prisma-client-js` provider

This is the default generator for Prisma ORM 6.x and earlier versions. Learn more about [generators](/orm/prisma-schema/overview/generators#prisma-client-js).

A `generator` block accepts the following fields:

| Name | Required | Type | Description |
Expand All @@ -180,6 +182,14 @@ We recommend defining a custom output path, adding the path to `.gitignore`, and

### Fields for `prisma-client` provider (Preview)

The ESM-first client generator that offers greater control and flexibility across different JavaScript environments. It generates plain TypeScript code into a custom directory, providing full visibility over the generated code. Learn more about [the new `prisma-client` generator](/orm/prisma-schema/overview/generators#prisma-client-preview).

:::note

The `prisma-client` generator will be the default generator in Prisma ORM 7.0 and we recommend migrating to it as soon as possible.

:::

A `generator` block accepts the following fields:

| Name | Required | Type | Description |
Expand Down
2 changes: 1 addition & 1 deletion content/600-about/20-style-guide/03-spelling-punctuation-formatting.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Tables and lists are often the most concise way to present information. Use thes

## Hyphens

Use hyphens according to these [rules](https://www.grammarbook.com/punctuation/hyphens.asp).
Use hyphens according to these [rules](https://www.grammarly.com/blog/punctuation-capitalization/hyphen/).

Sometimes there are some terms where it's not clear whether to use a hyphen or not. To strive for consistency, we list those terms here.

Expand Down
Loading