Merge branch 'prisma-7' into prisma-7-getting-started-restructure

Author: ankur-arch

.coderabbit.yaml

@@ -1,6 +1,7 @@
 # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
 # yaml template to refer to https://docs.coderabbit.ai/reference/yaml-template#enterprise
 language: "en-US"
+tone_instructions: "You are a principal engineer with natural teaching abilities. You detect issues and clearly explain why."
 reviews:
   collapse_walkthrough: false
   profile: "chill"
@@ -14,6 +15,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
+    base_branches: [".*"]
   finishing_touches:
     docstrings:
       enabled: false

.github/workflows/lychee.yml

@@ -25,7 +25,6 @@ jobs:
             --cache
             --cache-exclude-status 429,500,502,503,504
             --max-cache-age 5m
-            --verbose
             --no-progress
             --accept 200,201,204,304,403,429
             --timeout 20
@@ -50,7 +49,6 @@ jobs:
           args: >
             --cache
             --max-cache-age 5m
-            --verbose
             --no-progress
             --accept 200,201,204,304,403,429
             --cache-exclude-status 429,500,502,503,504
@@ -79,8 +77,8 @@ jobs:
           fi
 
           if [ -n "$REPORT_FILE" ]; then
-            # Read the original output
-            ORIGINAL=$(cat "$REPORT_FILE")
+            # Read the original output and remove everything after 'Redirects per input'
+            ORIGINAL=$(cat "$REPORT_FILE" | sed '/^##* Redirects per input/,$d')
 
             # Create formatted output
             cat > lychee/formatted.md << EOF
@@ -92,7 +90,7 @@ jobs:
 
           EOF
 
-            # Append the original content with title replacement
+            # Append the cleaned content with title replacement
             echo "$ORIGINAL" | sed 's/^# Summary$//' | sed 's/^## Summary$//' >> lychee/formatted.md
           fi
 

content/200-orm/100-prisma-schema/10-overview/02-data-sources.mdx

