Merge branch 'v6' into v5-link

sarah11918 · web-flow · commit 3c041e12f962 · 2026-03-09T14:44:13.000-03:00
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,5 @@
 <!-- Thank you for opening a PR! We really appreciate you taking the time to help out 🙌 -->
 
-<!-- 🚨 IMPORTANT INFO AS WE PREPARE FOR v6 🚨 -->
-<!-- We are only accepting emergency fixes for v5 docs (typos, links etc.) -->
-<!-- All new feature documentation PRs must use the `v6` branch  -->
-<!-- No new translations will be accepted until v6 is released -->
-
 #### Description (required)
 
 <!-- Please describe the change you are proposing, and why -->
@@ -20,7 +15,7 @@
 <!-- 1. Uncomment the line below, update the minor version number if known, and include a PR link -->
 <!-- #### For Astro version: `6.x`. See astro PR [#](url). -->
 
-<!-- 2. Check that your PR includes `<p><Since v="4.x.0" /></p>` and imports the `<Since>` component, if necessary! -->
+<!-- 2. Check that your PR includes `<p><Since v="6.x.x" /></p>` and imports the `<Since>` component, if necessary! -->
 
 <!-- #### First-time contributor to Astro Docs? -->
 
diff --git a/public/_redirects b/public/_redirects
@@ -44,7 +44,13 @@
 /:lang/guides/deploy/google-firebase/                /:lang/guides/deploy/firebase/
 /:lang/guides/backend/google-firebase/               /:lang/guides/backend/firebase/
 /:lang/guides/backend/appwriteio/                    /:lang/guides/backend/appwrite/
-
+/:lang/reference/experimental-flags/csp/             /:lang/reference/configuration-reference/#securitycsp
+/:lang/reference/experimental-flags/fail-on-prerender-conflict/  /:lang/reference/configuration-reference/#prerenderconflictbehavior
+/:lang/reference/experimental-flags/fonts/           /:lang/guides/fonts/
+/:lang/reference/experimental-flags/heading-id-compat/           /:lang/guides/markdown-content/#heading-ids
+/:lang/reference/experimental-flags/live-content-collections/    /:lang/guides/content-collections/#live-content-collections
+/:lang/reference/experimental-flags/preserve-scripts-order/      /:lang/guides/client-side-scripts/
+/:lang/reference/experimental-flags/static-import-meta-env/      /:lang/guides/environment-variables/
 
 # Very old docs site redirects
 # Once upon a time these URLs existed, so we try to keep them meaning something.
diff --git a/src/content/docs/en/guides/integrations-guide/cloudflare.mdx b/src/content/docs/en/guides/integrations-guide/cloudflare.mdx
@@ -454,6 +454,36 @@ This change helps you catch issues during development that would have previously
 
 This change is transparent for most projects. If your project had special configuration for `astro dev` or was relying on Node.js-specific behavior in development, adjust your code or configuration accordingly.
 
+### Some dependencies might need to be pre-compiled
+
+The new workerd environment does not support CommonJS syntax, including Node.js specific syntax such as `require` and `module.exports`. This means that some of your project dependencies may throw errors in the development server or during the build.
+
+If you have control over the dependency, you can create a Vite plugin and pre-compile the dependency using the `optimiseDeps.include` option.
+
+For example, you can create a Vite plugin to pre-compile the dependency `postcss` in order to use the Expressive Code syntax highlighter:
+
+```js ins={8-14}
+function noExternalPlugin() {
+  return {
+    name: "optimise-dependencies",
+    configEnvironment(environment) {
+      // We're only interested in server environments
+      if (environment !== 'client') {
+        return {
+          optimizeDeps: {
+            include: [
+              "postcss"
+              // Or you can use this syntax if you don't depend directly on a dependency
+              // "expressive-code > postcss"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
+```
+
 ### Changed: Wrangler entrypoint configuration
 
 Previously, the `main` field in your Wrangler configuration pointed to the built worker file (e.g. `dist/_worker.js/index.js`). With Astro 6, this has changed to point to a new unified entrypoint provided by the Cloudflare adapter: `@astrojs/cloudflare/entrypoints/server`.
