reference for withastro/astro#15153

astro.sidebar.ts

@@ -90,6 +90,7 @@ export const sidebar = [
 					group('guides.upgrade.major', {
 						collapsed: true,
 						items: [
+							'guides/upgrade-to/v6',
 							'guides/upgrade-to/v5',
 							'guides/upgrade-to/v4',
 							'guides/upgrade-to/v3',
@@ -136,24 +137,18 @@ export const sidebar = [
 					'reference/content-loader-reference',
 					'reference/image-service-reference',
 					'reference/dev-toolbar-app-reference',
+					'reference/session-driver-reference',
 					'reference/container-reference',
 					'reference/programmatic-reference',
 				],
 			}),
 			group('reference.experimental', {
 				items: [
 					'reference/experimental-flags',
-					'reference/experimental-flags/csp',
 					'reference/experimental-flags/fonts',
-					'reference/experimental-flags/live-content-collections',
 					'reference/experimental-flags/client-prerender',
 					'reference/experimental-flags/content-intellisense',
-					'reference/experimental-flags/preserve-scripts-order',
-					'reference/experimental-flags/heading-id-compat',
-					'reference/experimental-flags/static-import-meta-env',
 					'reference/experimental-flags/chrome-devtools-workspace',
-					'reference/experimental-flags/fail-on-prerender-conflict',
-					'reference/experimental-flags/svg-optimization',
 				],
 			}),
 			'reference/legacy-flags',

public/_headers

@@ -2,3 +2,7 @@
   cache-control: max-age=31536000
   cache-control: immutable
   cache-control: public
+
+# TODO: Remove this before merging to main
+/*
+  x-robots-tag: no-index

src/content/docs/de/basics/project-structure.mdx

@@ -125,7 +125,7 @@ Eine Anleitung zur Erstellung einer neuen `package.json`-Datei für dein Projekt
 
 Diese Datei wird von jeder Starter-Vorlage generiert und enthält Konfigurations­optionen für dein Astro-Projekt. Hier kannst du die zu verwendenden Integrationen, Build-Optionen, Serveroptionen und mehr angeben.
 
-Astro unterstützt mehrere Dateiformate für seine JavaScript-Konfigurationsdatei: `astro.config.js`, `astro.config.mjs`, `astro.config.cjs` und `astro.config.ts`. Wir empfehlen, in den meisten Fällen `.mjs` oder `.ts` zu verwenden, wenn du TypeScript in deiner Konfigurationsdatei schreiben willst.
+Astro unterstützt mehrere Dateiformate für seine JavaScript-Konfigurationsdatei: `astro.config.js`, `astro.config.mjs` und `astro.config.ts`. Wir empfehlen, in den meisten Fällen `.mjs` oder `.ts` zu verwenden, wenn du TypeScript in deiner Konfigurationsdatei schreiben willst.
 
 Das Laden von TypeScript-Konfigurationsdateien wird mit [`tsm`](https://github.com/lukeed/tsm) gehandhabt und berücksichtigt die `tsconfig`-Optionen deines Projekts.
 

src/content/docs/de/tutorial/6-islands/4.mdx

@@ -120,7 +120,6 @@ Aktualisiere Astro und alle Integrationen auf die neuesten Versionen, indem du i
     ```ts title="src/content.config.ts"
     import { glob } from "astro/loaders";
     import { defineCollection } from "astro:content";
-    // Importiere Zod
     import { z } from "astro/zod";
 
     const blog = defineCollection({
@@ -150,7 +149,7 @@ Aktualisiere Astro und alle Integrationen auf die neuesten Versionen, indem du i
 1. Erstelle eine neue Seiten­datei `src/pages/posts/[...slug].astro`.  
    Markdown- und MDX-Dateien werden innerhalb einer Sammlung nicht mehr automatisch zu Seiten. Du musst daher eine Seite erstellen, die für die Ausgabe jedes einzelnen Blogbeitrags verantwortlich ist.
 
-2. Füge den folgenden Code ein, um deine Sammlung [abzufragen](/de/guides/content-collections/#querying-collections) und für jede generierte Seite die `slug` und den Seiteninhalt bereitzustellen:
+2. Füge den folgenden Code ein, um deine Sammlung [abzufragen](/de/guides/content-collections/#querying-build-time-collections) und für jede generierte Seite die `slug` und den Seiteninhalt bereitzustellen:
 
     ```astro title="src/pages/posts/[...slug].astro"
     ---

src/content/docs/en/basics/project-structure.mdx

@@ -124,7 +124,7 @@ For help creating a new `package.json` file for your project, check out the [man
 
 This file is generated in every starter template and includes configuration options for your Astro project. Here you can specify integrations to use, build options, server options, and more.
 
-Astro supports several file formats for its JavaScript configuration file: `astro.config.js`, `astro.config.mjs`, `astro.config.cjs` and `astro.config.ts`. We recommend using `.mjs` in most cases or `.ts` if you want to write TypeScript in your config file.
+Astro supports several file formats for its JavaScript configuration file: `astro.config.js`, `astro.config.mjs` and `astro.config.ts`. We recommend using `.mjs` in most cases or `.ts` if you want to write TypeScript in your config file.
 
 TypeScript config file loading is handled using [`tsm`](https://github.com/lukeed/tsm) and will respect your project's `tsconfig` options.
 

src/content/docs/en/getting-started.mdx

@@ -5,6 +5,9 @@ i18nReady: true
 tableOfContents: false
 editUrl: false
 next: false
+banner:
+  content: |
+    Astro v6 is here! <a href="/en/guides/upgrade-to/v6/">Learn how to upgrade your site</a>
 hero:
   title: Astro Docs
   tagline: Guides, resources, and API references to help you build with Astro.

src/content/docs/en/guides/actions.mdx

@@ -329,14 +329,14 @@ export const server = {
         // Matches when the `type` field has the value `create`
         type: z.literal('create'),
         name: z.string(),
-        email: z.string().email(),
+        email: z.email(),
       }),
       z.object({
         // Matches when the `type` field has the value `update`
         type: z.literal('update'),
         id: z.number(),
         name: z.string(),
-        email: z.string().email(),
+        email: z.email(),
       }),
     ]),
     async handler(input) {
@@ -374,7 +374,7 @@ The following example shows a validated newsletter registration form that accept
     </form>
     ```
 
-2. Define a `newsletter` action to handle the submitted form. Validate the `email` field using the `z.string().email()` validator, and the `terms` checkbox using `z.boolean()`:
+2. Define a `newsletter` action to handle the submitted form. Validate the `email` field using the `z.email()` validator, and the `terms` checkbox using `z.boolean()`:
 
     ```ts title="src/actions/index.ts" ins={5-12}
     import { defineAction } from 'astro:actions';
@@ -384,7 +384,7 @@ The following example shows a validated newsletter registration form that accept
       newsletter: defineAction({
         accept: 'form',
         input: z.object({
-          email: z.string().email(),
+          email: z.email(),
           terms: z.boolean(),
         }),
         handler: async ({ email, terms }) => { /* ... */ },

src/content/docs/en/guides/cms/cloudcannon.mdx

@@ -141,7 +141,7 @@ The following example will create a new blog post from the CloudCannon Site Dash
 
 ## Rendering CloudCannon content
 
-Use Astro's Content Collections API to [query and display your posts and collections](/en/guides/content-collections/#querying-collections), just as you would in any Astro project.
+Use Astro's Content Collections API to [query and display your posts and collections](/en/guides/content-collections/#querying-build-time-collections), just as you would in any Astro project.
 
 ### Displaying a collection list
 

src/content/docs/en/guides/cms/keystatic.mdx

@@ -183,7 +183,7 @@ Visit `http://127.0.0.1:4321/keystatic` in the browser to see the Keystatic Admi
 
 ## Rendering Keystatic content
 
-Use Astro's Content Collections API to [query and display your posts and collections](/en/guides/content-collections/#querying-collections), just as you would in any Astro project.
+[Query and display your posts and collections](/en/guides/content-collections/#querying-build-time-collections), just as you would in any Astro project.
 
 ### Displaying a collection list
 

src/content/docs/en/guides/configuring-astro.mdx

@@ -26,7 +26,7 @@ export default defineConfig({
 
 It is only required if you have something to configure, but most projects will use this file. The `defineConfig()` helper provides automatic IntelliSense in your IDE and is where you will add all your configuration options to tell Astro how to build and render your project to HTML.
 
-We recommend using the default file format `.mjs` in most cases, or `.ts` if you want to write TypeScript in your config file. However, `astro.config.js` and `astro.config.cjs` are also supported.
+We recommend using the default file format `.mjs` in most cases, or `.ts` if you want to write TypeScript in your config file. However, `astro.config.js` is also supported.
 
 <ReadMore>Read Astro's [configuration reference](/en/reference/configuration-reference/) for a full overview of all supported configuration options.</ReadMore>