@@ -6,6 +6,10 @@ metaDescription: 'Data sources enable Prisma to connect to your database. This p
 
 A data source determines how Prisma ORM connects to your database, and is represented by the [`datasource`](/orm/reference/prisma-schema-reference#datasource) block in the Prisma schema. The following data source uses the `postgresql` provider and includes a connection URL:
 
+::::note
+As of Prisma ORM v7, the `url`, `directUrl`, and `shadowDatabaseUrl` fields in the Prisma schema `datasource` block are deprecated. Configure these fields in [Prisma Config](/orm/reference/prisma-config-reference) instead.
+::::
+
 ```prisma
 datasource db {
   provider = "postgresql"

content/200-orm/100-prisma-schema/10-overview/03-generators.mdx

@@ -15,79 +15,10 @@ generator client {
 
 A generator determines which assets are created when you run the `prisma generate` command.
 
-There are two generators for Prisma Client:
-
-- `prisma-client` (recommended): Newer and more flexible version of `prisma-client-js` with ESM support; it outputs plain TypeScript code and _requires_ a custom `output` path (read more about it [here](https://www.prisma.io/blog/why-prisma-orm-generates-code-into-node-modules-and-why-it-ll-change))
-- `prisma-client-js`: Generates Prisma Client into `node_modules`
+The default generator for Prisma Client is `prisma-client`, which outputs plain TypeScript code and _requires_ a custom `output` path (read more about it [here](https://www.prisma.io/blog/why-prisma-orm-generates-code-into-node-modules-and-why-it-ll-change)).
 
 Alternatively, you can configure any npm package that complies with our generator specification.
 
-## `prisma-client-js`
-
-The `prisma-client-js` is the default generator for Prisma ORM 6.X versions and before. It requires the `@prisma/client` npm package and generates Prisma Client into `node_modules`.
-
-### Field reference
-
-The generator for Prisma's JavaScript Client accepts multiple additional properties:
-
-- `previewFeatures`: [Preview features](/orm/reference/preview-features) to include
-- `binaryTargets`: Engine binary targets for `prisma-client-js` (for example, `debian-openssl-1.1.x` if you are deploying to Ubuntu 18+, or `native` if you are working locally)
-
-```prisma
-generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["sample-preview-feature"]
-  binaryTargets   = ["debian-openssl-1.1.x"] // defaults to `"native"`
-}
-```
-
-### Binary targets
-
-:::note
-
-As of [v6.16.0](https://pris.ly/release/6.16.0), Prisma ORM can be used without Rust engines in production applications. Learn more [here](/orm/prisma-client/setup-and-configuration/no-rust-engine).
-
-**When enabled, your Prisma Client will be generated without a Rust-based query engine binary**:
-
-```prisma
-generator client {
-  provider   = "prisma-client-js" // or "prisma-client"
-  output     = "../src/generated/prisma"
-  engineType = "client"           // no Rust engine
-}
-```
-
-Note that [driver adapters](/orm/overview/databases/database-drivers#driver-adapters) are required if you want to use Prisma ORM without Rust engines.
-
-When using Prisma ORM without Rust, the `binaryTargets` field is obsolete and not needed.
-
-You can [read about the performance and DX improvements](https://www.prisma.io/blog/prisma-orm-without-rust-latest-performance-benchmarks) of this change on our blog.
-
-:::
-
-The `prisma-client-js` generator uses several [engines](https://github.com/prisma/prisma-engines). Engines are implemented in Rust and are used by Prisma Client in the form of executable, platform-dependent engine files. Depending on which platform you are executing your code on, you need the correct file. "Binary targets" are used to define which files should be present for the target platform(s).
-
-The correct file is particularly important when [deploying](/orm/prisma-client/deployment/deploy-prisma) your application to production, which often differs from your local development environment.
-
-#### The `native` binary target
-
-The `native` binary target is special. It doesn't map to a concrete operating system. Instead, when `native` is specified in `binaryTargets`, Prisma Client detects the _current_ operating system and automatically specifies the correct binary target for it.
-
-As an example, assume you're running **macOS** and you specify the following generator:
-
-```prisma file=prisma/schema.prisma
-generator client {
-  provider      = "prisma-client-js"
-  binaryTargets = ["native"]
-}
-```
-
-In that case, Prisma Client detects your operating system and finds the right binary file for it based on the [list of supported operating systems](/orm/reference/prisma-schema-reference#binarytargets-options) .
-If you use macOS Intel x86 (`darwin`), then the binary file that was compiled for `darwin` will be selected.
-If you use macOS ARM64 (`darwin-arm64`), then the binary file that was compiled for `darwin-arm64` will be selected.
-
-> **Note**: The `native` binary target is the default. You can set it explicitly if you wish to include additional [binary targets](/orm/reference/prisma-schema-reference#binarytargets-options) for deployment to different environments.
-
 ## `prisma-client`
 
 The new `prisma-client` generator offers greater control and flexibility when using Prisma ORM across different JavaScript environments (such as ESM, Bun, Deno, ...).
@@ -104,7 +35,7 @@ Here are the main differences compared to `prisma-client-js`:
 - More flexible thanks to additional [fields](#field-reference)
 - Outputs plain TypeScript that's bundled just like the rest of your application code
 
-The `prisma-client` generator has been Generally Available since [v6.16.0](https://pris.ly/releases/6.16.0) will become the new default with Prisma ORM v7.
+The `prisma-client` generator has been Generally Available since [v6.16.0](https://pris.ly/releases/6.16.0) and is the default generator as of Prisma ORM v7.
 
 ### Getting started
 
@@ -396,6 +327,78 @@ To see what the new `prisma-client` generator looks like in practice, check out
 | [`bun`](https://github.com/prisma/prisma-examples/tree/latest/generator-prisma-client/deno-deploy)                                                                 | None           | None              | Deno 2                                           | n/a       |
 | [`deno`](https://github.com/prisma/prisma-examples/tree/latest/generator-prisma-client/deno-deploy)                                                                | None           | None              | Deno 2                                           | n/a       |
 
+## `prisma-client-js` (Deprecated)
+
+:::warning Deprecated
+
+The `prisma-client-js` generator is **deprecated as of Prisma 7**. It was the default generator for Prisma ORM 6.X and earlier versions. We recommend migrating to [`prisma-client`](#prisma-client) for new projects and updating existing projects when possible.
+
+:::
+
+The `prisma-client-js` generator requires the `@prisma/client` npm package and generates Prisma Client into `node_modules`.
+
+### Field reference
+
+The generator for Prisma's JavaScript Client accepts multiple additional properties:
+
+- `previewFeatures`: [Preview features](/orm/reference/preview-features) to include
+- `binaryTargets`: Engine binary targets for `prisma-client-js` (for example, `debian-openssl-1.1.x` if you are deploying to Ubuntu 18+, or `native` if you are working locally)
+
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["sample-preview-feature"]
+  binaryTargets   = ["debian-openssl-1.1.x"] // defaults to `"native"`
+}
+```
+
+### Binary targets
+
+:::note
+
+As of [v6.16.0](https://pris.ly/release/6.16.0), Prisma ORM can be used without Rust engines in production applications. Learn more [here](/orm/prisma-client/setup-and-configuration/no-rust-engine).
+
+**When enabled, your Prisma Client will be generated without a Rust-based query engine binary**:
+
+```prisma
+generator client {
+  provider   = "prisma-client-js" // or "prisma-client"
+  output     = "../src/generated/prisma"
+  engineType = "client"           // no Rust engine
+}
+```
+
+Note that [driver adapters](/orm/overview/databases/database-drivers#driver-adapters) are required if you want to use Prisma ORM without Rust engines.
+
+When using Prisma ORM without Rust, the `binaryTargets` field is obsolete and not needed.
+
+You can [read about the performance and DX improvements](https://www.prisma.io/blog/prisma-orm-without-rust-latest-performance-benchmarks) of this change on our blog.
+
+:::
+
+The `prisma-client-js` generator uses several [engines](https://github.com/prisma/prisma-engines). Engines are implemented in Rust and are used by Prisma Client in the form of executable, platform-dependent engine files. Depending on which platform you are executing your code on, you need the correct file. "Binary targets" are used to define which files should be present for the target platform(s).
+
+The correct file is particularly important when [deploying](/orm/prisma-client/deployment/deploy-prisma) your application to production, which often differs from your local development environment.
+
+#### The `native` binary target
+
+The `native` binary target is special. It doesn't map to a concrete operating system. Instead, when `native` is specified in `binaryTargets`, Prisma Client detects the _current_ operating system and automatically specifies the correct binary target for it.
+
+As an example, assume you're running **macOS** and you specify the following generator:
+
+```prisma file=prisma/schema.prisma
+generator client {
+  provider      = "prisma-client-js"
+  binaryTargets = ["native"]
+}
+```
+
+In that case, Prisma Client detects your operating system and finds the right binary file for it based on the [list of supported operating systems](/orm/reference/prisma-schema-reference#binarytargets-options) .
+If you use macOS Intel x86 (`darwin`), then the binary file that was compiled for `darwin` will be selected.
+If you use macOS ARM64 (`darwin-arm64`), then the binary file that was compiled for `darwin-arm64` will be selected.
+
+> **Note**: The `native` binary target is the default. You can set it explicitly if you wish to include additional [binary targets](/orm/reference/prisma-schema-reference#binarytargets-options) for deployment to different environments.
+
 ## Community generators
 
 :::note

content/200-orm/200-prisma-client/000-setup-and-configuration/010-generating-prisma-client.mdx

@@ -124,6 +124,35 @@ For improved compatibility with ECMAScript modules (ESM) and to ensure consisten
 
 :::
 
+## Loading environment variables
+
+To load environment variables in your Prisma application, you can use the `prisma.config.ts` file along with the `env` helper from `prisma/config`. This approach provides better type safety and configuration management.
+
+1. First, install the required dependency:
+
+   ```bash
+   npm install dotenv --save-dev
+   ```
+
+2. Create a `.env` file in your project root (if it doesn't exist) and add your database connection string:
+
+   ```env
+   DATABASE_URL="your_database_connection_string_here"
+   ```
+
+3. Update your `prisma.config.ts` file in your project root:
+
+   ```ts
+   import "dotenv/config";
+   import { defineConfig, env } from "prisma/config";
+
+   export default defineConfig({
+      datasource: {
+         url: env("DATABASE_URL"),
+      },
+   });
+   ```
+
 ## The `@prisma/client` npm package
 
 The `@prisma/client` npm package consists of two key parts:

content/200-orm/200-prisma-client/100-queries/100-query-optimization-performance.mdx

@@ -42,8 +42,6 @@ To get started, follow the [integration guide](/optimize/getting-started) and ad
 
 You can also [log query events at the client level](/orm/prisma-client/observability-and-logging/logging#event-based-logging) to view the generated queries, their parameters, and execution times.
 
-If you are particularly focused on monitoring query duration, consider using [logging middleware](/orm/prisma-client/client-extensions/middleware/logging-middleware).
-
 :::
 
 ## Using bulk queries

content/200-orm/200-prisma-client/300-client-extensions/120-query.mdx

@@ -15,7 +15,7 @@ Prisma Client extensions are Generally Available from versions 4.16.0 and later.
 
 You can use the `query` [Prisma Client extensions](/orm/prisma-client/client-extensions) component type to hook into the query life-cycle and modify an incoming query or its result.
 
-You can use Prisma Client extensions `query` component to create independent clients. This provides an alternative to [middlewares](/orm/prisma-client/client-extensions/middleware). You can bind one client to a specific filter or user, and another client to another filter or user. For example, you might do this to get [user isolation](/orm/prisma-client/client-extensions#extended-clients) in a row-level security (RLS) extension. In addition, unlike middlewares the `query` extension component gives you end-to-end type safety. [Learn more about `query` extensions versus middlewares](#query-extensions-versus-middlewares).
+You can use Prisma Client extensions `query` component to create independent clients with customized behavior. You can bind one client to a specific filter or user, and another client to another filter or user. For example, you might do this to get [user isolation](/orm/prisma-client/client-extensions#extended-clients) in a row-level security (RLS) extension. The `query` extension component provides end-to-end type safety for all your custom queries.
 
 </TopBlock>
 
@@ -283,20 +283,3 @@ const transactionExtension = Prisma.defineExtension((prisma) =>
 const prisma = new PrismaClient().$extends(transactionExtension)
 ```
 
-## Query extensions versus middlewares
-
-You can use query extensions or [middlewares](/orm/prisma-client/client-extensions/middleware) to hook into the query life-cycle and modify an incoming query or its result. Client extensions and middlewares differ in the following ways:
-
-- Middlewares always apply globally to the same client. Client extensions are isolated, unless you deliberately combine them. [Learn more about client extensions](/orm/prisma-client/client-extensions#about-prisma-client-extensions).
-  - For example, in a row-level security (RLS) scenario, you can keep each user in an entirely separate client. With middlewares, all users are active in the same client.
-- During application execution, with extensions you can choose from one or more extended clients, or the standard Prisma Client. With middlewares, you cannot choose which client to use, because there is only one global client.
-- Extensions benefit from end-to-end type safety and inference, but middlewares don't.
-
-You can use Prisma Client extensions in all scenarios where middlewares can be used.
-
-### If you use the `query` extension component and middlewares
-
-If you use the `query` extension component and middlewares in your project, then the following rules and priorities apply:
-
-- In your application code, you must declare all your middlewares on the main Prisma Client instance. You cannot declare them on an extended client.
-- In situations where middlewares and extensions with a `query` component execute, Prisma Client executes the middlewares before it executes the extensions with the `query` component. Prisma Client executes the individual middlewares and extensions in the order in which you instantiated them with `$use` or `$extends`.