Resolving merge conflict

Author: Oxyjun

public/__redirects

@@ -1591,6 +1591,8 @@
 /workers/testing/vitest-integration/get-started/migrate-from-miniflare-2/ /workers/testing/vitest-integration/migration-guides/migrate-from-miniflare-2/ 301
 /workers/testing/vitest-integration/get-started/migrate-from-unstable-dev/ /workers/testing/vitest-integration/migration-guides/migrate-from-unstable-dev/ 301
 /workers/testing/vitest-integration/get-started/write-your-first-test/ /workers/testing/vitest-integration/write-your-first-test/ 301
+/workers/databases/native-integrations/fauna/ /workers/databases/native-integrations/ 301
+/workers/tutorials/store-data-with-fauna/ https://fauna.com/blog/the-future-of-fauna 301
 
 # workers ai
 /workers-ai/models/llm/ /workers-ai/models/#text-generation 301

src/components/ProductFeatures.astro

@@ -29,12 +29,12 @@ const entries = Object.entries(plan);
 				<h3>{value.title}</h3>
 				{value.link && (
 					<p>
-						<strong>Link: </strong>
-						<a href={value.link}>{value.title}</a>
+						<!-- prettier-ignore -->
+						<strong>Link:</strong>{" "}<a href={value.link}>{value.title}</a>
 					</p>
 				)}
 				{Object.values(value.properties).map((value: any) => (
-					<p>
+					<div>
 						<strong
 							set:html={marked.parseInline(
 								value.title === "Availability"
@@ -46,27 +46,27 @@ const entries = Object.entries(plan);
 							<p>{value.summary}</p>
 						)}
 						<ul>
-							{value.free && (
+							{value.free !== undefined && (
 								<li>
-									<strong>Free: </strong>
+									<strong>Free:</strong>{" "}
 									<Fragment
 										set:html={marked.parseInline(value.free.toString())}
 									/>
 								</li>
 							)}
 							{additional_descriptions && (
 								<>
-									{value.lite ? (
+									{value.lite !== undefined ? (
 										<li>
-											<strong>Lite: </strong>
+											<strong>Lite:</strong>{" "}
 											<Fragment
 												set:html={marked.parseInline(value.lite.toString())}
 											/>
 										</li>
 									) : (
-										value.free && (
+										value.free !== undefined && (
 											<li>
-												<strong>Lite: </strong>
+												<strong>Lite:</strong>{" "}
 												<Fragment
 													set:html={marked.parseInline(value.free.toString())}
 												/>
@@ -75,27 +75,27 @@ const entries = Object.entries(plan);
 									)}
 								</>
 							)}
-							{value.pro && (
+							{value.pro !== undefined && (
 								<li>
-									<strong>Pro: </strong>
+									<strong>Pro:</strong>{" "}
 									<Fragment
 										set:html={marked.parseInline(value.pro.toString())}
 									/>
 								</li>
 							)}
 							{additional_descriptions && (
 								<>
-									{value.pro_plus ? (
+									{value.pro_plus !== undefined ? (
 										<li>
-											<strong>Pro Plus: </strong>
+											<strong>Pro Plus:</strong>{" "}
 											<Fragment
 												set:html={marked.parseInline(value.pro_plus.toString())}
 											/>
 										</li>
 									) : (
-										value.pro && (
+										value.pro !== undefined && (
 											<li>
-												<strong>Pro Plus: </strong>
+												<strong>Pro Plus:</strong>{" "}
 												<Fragment
 													set:html={marked.parseInline(value.pro.toString())}
 												/>
@@ -104,24 +104,24 @@ const entries = Object.entries(plan);
 									)}
 								</>
 							)}
-							{value.biz && (
+							{value.biz !== undefined && (
 								<li>
-									<strong>Business: </strong>
+									<strong>Business:</strong>{" "}
 									<Fragment
 										set:html={marked.parseInline(value.biz.toString())}
 									/>
 								</li>
 							)}
-							{value.ent && (
+							{value.ent !== undefined && (
 								<li>
-									<strong>Enterprise: </strong>
+									<strong>Enterprise:</strong>{" "}
 									<Fragment
 										set:html={marked.parseInline(value.ent.toString())}
 									/>
 								</li>
 							)}
 						</ul>
-					</p>
+					</div>
 				))}
 			</div>
 		);

src/components/WorkerStarter.astro

@@ -17,6 +17,6 @@ const link = `https://github.com/${repo}`;
 <p>{description}</p>
 <PackageManagers
 	type="create"
-	pkg="cloudflare@latest my-app"
-	args=`--template ${repo}`
+	pkg="cloudflare@latest"
+	args=`my-app --template ${repo}`
 />

src/content/docs/cloudflare-one/policies/access/app-paths.mdx

@@ -83,6 +83,10 @@ Using a wildcard in the middle of the **Path** field covers multiple segments of
 
 Port numbers are not supported in Access application paths. If a request includes a port number in the URL, Access will strip the port number and redirect the request to the default HTTP/HTTPS port.
 
+### Query strings
+
+Query strings (such as`?foo=bar`) are not supported in Access application paths.
+
 ### Anchor links
 
 Since anchor links are processed by the browser and not the server, Access applications do not support `#` characters in the URL. For example, requests to `dashboard.com/#settings` will redirect to `dashboard.com`.

src/content/docs/hyperdrive/get-started.mdx

@@ -107,7 +107,7 @@ Hyperdrive accepts the combination of these parameters in the common connection
 <Tabs>
 	<TabItem label="PostgreSQL">
 		```txt
-		
+
 		postgres://USERNAME:PASSWORD@HOSTNAME_OR_IP_ADDRESS:PORT/database_name
 
     	```
@@ -292,11 +292,11 @@ export default {
 		// Create a connection using the mysql2 driver (or any support driver, ORM or query builder)
 		// with the Hyperdrive credentials. These credentials are only accessible from your Worker.
 		const connection = await createConnection({
-			host: env.DB_HOST,
-			user: env.DB_USER,
-			password: env.DB_PASSWORD,
-			database: env.DB_NAME,
-			port: env.DB_PORT
+			host: env.HYPERDRIVE.host,
+			user: env.HYPERDRIVE.user,
+			password: env.HYPERDRIVE.password,
+			database: env.HYPERDRIVE.database,
+			port: env.HYPERDRIVE.port
 
 			// The following line is needed for mysql2 compatibility with Workers
 			// mysql2 uses eval() to optimize result parsing for rows with > 100 columns

src/content/docs/learning-paths/warp-overview-course/series/warp-basics-1.mdx

@@ -15,7 +15,7 @@ import { Render, Tabs, TabItem, Stream, Card } from "~/components";
 
     <Card>
         <Stream
-        id="b3a5245bbaae45efdfc5a873837e6dd4"
+        id="31178cc41d0ec56d42ef892160589635"
         title="Understand the Cloudflare WARP basics"
         thumbnail="https://pub-d9bf66e086fb4b639107aa52105b49dd.r2.dev/Understand-Cloudflare-WARP-Basics%20thumbnail.png"
         showMoreVideos={false}

src/content/docs/pages/framework-guides/deploy-a-docusaurus-site.mdx

@@ -15,8 +15,8 @@ To use `create-cloudflare` to create a new Docusaurus project, run the following
 
 <PackageManagers
 	type="create"
-	pkg="cloudflare@latest my-docusaurus-app"
-	args="--framework=docusaurus --platform=pages"
+	pkg="cloudflare@latest"
+	args="my-docusaurus-app --framework=docusaurus --platform=pages"
 />
 
 `create-cloudflare` will install additional dependencies, including the [Wrangler](/workers/wrangler/install-and-update/#check-your-wrangler-version) CLI and any necessary adapters, and ask you setup questions.

src/content/docs/pages/framework-guides/deploy-a-nuxt-site.mdx

@@ -34,8 +34,8 @@ The [`create-cloudflare` CLI (C3)](/pages/get-started/c3/) will configure your N
 
 <PackageManagers
 	type="create"
-	pkg="cloudflare@latest my-nuxt-app"
-	args="--framework=nuxt --platform=pages"
+	pkg="cloudflare@latest"
+	args="my-nuxt-app --framework=nuxt --platform=pages"
 />
 
 C3 will ask you a series of setup questions and create a new project with [`nuxi` (the official Nuxt CLI)](https://github.com/nuxt/cli). C3 will also install the necessary adapters along with the [Wrangler CLI](/workers/wrangler/install-and-update/#check-your-wrangler-version).

src/content/docs/pages/framework-guides/deploy-a-qwik-site.mdx

@@ -17,8 +17,8 @@ To use `create-cloudflare` to create a new Qwik project, run the following comma
 
 <PackageManagers
 	type="create"
-	pkg="cloudflare@latest my-qwik-app"
-	args="--framework=qwik --platform=pages"
+	pkg="cloudflare@latest"
+	args="my-qwik-app --framework=qwik --platform=pages"
 />
 
 `create-cloudflare` will install additional dependencies, including the [Wrangler CLI](/workers/wrangler/install-and-update/#check-your-wrangler-version) and any necessary adapters, and ask you setup questions.

src/content/docs/pages/framework-guides/deploy-a-react-site.mdx

@@ -17,8 +17,8 @@ To use `create-cloudflare` to create a new React project, run the following comm
 
 <PackageManagers
 	type="create"
-	pkg="cloudflare@latest my-react-app"
-	args="--framework=react --platform=pages"
+	pkg="cloudflare@latest"
+	args="my-react-app --framework=react --platform=pages"
 />
 
 `create-cloudflare` will install dependencies, including the [Wrangler](/workers/wrangler/install-and-update/#check-your-wrangler-version) CLI and the Cloudflare Pages adapter, and ask you setup questions.