diff --git a/content/200-orm/100-prisma-schema/10-overview/04-location.mdx b/content/200-orm/100-prisma-schema/10-overview/04-location.mdx index dcc3115000..b3d89f6a04 100644 --- a/content/200-orm/100-prisma-schema/10-overview/04-location.mdx +++ b/content/200-orm/100-prisma-schema/10-overview/04-location.mdx @@ -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 + } 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. diff --git a/content/200-orm/500-reference/100-prisma-schema-reference.mdx b/content/200-orm/500-reference/100-prisma-schema-reference.mdx index 2ba0bde051..c93f18552f 100644 --- a/content/200-orm/500-reference/100-prisma-schema-reference.mdx +++ b/content/200-orm/500-reference/100-prisma-schema-reference.mdx @@ -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 | @@ -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 | diff --git a/content/600-about/20-style-guide/03-spelling-punctuation-formatting.mdx b/content/600-about/20-style-guide/03-spelling-punctuation-formatting.mdx index fb038ae3f3..de9f1afc88 100644 --- a/content/600-about/20-style-guide/03-spelling-punctuation-formatting.mdx +++ b/content/600-about/20-style-guide/03-spelling-punctuation-formatting.mdx @@ -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.