astro 5.0.0-beta.9 → 5.0.0

package/components/index.ts

@@ -4,5 +4,3 @@
 export { default as Code } from './Code.astro';
 // @ts-ignore
 export { default as Debug } from './Debug.astro';
-// @ts-ignore
-export { default as Welcome } from './Welcome.astro';

package/dist/actions/consts.js

@@ -5,7 +5,7 @@ const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
 const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
 const NOOP_ACTIONS = "\0noop-actions";
 const ACTION_QUERY_PARAMS = {
-  actionName: "_astroAction",
+  actionName: "_action",
   actionPayload: "_astroActionPayload"
 };
 const ACTION_RPC_ROUTE_PATTERN = "/_actions/[...path]";

package/dist/actions/integration.js

@@ -27,7 +27,7 @@ function astroIntegrationActionsRouteHandler({
           throw error;
         }
         const stringifiedActionsImport = JSON.stringify(
-          viteID(new URL("./actions", params.config.srcDir))
+          viteID(new URL("./actions/index.ts", params.config.srcDir))
         );
         settings.injectedTypes.push({
           filename: ACTIONS_TYPES_FILE,

package/dist/assets/endpoint/config.js

@@ -5,11 +5,11 @@ import {
 import { resolveInjectedRoute } from "../../core/routing/manifest/create.js";
 import { getPattern } from "../../core/routing/manifest/pattern.js";
 function injectImageEndpoint(settings, manifest, mode, cwd) {
-  manifest.routes.push(getImageEndpointData(settings, mode, cwd));
+  manifest.routes.unshift(getImageEndpointData(settings, mode, cwd));
 }
 function ensureImageEndpointRoute(settings, manifest, mode, cwd) {
-  if (!manifest.routes.some((route) => route.route === "/_image")) {
-    manifest.routes.push(getImageEndpointData(settings, mode, cwd));
+  if (!manifest.routes.some((route) => route.route === settings.config.image.endpoint.route)) {
+    manifest.routes.unshift(getImageEndpointData(settings, mode, cwd));
   }
 }
 function getImageEndpointData(settings, mode, cwd) {

package/dist/assets/runtime.js

@@ -4,20 +4,11 @@ import {
   spreadAttributes,
   unescapeHTML
 } from "../runtime/server/index.js";
-const ids = /* @__PURE__ */ new WeakMap();
-let counter = 0;
+const countersByPage = /* @__PURE__ */ new WeakMap();
 function createSvgComponent({ meta, attributes, children }) {
-  const rendered = /* @__PURE__ */ new WeakSet();
+  const renderedIds = /* @__PURE__ */ new WeakMap();
   const Component = createComponent((result, props) => {
-    let id;
-    if (ids.has(result)) {
-      id = ids.get(result);
-    } else {
-      counter += 1;
-      ids.set(result, counter);
-      id = counter;
-    }
-    id = `a:${id}`;
+    let counter = countersByPage.get(result) ?? 0;
     const {
       title: titleProp,
       viewBox,
@@ -27,9 +18,12 @@ function createSvgComponent({ meta, attributes, children }) {
     const title = titleProp ? unescapeHTML(`<title>${titleProp}</title>`) : "";
     if (mode === "sprite") {
       let symbol = "";
-      if (!rendered.has(result.response)) {
+      let id = renderedIds.get(result);
+      if (!id) {
+        countersByPage.set(result, ++counter);
+        id = `a:${counter}`;
         symbol = unescapeHTML(`<symbol${spreadAttributes({ viewBox, id })}>${children}</symbol>`);
-        rendered.add(result.response);
+        renderedIds.set(result, id);
       }
       return render`<svg${spreadAttributes(normalizedProps)}>${title}${symbol}<use href="#${id}" /></svg>`;
     }

package/dist/assets/utils/svg.js

@@ -2,7 +2,13 @@ import { parse, renderSync } from "ultrahtml";
 import { dropAttributes } from "../runtime.js";
 function parseSvg(contents) {
   const root = parse(contents);
-  const [{ attributes, children }] = root.children;
+  const svgNode = root.children.find(
+    ({ name, type }) => type === 1 && name === "svg"
+  );
+  if (!svgNode) {
+    throw new Error("SVG file does not contain an <svg> element");
+  }
+  const { attributes, children } = svgNode;
   const body = renderSync({ ...root, children });
   return { attributes, body };
 }

package/dist/assets/utils/vendor/image-size/types/jpg.js

@@ -68,7 +68,7 @@ const JPG = {
     while (input.length) {
       const i = readUInt16BE(input, 0);
       if (input[i] !== 255) {
-        input = input.slice(1);
+        input = input.slice(i);
         continue;
       }
       if (isEXIF(input)) {

package/dist/content/content-layer.js

@@ -114,7 +114,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "5.0.0-beta.9") {
+    if (previousAstroVersion !== "5.0.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -122,8 +122,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.0.0-beta.9") {
-      await this.#store.metaStore().set("astro-version", "5.0.0-beta.9");
+    if ("5.0.0") {
+      await this.#store.metaStore().set("astro-version", "5.0.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/content/utils.js

@@ -292,14 +292,14 @@ function getRelativeEntryPath(entry, collection, contentDir) {
 function getEntryType(entryPath, paths, contentFileExts, dataFileExts) {
   const { ext } = path.parse(entryPath);
   const fileUrl = pathToFileURL(entryPath);
-  if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir)) {
+  if (fileUrl.href === paths.config.url.href) {
+    return "config";
+  } else if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir)) {
     return "ignored";
   } else if (contentFileExts.includes(ext)) {
     return "content";
   } else if (dataFileExts.includes(ext)) {
     return "data";
-  } else if (fileUrl.href === paths.config.url.href) {
-    return "config";
   } else {
     return "ignored";
   }

package/dist/core/app/middlewares.js

@@ -10,20 +10,38 @@ function createOriginCheckMiddleware() {
     if (isPrerendered) {
       return next();
     }
-    const contentType = request.headers.get("content-type");
-    if (contentType) {
-      if (FORM_CONTENT_TYPES.includes(contentType.toLowerCase())) {
-        const forbidden = (request.method === "POST" || request.method === "PUT" || request.method === "PATCH" || request.method === "DELETE") && request.headers.get("origin") !== url.origin;
-        if (forbidden) {
-          return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
-            status: 403
-          });
-        }
+    if (request.method === "GET") {
+      return next();
+    }
+    const sameOrigin = (request.method === "POST" || request.method === "PUT" || request.method === "PATCH" || request.method === "DELETE") && request.headers.get("origin") === url.origin;
+    const hasContentType = request.headers.has("content-type");
+    if (hasContentType) {
+      const formLikeHeader = hasFormLikeHeader(request.headers.get("content-type"));
+      if (formLikeHeader && !sameOrigin) {
+        return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
+          status: 403
+        });
+      }
+    } else {
+      if (!sameOrigin) {
+        return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
+          status: 403
+        });
       }
     }
     return next();
   });
 }
+function hasFormLikeHeader(contentType) {
+  if (contentType) {
+    for (const FORM_CONTENT_TYPE of FORM_CONTENT_TYPES) {
+      if (contentType.toLowerCase().includes(FORM_CONTENT_TYPE)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 export {
   createOriginCheckMiddleware
 };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.0-beta.9";
+const ASTRO_VERSION = "5.0.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.js

@@ -175,7 +175,6 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
           replacement: "astro/components"
         }
       ],
-      conditions: ["astro"],
       // Astro imports in third-party packages should use the same version as root
       dedupe: ["astro"]
     },

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.0-beta.9";
+  const currentVersion = "5.0.0";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -42,7 +42,7 @@ export declare const ClientAddressNotAvailable: {
 /**
  * @docs
  * @see
- * - [Opting-in to pre-rendering](https://docs.astro.build/en/guides/server-side-rendering/#opting-in-to-pre-rendering-in-server-mode)
+ * - [On-demand rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
  * @description
  * The `Astro.clientAddress` property cannot be used inside prerendered routes.
@@ -55,10 +55,10 @@ export declare const PrerenderClientAddressNotAvailable: {
 /**
  * @docs
  * @see
- * - [Enabling SSR in Your Project](https://docs.astro.build/en/guides/server-side-rendering/)
+ * - [Enabling SSR in Your Project](https://docs.astro.build/en/guides/on-demand-rendering/)
  * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#astroclientaddress)
  * @description
- * The `Astro.clientAddress` property is only available when [Server-side rendering](https://docs.astro.build/en/guides/server-side-rendering/) is enabled.
+ * The `Astro.clientAddress` property is only available when [Server-side rendering](https://docs.astro.build/en/guides/on-demand-rendering/) is enabled.
  *
  * To get the user's IP address in static mode, different APIs such as [Ipify](https://www.ipify.org/) can be used in a [Client-side script](https://docs.astro.build/en/guides/client-side-scripts/) or it may be possible to get the user's IP using a serverless function hosted on your hosting provider.
  */
@@ -85,7 +85,7 @@ export declare const NoMatchingStaticPathFound: {
  * @docs
  * @message Route returned a `RETURNED_VALUE`. Only a Response can be returned from Astro files.
  * @see
- * - [Response](https://docs.astro.build/en/guides/server-side-rendering/#response)
+ * - [Response](https://docs.astro.build/en/guides/on-demand-rendering/#response)
  * @description
  * Only instances of [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) can be returned inside Astro files.
  * ```astro title="pages/login.astro"
@@ -314,7 +314,7 @@ export declare const GetStaticPathsInvalidRouteParam: {
  * @see
  * - [Dynamic Routes](https://docs.astro.build/en/guides/routing/#dynamic-routes)
  * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
- * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
+ * - [Server-side Rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * In [Static Mode](https://docs.astro.build/en/guides/routing/#static-ssg-mode), all routes must be determined at build time. As such, dynamic routes must `export` a `getStaticPaths` function returning the different paths to generate.
  */
@@ -339,7 +339,7 @@ export declare const ReservedSlotName: {
 /**
  * @docs
  * @see
- * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
+ * - [Server-side Rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * To use server-side rendering, an adapter needs to be installed so Astro knows how to generate the proper output for your targeted deployment platform.
  */
@@ -352,7 +352,7 @@ export declare const NoAdapterInstalled: {
 /**
  * @docs
  * @see
- * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
+ * - [Server-side Rendering](https://docs.astro.build/en/guides/on-demand-rendering/)
  * @description
  * The currently configured adapter does not support server-side rendering, which is required for the current project setup.
  *

package/dist/core/errors/errors-data.js

@@ -17,7 +17,7 @@ const StaticClientAddressNotAvailable = {
   name: "StaticClientAddressNotAvailable",
   title: "`Astro.clientAddress` is not available in prerendered pages.",
   message: "`Astro.clientAddress` is only available on pages that are server-rendered.",
-  hint: "See https://docs.astro.build/en/guides/server-side-rendering/ for more information on how to enable SSR."
+  hint: "See https://docs.astro.build/en/guides/on-demand-rendering/ for more information on how to enable SSR."
 };
 const NoMatchingStaticPathFound = {
   name: "NoMatchingStaticPathFound",
@@ -29,7 +29,7 @@ const OnlyResponseCanBeReturned = {
   name: "OnlyResponseCanBeReturned",
   title: "Invalid type returned by Astro page.",
   message: (route, returnedValue) => `Route \`${route ? route : ""}\` returned a \`${returnedValue}\`. Only a [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) can be returned from Astro files.`,
-  hint: "See https://docs.astro.build/en/guides/server-side-rendering/#response for more information."
+  hint: "See https://docs.astro.build/en/guides/on-demand-rendering/#response for more information."
 };
 const MissingMediaQueryDirective = {
   name: "MissingMediaQueryDirective",
@@ -106,7 +106,7 @@ const NoAdapterInstalled = {
   name: "NoAdapterInstalled",
   title: "Cannot use Server-side Rendering without an adapter.",
   message: `Cannot use server-rendered pages without an adapter. Please install and configure the appropriate server adapter for your final deployment.`,
-  hint: "See https://docs.astro.build/en/guides/server-side-rendering/ for more information."
+  hint: "See https://docs.astro.build/en/guides/on-demand-rendering/ for more information."
 };
 const AdapterSupportOutputMismatch = {
   name: "AdapterSupportOutputMismatch",

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.0-beta.9";
+  const version = "5.0.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.0.0-beta.9"}`
+        `v${"5.0.0"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/noop-middleware.js

@@ -1,7 +1,8 @@
 import { NOOP_MIDDLEWARE_HEADER } from "../constants.js";
-const NOOP_MIDDLEWARE_FN = (ctx, next) => {
-  ctx.request.headers.set(NOOP_MIDDLEWARE_HEADER, "true");
-  return next();
+const NOOP_MIDDLEWARE_FN = async (_ctx, next) => {
+  const response = await next();
+  response.headers.set(NOOP_MIDDLEWARE_HEADER, "true");
+  return response;
 };
 export {
   NOOP_MIDDLEWARE_FN

package/dist/core/request.js

@@ -28,8 +28,8 @@ function createRequest({
     body: isPrerendered ? null : body
   });
   if (isPrerendered) {
-    const _headers = request.headers;
-    const headersDesc = Object.getOwnPropertyDescriptor(request, "headers") || {};
+    let _headers = request.headers;
+    const { value, writable, ...headersDesc } = Object.getOwnPropertyDescriptor(request, "headers") || {};
     Object.defineProperty(request, "headers", {
       ...headersDesc,
       get() {
@@ -38,6 +38,9 @@ function createRequest({
           `\`Astro.request.headers\` is not available on prerendered pages. If you need access to request headers, make sure that the page is server rendered using \`export const prerender = false;\` or by setting \`output\` to \`"server"\` in your Astro config to make all your pages server rendered.`
         );
         return _headers;
+      },
+      set(newHeaders) {
+        _headers = newHeaders;
       }
     });
   } else if (clientAddress) {

package/dist/core/server-islands/endpoint.js

@@ -2,6 +2,7 @@ import {
   renderComponent,
   renderTemplate
 } from "../../runtime/server/index.js";
+import { isAstroComponentFactory } from "../../runtime/server/render/astro/factory.js";
 import { createSlotValueFromString } from "../../runtime/server/render/slot.js";
 import { decryptString } from "../encryption.js";
 import { getPattern } from "../routing/manifest/pattern.js";
@@ -98,11 +99,19 @@ function createEndpoint(manifest) {
     const propString = await decryptString(key, encryptedProps);
     const props = JSON.parse(propString);
     const componentModule = await imp();
-    const Component = componentModule[data.componentExport];
+    let Component = componentModule[data.componentExport];
     const slots = {};
     for (const prop in data.slots) {
       slots[prop] = createSlotValueFromString(data.slots[prop]);
     }
+    if (isAstroComponentFactory(Component)) {
+      const ServerIsland = Component;
+      Component = function(...args) {
+        return ServerIsland.apply(this, args);
+      };
+      Object.assign(Component, ServerIsland);
+      Component.propagation = "self";
+    }
     return renderTemplate`${renderComponent(result, "Component", Component, props, slots)}`;
   };
   page.isAstroComponentFactory = true;

package/dist/core/sync/index.js

@@ -99,11 +99,15 @@ async function syncInternal({
     });
     await contentLayer.sync();
     settings.timer.end("Sync content layer");
-  } else if (fs.existsSync(fileURLToPath(getContentPaths(settings.config, fs).contentDir))) {
-    settings.injectedTypes.push({
-      filename: CONTENT_TYPES_FILE,
-      content: ""
-    });
+  } else {
+    const paths = getContentPaths(settings.config, fs);
+    if (paths.config.exists || // Legacy collections don't require a config file
+    settings.config.legacy?.collections && fs.existsSync(paths.contentDir)) {
+      settings.injectedTypes.push({
+        filename: CONTENT_TYPES_FILE,
+        content: ""
+      });
+    }
   }
   syncAstroEnv(settings);
   writeInjectedTypes(settings, fs);

package/dist/i18n/middleware.js

@@ -1,4 +1,4 @@
-import { ROUTE_TYPE_HEADER } from "../core/constants.js";
+import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from "../core/constants.js";
 import {
   normalizeTheLocale,
   notFound,
@@ -48,6 +48,10 @@ function createI18nMiddleware(i18n, base, trailingSlash, format) {
   return async (context, next) => {
     const response = await next();
     const type = response.headers.get(ROUTE_TYPE_HEADER);
+    const isReroute = response.headers.get(REROUTE_DIRECTIVE_HEADER);
+    if (isReroute === "no" && typeof i18n.fallback === "undefined") {
+      return response;
+    }
     if (type !== "page" && type !== "fallback") {
       return response;
     }

package/dist/types/public/config.d.ts

@@ -248,7 +248,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      *
      * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssr), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
      *
-     * [See our Server-side Rendering guide](https://docs.astro.build/en/guides/server-side-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
+     * [See our On-demand Rendering guide](https://docs.astro.build/en/guides/on-demand-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
      *
      * ```js
      * import netlify from '@astrojs/netlify';
@@ -1585,7 +1585,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         validateSecrets?: boolean;
     };
     /**
-     * @docs
+     *
      * @kind heading
      * @name Legacy Flags
      * @description
@@ -1595,7 +1595,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      */
     legacy?: {
         /**
-         * @docs
+         *
          * @name legacy.collections
          * @type {boolean}
          * @default `false`
@@ -1632,12 +1632,11 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * export const collections = { blog };
          * ```
          *
-
          */
         collections?: boolean;
     };
     /**
-     * @docs
+     *
      * @kind heading
      * @name Experimental Flags
      * @description
@@ -1646,7 +1645,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      */
     experimental?: {
         /**
-         * @docs
+         *
          * @name experimental.clientPrerender
          * @type {boolean}
          * @default `false`
@@ -1681,7 +1680,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         clientPrerender?: boolean;
         /**
-         * @docs
+         *
          * @name experimental.contentIntellisense
          * @type {boolean}
          * @default `false`
@@ -1704,7 +1703,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         contentIntellisense?: boolean;
         /**
-         * @docs
+         *
          * @name experimental.responsiveImages
          * @type {boolean}
          * @default `undefined`
@@ -1820,7 +1819,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         responsiveImages?: boolean;
         /**
-         * @docs
+         *
          * @name experimental.svg
          * @type {boolean|object}
          * @default `undefined`
@@ -1855,7 +1854,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         svg?: {
             /**
-             * @docs
+             *
              * @name experimental.svg.mode
              * @type {string}
              * @default 'inline'

package/dist/vite-plugin-astro/index.js

@@ -1,4 +1,4 @@
-import { normalizePath } from "vite";
+import { defaultClientConditions, defaultServerConditions, normalizePath } from "vite";
 import { hasSpecialQueries, normalizeFilename } from "../vite-plugin-utils/index.js";
 import { compileAstro } from "./compile.js";
 import { handleHotUpdate } from "./hmr.js";
@@ -17,6 +17,17 @@ function astro({ settings, logger }) {
     name: "astro:build",
     enforce: "pre",
     // run transforms before other plugins can
+    async configEnvironment(name, viteConfig, opts) {
+      viteConfig.resolve ??= {};
+      if (viteConfig.resolve.conditions == null) {
+        if (viteConfig.consumer === "client" || name === "client" || opts.isSsrTargetWebworker) {
+          viteConfig.resolve.conditions = [...defaultClientConditions];
+        } else {
+          viteConfig.resolve.conditions = [...defaultServerConditions];
+        }
+      }
+      viteConfig.resolve.conditions.push("astro");
+    },
     configResolved(viteConfig) {
       compile = (code, filename) => {
         return compileAstro({

package/dist/vite-plugin-astro-server/plugin.js

@@ -3,7 +3,7 @@ import { IncomingMessage } from "node:http";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { warnMissingAdapter } from "../core/dev/adapter-validation.js";
-import { createKey } from "../core/encryption.js";
+import { createKey, getEnvironmentKey, hasEnvironmentKey } from "../core/encryption.js";
 import { getViteErrorPayload } from "../core/errors/dev/index.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { patchOverlay } from "../core/errors/overlay.js";
@@ -151,7 +151,7 @@ function createDevelopmentManifest(settings) {
     i18n: i18nManifest,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     envGetSecretEnabled: false,
-    key: createKey(),
+    key: hasEnvironmentKey() ? getEnvironmentKey() : createKey(),
     middleware() {
       return {
         onRequest: NOOP_MIDDLEWARE_FN

package/dist/vite-plugin-astro-server/request.js

@@ -42,7 +42,6 @@ async function handleRequest({
         url,
         pathname: resolvedPathname,
         body,
-        origin,
         pipeline,
         manifestData,
         incomingRequest,

package/dist/vite-plugin-astro-server/route.d.ts

@@ -16,11 +16,10 @@ type HandleRoute = {
     url: URL;
     pathname: string;
     body: ArrayBuffer | undefined;
-    origin: string;
     manifestData: ManifestData;
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
     pipeline: DevPipeline;
 };
-export declare function handleRoute({ matchedRoute, url, pathname, body, origin, pipeline, manifestData, incomingRequest, incomingResponse, }: HandleRoute): Promise<void>;
+export declare function handleRoute({ matchedRoute, url, pathname, body, pipeline, manifestData, incomingRequest, incomingResponse, }: HandleRoute): Promise<void>;
 export {};

package/dist/vite-plugin-astro-server/route.js

@@ -90,7 +90,6 @@ async function handleRoute({
   url,
   pathname,
   body,
-  origin,
   pipeline,
   manifestData,
   incomingRequest,
@@ -104,11 +103,9 @@ async function handleRoute({
   let request;
   let renderContext;
   let mod = void 0;
-  let options = void 0;
   let route;
   const middleware = (await loadMiddleware(loader)).onRequest;
   const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
-  const filePath = matchedRoute.filePath;
   const { preloadedComponent } = matchedRoute;
   route = matchedRoute.route;
   request = createRequest({
@@ -123,14 +120,6 @@ async function handleRoute({
   for (const [name, value] of Object.entries(config.server.headers ?? {})) {
     if (value) incomingResponse.setHeader(name, value);
   }
-  options = {
-    pipeline,
-    filePath,
-    preload: preloadedComponent,
-    pathname,
-    request,
-    route
-  };
   mod = preloadedComponent;
   renderContext = await RenderContext.create({
     locals,
@@ -184,18 +173,17 @@ async function handleRoute({
   }
   if (statusCode === 404 && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
-    if (options && options.route !== fourOhFourRoute?.route)
-      return handleRoute({
-        ...options,
-        matchedRoute: fourOhFourRoute,
-        url: new URL(pathname, url),
-        body,
-        origin,
+    if (fourOhFourRoute) {
+      renderContext = await RenderContext.create({
+        locals,
         pipeline,
-        manifestData,
-        incomingRequest,
-        incomingResponse
+        pathname,
+        middleware: isDefaultPrerendered404(fourOhFourRoute.route) ? void 0 : middleware,
+        request,
+        routeData: fourOhFourRoute.route
       });
+      response = await renderContext.render(fourOhFourRoute.preloadedComponent);
+    }
   }
   if (isReroute) {
     response.headers.delete(REROUTE_DIRECTIVE_HEADER);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.0-beta.9",
+  "version": "5.0.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -111,7 +111,7 @@
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
     "boxen": "8.0.1",
-    "ci-info": "^4.0.0",
+    "ci-info": "^4.1.0",
     "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.7.2",
@@ -132,7 +132,7 @@
     "http-cache-semantics": "^4.1.1",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.12",
+    "magic-string": "^0.30.14",
     "magicast": "^0.3.5",
     "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
@@ -143,37 +143,37 @@
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.6.3",
-    "shiki": "^1.22.2",
+    "shiki": "^1.23.1",
     "tinyexec": "^0.3.1",
     "tsconfck": "^3.1.4",
     "ultrahtml": "^1.5.3",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
-    "vite": "6.0.0-beta.6",
-    "vitefu": "^1.0.3",
+    "vite": "^6.0.1",
+    "vitefu": "^1.0.4",
     "which-pm": "^3.0.0",
-    "xxhash-wasm": "^1.0.2",
+    "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
     "yocto-spinner": "^0.1.0",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.5",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/markdown-remark": "6.0.0-beta.2",
-    "@astrojs/telemetry": "3.1.0"
+    "@astrojs/internal-helpers": "0.4.2",
+    "@astrojs/markdown-remark": "6.0.0",
+    "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.48.2",
+    "@playwright/test": "^1.49.0",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
     "@types/debug": "^4.1.12",
     "@types/diff": "^5.2.3",
-    "@types/dlv": "^1.1.4",
+    "@types/dlv": "^1.1.5",
     "@types/hast": "^3.0.4",
     "@types/html-escaper": "^3.0.2",
     "@types/http-cache-semantics": "^4.0.4",
@@ -195,15 +195,15 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.24.4",
-    "sass": "^1.80.6",
-    "undici": "^6.20.1",
+    "rollup": "^4.27.4",
+    "sass": "^1.81.0",
+    "undici": "^6.21.0",
     "unified": "^11.0.5",
-    "vitest": "^2.1.1",
+    "vitest": "^2.1.6",
     "astro-scripts": "0.0.14"
   },
   "engines": {
-    "node": "^18.17.1 || ^20.3.0 || >=21.0.0",
+    "node": "^18.17.1 || ^20.3.0 || >=22.0.0",
     "npm": ">=9.6.5",
     "pnpm": ">=7.1.0"
   },

package/components/Welcome.astro

@@ -1,172 +0,0 @@
----
-interface Props {
-	title?: string;
-}
-
-const cards = [
-	{
-		href: 'https://docs.astro.build/',
-		title: 'Documentation',
-		body: 'Learn how Astro works and explore the official API docs.',
-	},
-	{
-		href: 'https://astro.build/integrations/',
-		title: 'Integrations',
-		body: 'Supercharge your project with new frameworks and libraries.',
-	},
-	{
-		href: 'https://astro.build/themes/',
-		title: 'Themes',
-		body: 'Explore a galaxy of community-built starter themes.',
-	},
-	{
-		href: 'https://astro.build/chat/',
-		title: 'Community',
-		body: 'Come say hi to our amazing Discord community. ❤️',
-	},
-];
-
-const { title = 'Welcome to Astro' } = Astro.props;
----
-
-<main>
-	<svg
-		class="astro-a"
-		width="495"
-		height="623"
-		viewBox="0 0 495 623"
-		fill="none"
-		xmlns="http://www.w3.org/2000/svg"
-		aria-hidden="true"
-	>
-		<path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z"
-			fill="url(#paint0_linear_1805_24383)"></path>
-		<defs>
-			<linearGradient
-				id="paint0_linear_1805_24383"
-				x1="247.358"
-				y1="0"
-				x2="247.358"
-				y2="622.479"
-				gradientUnits="userSpaceOnUse"
-			>
-				<stop stop-opacity="0.9"></stop>
-				<stop offset="1" stop-opacity="0.2"></stop>
-			</linearGradient>
-		</defs>
-	</svg>
-	<h1>{title}</h1>
-	<p class="instructions">
-		To get started, open the directory <code>src/pages</code> in your project.<br />
-		<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
-	</p>
-	<ul role="list" class="link-card-grid">
-		{
-			cards.map((card) => (
-				<li class="link-card">
-					<a href={card.href}>
-						<h2>
-							{card.title}
-							<span>&rarr;</span>
-						</h2>
-						<p>{card.body}</p>
-					</a>
-				</li>
-			))
-		}
-	</ul>
-</main>
-
-<style>
-	main {
-		margin: auto;
-		padding: 1rem;
-		width: 800px;
-		max-width: calc(100% - 2rem);
-		color: white;
-		font-size: 20px;
-		line-height: 1.6;
-	}
-	.astro-a {
-		position: absolute;
-		top: -32px;
-		left: 50%;
-		transform: translatex(-50%);
-		width: 220px;
-		height: auto;
-		z-index: -1;
-	}
-	h1 {
-		font-size: 4rem;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		margin-bottom: 1em;
-	}
-	.instructions {
-		margin-bottom: 2rem;
-		border: 1px solid rgba(var(--accent-light), 25%);
-		background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
-		padding: 1.5rem;
-		border-radius: 8px;
-	}
-	.instructions code {
-		font-size: 0.8em;
-		font-weight: bold;
-		background: rgba(var(--accent-light), 12%);
-		color: rgb(var(--accent-light));
-		border-radius: 4px;
-		padding: 0.3em 0.4em;
-	}
-	.instructions strong {
-		color: rgb(var(--accent-light));
-	}
-	.link-card-grid {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-		gap: 2rem;
-		padding: 0;
-	}
-
-	.link-card {
-		list-style: none;
-		display: flex;
-		padding: 1px;
-		background-color: #23262d;
-		background-image: none;
-		background-size: 400%;
-		border-radius: 7px;
-		background-position: 100%;
-		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
-		box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-	}
-	.link-card > a {
-		width: 100%;
-		text-decoration: none;
-		line-height: 1.4;
-		padding: calc(1.5rem - 1px);
-		border-radius: 8px;
-		color: white;
-		background-color: #23262d;
-		opacity: 0.8;
-	}
-	h2 {
-		margin: 0;
-		font-size: 1.25rem;
-		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
-	}
-	p {
-		margin-top: 0.5rem;
-		margin-bottom: 0;
-	}
-	.link-card:is(:hover, :focus-within) {
-		background-position: 0;
-		background-image: var(--accent-gradient);
-	}
-	.link-card:is(:hover, :focus-within) h2 {
-		color: rgb(var(--accent-light));
-	}
-</style>