Skip to content

Commit de54ba7

Browse files
committed
Merge commit '72028b72a7b5ac0465c5959e0e55ce424f267a42' into jun/d1/prisma-tutorial-d2c-button
2 parents 2a4a054 + 72028b7 commit de54ba7

File tree

6 files changed

+34
-20
lines changed

6 files changed

+34
-20
lines changed

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@cloudflare/workers-types": "4.20250601.0",
4040
"@codingheads/sticky-header": "1.0.2",
4141
"@expressive-code/plugin-collapsible-sections": "0.41.2",
42-
"@floating-ui/react": "0.27.8",
42+
"@floating-ui/react": "0.27.12",
4343
"@iarna/toml": "2.2.5",
4444
"@lottiefiles/dotlottie-react": "0.13.5",
4545
"@marsidev/react-turnstile": "1.1.0",
44 KB
Loading

src/content/docs/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/provider-guides/shopify.mdx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ head:
55
- tag: title
66
content: Shopify | Provider guides
77
description: Learn how to configure your zone with Shopify.
8-
98
---
109

11-
import { Render } from "~/components"
10+
import { Render } from "~/components";
1211

1312
<Render file="provider-guide-intro" params={{ one: "Shopify" }} />
1413

@@ -20,6 +19,10 @@ O2O routing also enables you to take advantage of Cloudflare zones specifically
2019

2120
For more details about how O2O is different than other Cloudflare setups, refer to [How O2O works](/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/how-it-works/).
2221

22+
When you [set up O2O routing for your Shopify website](#enable), Cloudflare enables specific configurations for this SaaS provider. Currently, this includes the following:
23+
24+
- Workers and Snippets are disabled on the `/checkout` URI path.
25+
2326
## Enable
2427

2528
You can enable O2O on any Cloudflare zone plan.
@@ -30,14 +33,16 @@ To enable O2O on your account, [create](/dns/manage-dns-records/how-to/create-dn
3033
| ------- | -------------------- | --------------------- | ------------ |
3134
| `CNAME` | `<YOUR_SHOP_DOMAIN>` | `shops.myshopify.com` | Proxied |
3235

33-
:::note
36+
Once you save the new DNS record, the Cloudflare dashboard will show a Shopify icon next to the CNAME record value. For example:
3437

38+
![](~/assets/images/cloudflare-for-platforms/provider-guides/shopify-dns-entry.png)
39+
40+
:::note
3541

3642
For questions about Shopify setup, refer to their [support guide](https://help.shopify.com/en/manual/domains/add-a-domain/connecting-domains/connect-domain-manual).
3743

3844
If you cannot activate your domain using [proxied DNS records](/dns/proxy-status/), reach out to your account team or the [Cloudflare Community](https://community.cloudflare.com).
3945

40-
4146
:::
4247

4348
## Product compatibility

src/content/docs/d1/tutorials/d1-and-prisma-orm/index.mdx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
updated: 2025-05-16
2+
updated: 2025-06-03
33
difficulty: Beginner
44
content_type: Tutorial
55
pcx_content_type: tutorial
@@ -93,14 +93,11 @@ Open your `schema.prisma` file and adjust the `generator` block to reflect as fo
9393
```prisma title="schema.prisma"
9494
generator client {
9595
provider = "prisma-client-js"
96-
+ previewFeatures = ["driverAdapters"]
96+
output = "../src/generated/prisma"
97+
previewFeatures = ["driverAdapters"]
9798
}
9899
```
99100

100-
:::note
101-
Do not specify an `output` destination in the `generator client` block. Instead, allow prisma to generate the files in the default output path.
102-
:::
103-
104101
## 3. Create your D1 database
105102

106103
In this step, you will set up your D1 database. You can create a D1 database via the [Cloudflare dashboard](https://dash.cloudflare.com), or via `wrangler`. This tutorial will use the `wrangler` CLI.
@@ -139,6 +136,8 @@ name = "prisma-d1-example"
139136
main = "src/index.ts"
140137
compatibility_date = "2024-03-20"
141138
compatibility_flags = ["nodejs_compat"]
139+
[observability]
140+
enabled = true
142141

143142
[[d1_databases]]
144143
binding = "DB" # i.e. available in your Worker on env.DB
@@ -156,7 +155,13 @@ Next, you will create a database table in the database to send queries to D1 usi
156155

157156
[Prisma Migrate](https://www.prisma.io/docs/orm/prisma-migrate/understanding-prisma-migrate/overview) does not support D1 yet, so you cannot follow the default migration workflows using `prisma migrate dev` or `prisma db push`.
158157

159-
However, D1 has a [migration system](/d1/reference/migrations), and the Prisma CLI provides tools that allow you to generate SQL statements for schema changes. In the following steps, you will use D1's migration system and the Prisma CLI to create and run a migration against your database.
158+
:::note
159+
160+
Prisma Migrate for D1 is currently in Early Access. If you want to try it out, you can follow the instructions on the [Prisma documentation](https://www.prisma.io/docs/orm/overview/databases/cloudflare-d1#using-prisma-migrate-via-a-driver-adapter-in-prismaconfigts-early-access).
161+
162+
:::
163+
164+
D1 uses [migrations](/d1/reference/migrations) for managing schema changes, and the Prisma CLI can help generate the necessary SQL for those updates. In the steps below, you'll use both tools to create and apply a migration to your database.
160165

161166
First, create a new migration using `wrangler`:
162167

src/content/docs/dns/manage-dns-records/reference/dns-record-types.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ You can use CNAME records to point to other CNAME records (`www.example2.com` --
110110

111111
Cloudflare uses a process called CNAME flattening to deliver better performance. This process supports a few features and can interact with [different setups that depend on CNAME records](/dns/cname-flattening/#aspects-to-keep-in-mind). Refer to the [CNAME flattening section](/dns/cname-flattening/) to learn more about this.
112112

113+
:::note
114+
Specific CNAME record values with traffic proxied through Cloudflare will enable Orange-to-Orange (O2O) routing for the Shopify SaaS provider. Refer to the [Shopify provider guide](/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/provider-guides/shopify/) for more information.
115+
:::
116+
113117
#### Example API call
114118

115119
When creating CNAME records [using the API](/dns/manage-dns-records/how-to/create-dns-records/#create-dns-records):

0 commit comments

Comments
 (0)