astro 5.5.3 → 5.5.5

package/dist/actions/noop-actions.d.ts

@@ -0,0 +1,2 @@
+import type { SSRActions } from '../core/app/types.js';
+export declare const NOOP_ACTIONS_MOD: SSRActions;

package/dist/actions/noop-actions.js

@@ -0,0 +1,6 @@
+const NOOP_ACTIONS_MOD = {
+  server: {}
+};
+export {
+  NOOP_ACTIONS_MOD
+};

package/dist/content/content-layer.js

@@ -153,7 +153,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.5.3") {
+    if (previousAstroVersion && previousAstroVersion !== "5.5.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -161,8 +161,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.5.3") {
-      await this.#store.metaStore().set("astro-version", "5.5.3");
+    if ("5.5.5") {
+      await this.#store.metaStore().set("astro-version", "5.5.5");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/index.js

@@ -1,6 +1,7 @@
 import { collapseDuplicateTrailingSlashes, hasFileExtension } from "@astrojs/internal-helpers/path";
 import { normalizeTheLocale } from "../../i18n/index.js";
 import {
+  DEFAULT_404_COMPONENT,
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,
   clientAddressSymbol,
@@ -36,7 +37,6 @@ class App {
   #baseWithoutTrailingSlash;
   #pipeline;
   #adapterLogger;
-  #renderOptionsDeprecationWarningShown = false;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
     this.#manifestData = {
@@ -195,12 +195,20 @@ class App {
     const redirect = this.#redirectTrailingSlash(url.pathname);
     if (redirect !== url.pathname) {
       const status = request.method === "GET" ? 301 : 308;
-      return new Response(redirectTemplate({ status, location: redirect, from: request.url }), {
-        status,
-        headers: {
-          location: redirect + url.search
+      return new Response(
+        redirectTemplate({
+          status,
+          relativeLocation: url.pathname,
+          absoluteLocation: redirect,
+          from: request.url
+        }),
+        {
+          status,
+          headers: {
+            location: redirect + url.search
+          }
         }
-      });
+      );
     }
     addCookieHeader = renderOptions?.addCookieHeader;
     clientAddress = renderOptions?.clientAddress ?? Reflect.get(request, clientAddressSymbol);
@@ -226,6 +234,11 @@ class App {
       this.#logger.debug("router", "Astro matched the following route for " + request.url);
       this.#logger.debug("router", "RouteData:\n" + routeData);
     }
+    if (!routeData) {
+      routeData = this.#manifestData.routes.find(
+        (route) => route.component === "404.astro" || route.component === DEFAULT_404_COMPONENT
+      );
+    }
     if (!routeData) {
       this.#logger.debug("router", "Astro hasn't found routes that match " + request.url);
       this.#logger.debug("router", "Here's the available routes:\n", this.#manifestData);

package/dist/core/app/types.d.ts

@@ -67,7 +67,7 @@ export type SSRManifest = {
     key: Promise<CryptoKey>;
     i18n: SSRManifestI18n | undefined;
     middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
-    actions?: SSRActions;
+    actions?: () => Promise<SSRActions> | SSRActions;
     checkOrigin: boolean;
     sessionConfig?: ResolvedSessionConfig<any>;
     cacheDir: string | URL;

package/dist/core/base-pipeline.d.ts

@@ -51,7 +51,7 @@ export declare abstract class Pipeline {
         route: string;
         component: string;
     }[];
-    readonly actions: SSRActions | undefined;
+    readonly actions: (() => Promise<SSRActions> | SSRActions) | undefined;
     readonly internalMiddleware: MiddlewareHandler[];
     resolvedMiddleware: MiddlewareHandler | undefined;
     resolvedActions: SSRActions | undefined;
@@ -81,7 +81,7 @@ export declare abstract class Pipeline {
         matchesComponent(filePath: URL): boolean;
         route: string;
         component: string;
-    }[], actions?: SSRActions | undefined);
+    }[], actions?: (() => Promise<SSRActions> | SSRActions) | undefined);
     abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
     abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
     /**

package/dist/core/base-pipeline.js

@@ -1,3 +1,4 @@
+import { NOOP_ACTIONS_MOD } from "../actions/noop-actions.js";
 import { createI18nMiddleware } from "../i18n/middleware.js";
 import { createOriginCheckMiddleware } from "./app/middlewares.js";
 import { ActionNotFoundError } from "./errors/errors-data.js";
@@ -63,9 +64,9 @@ class Pipeline {
     if (this.resolvedActions) {
       return this.resolvedActions;
     } else if (this.actions) {
-      return this.actions;
+      return await this.actions();
     }
-    return { server: {} };
+    return NOOP_ACTIONS_MOD;
   }
   async getAction(path) {
     const pathKeys = path.split(".").map((key) => decodeURIComponent(key));

package/dist/core/build/generate.js

@@ -3,6 +3,7 @@ import os from "node:os";
 import { bgGreen, black, blue, bold, dim, green, magenta, red, yellow } from "kleur/colors";
 import PLimit from "p-limit";
 import PQueue from "p-queue";
+import { NOOP_ACTIONS_MOD } from "../../actions/noop-actions.js";
 import {
   generateImagesForPath,
   getStaticImageList,
@@ -44,7 +45,7 @@ async function generatePages(options, internals) {
     const renderersEntryUrl = new URL("renderers.mjs", baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
     const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => mod.onRequest) : NOOP_MIDDLEWARE_FN;
-    const actions = internals.astroActionsEntryPoint ? await import(internals.astroActionsEntryPoint.toString()).then((mod) => mod) : { server: {} };
+    const actions = internals.astroActionsEntryPoint ? await import(internals.astroActionsEntryPoint.toString()).then((mod) => mod) : NOOP_ACTIONS_MOD;
     manifest = createBuildManifest(
       options.settings,
       internals,
@@ -327,7 +328,12 @@ async function generatePath(pathname, pipeline, gopts, route) {
     const siteURL = config.site;
     const location = siteURL ? new URL(locationSite, siteURL) : locationSite;
     const fromPath = new URL(request.url).pathname;
-    body = redirectTemplate({ status: response.status, location, from: fromPath });
+    body = redirectTemplate({
+      status: response.status,
+      absoluteLocation: location,
+      relativeLocation: locationSite,
+      from: fromPath
+    });
     if (config.compressHTML === true) {
       body = body.replaceAll("\n", "");
     }
@@ -400,7 +406,7 @@ function createBuildManifest(settings, internals, renderers, middleware, actions
         onRequest: middleware
       };
     },
-    actions,
+    actions: () => actions,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
     key
   };

package/dist/core/build/plugins/plugin-ssr.js

@@ -139,7 +139,6 @@ function generateSSRCode(adapter, middlewareId) {
   const edgeMiddleware = adapter?.adapterFeatures?.edgeMiddleware ?? false;
   const imports = [
     `import { renderers } from '${RENDERERS_MODULE_ID}';`,
-    `import * as actions from '${ASTRO_ACTIONS_INTERNAL_MODULE_ID}';`,
     `import * as serverEntrypointModule from '${ADAPTER_VIRTUAL_MODULE_ID}';`,
     `import { manifest as defaultManifest } from '${SSR_MANIFEST_VIRTUAL_MODULE_ID}';`,
     `import { serverIslandMap } from '${VIRTUAL_ISLAND_MAP_ID}';`
@@ -150,7 +149,7 @@ function generateSSRCode(adapter, middlewareId) {
     `    pageMap,`,
     `    serverIslandMap,`,
     `    renderers,`,
-    `    actions,`,
+    `    actions: () => import("${ASTRO_ACTIONS_INTERNAL_MODULE_ID}"),`,
     `    middleware: ${edgeMiddleware ? "undefined" : `() => import("${middlewareId}")`}`,
     `});`,
     `const _args = ${adapter.args ? JSON.stringify(adapter.args, null, 4) : "undefined"};`,

package/dist/core/config/vite-load.js

@@ -24,6 +24,9 @@ async function loadConfigWithVite({
       const config = await import(pathToFileURL(configPath).toString() + "?t=" + Date.now());
       return config.default ?? {};
     } catch (e) {
+      if (e && typeof e === "object" && "code" in e && e.code === "ERR_DLOPEN_DISABLED") {
+        throw e;
+      }
       debug("Failed to load config with Node", e);
     }
   }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.5.3";
+const ASTRO_VERSION = "5.5.5";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/cookies/cookies.d.ts

@@ -1,5 +1,5 @@
-import type { CookieSerializeOptions } from 'cookie';
-export type AstroCookieSetOptions = Pick<CookieSerializeOptions, 'domain' | 'path' | 'expires' | 'maxAge' | 'httpOnly' | 'sameSite' | 'secure' | 'encode'>;
+import type { SerializeOptions } from 'cookie';
+export type AstroCookieSetOptions = Pick<SerializeOptions, 'domain' | 'path' | 'expires' | 'maxAge' | 'httpOnly' | 'sameSite' | 'secure' | 'encode'>;
 export interface AstroCookieGetOptions {
     decode?: (value: string) => string;
 }
@@ -45,9 +45,10 @@ declare class AstroCookies implements AstroCookiesInterface {
      * Astro.cookies.has(key) returns a boolean indicating whether this cookie is either
      * part of the initial request or set via Astro.cookies.set(key)
      * @param key The cookie to check for.
+     * @param _options This parameter is no longer used.
      * @returns
      */
-    has(key: string, options?: AstroCookieGetOptions | undefined): boolean;
+    has(key: string, _options?: AstroCookieGetOptions): boolean;
     /**
      * Astro.cookies.set(key, value) is used to set a cookie's value. If provided
      * an object it will be stringified via JSON.stringify(value). Additionally you

package/dist/core/cookies/cookies.js

@@ -3,6 +3,7 @@ import { AstroError, AstroErrorData } from "../errors/index.js";
 const DELETED_EXPIRATION = /* @__PURE__ */ new Date(0);
 const DELETED_VALUE = "deleted";
 const responseSentSymbol = Symbol.for("astro.responseSent");
+const identity = (value) => value;
 class AstroCookie {
   constructor(value) {
     this.value = value;
@@ -73,25 +74,29 @@ class AstroCookies {
         return void 0;
       }
     }
-    const values = this.#ensureParsed(options);
+    const decode = options?.decode ?? decodeURIComponent;
+    const values = this.#ensureParsed();
     if (key in values) {
       const value = values[key];
-      return new AstroCookie(value);
+      if (value) {
+        return new AstroCookie(decode(value));
+      }
     }
   }
   /**
    * Astro.cookies.has(key) returns a boolean indicating whether this cookie is either
    * part of the initial request or set via Astro.cookies.set(key)
    * @param key The cookie to check for.
+   * @param _options This parameter is no longer used.
    * @returns
    */
-  has(key, options = void 0) {
+  has(key, _options) {
     if (this.#outgoing?.has(key)) {
       let [, , isSetValue] = this.#outgoing.get(key);
       return isSetValue;
     }
-    const values = this.#ensureParsed(options);
-    return !!values[key];
+    const values = this.#ensureParsed();
+    return values[key] !== void 0;
   }
   /**
    * Astro.cookies.set(key, value) is used to set a cookie's value. If provided
@@ -168,9 +173,9 @@ class AstroCookies {
     cookies.#consumed = true;
     return cookies.headers();
   }
-  #ensureParsed(options = void 0) {
+  #ensureParsed() {
     if (!this.#requestValues) {
-      this.#parse(options);
+      this.#parse();
     }
     if (!this.#requestValues) {
       this.#requestValues = {};
@@ -183,12 +188,12 @@ class AstroCookies {
     }
     return this.#outgoing;
   }
-  #parse(options = void 0) {
+  #parse() {
     const raw = this.#request.headers.get("cookie");
     if (!raw) {
       return;
     }
-    this.#requestValues = parse(raw, options);
+    this.#requestValues = parse(raw, { decode: identity });
   }
 }
 export {

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.5.3";
+  const currentVersion = "5.5.5";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/routing/3xx.d.ts

@@ -1,6 +1,7 @@
 export type RedirectTemplate = {
     from?: string;
-    location: string | URL;
+    absoluteLocation: string | URL;
     status: number;
+    relativeLocation: string;
 };
-export declare function redirectTemplate({ status, location, from }: RedirectTemplate): string;
+export declare function redirectTemplate({ status, absoluteLocation, relativeLocation, from, }: RedirectTemplate): string;

package/dist/core/routing/3xx.js

@@ -1,12 +1,17 @@
-function redirectTemplate({ status, location, from }) {
+function redirectTemplate({
+  status,
+  absoluteLocation,
+  relativeLocation,
+  from
+}) {
   const delay = status === 302 ? 2 : 0;
   return `<!doctype html>
-<title>Redirecting to: ${location}</title>
-<meta http-equiv="refresh" content="${delay};url=${location}">
+<title>Redirecting to: ${relativeLocation}</title>
+<meta http-equiv="refresh" content="${delay};url=${relativeLocation}">
 <meta name="robots" content="noindex">
-<link rel="canonical" href="${location}">
+<link rel="canonical" href="${absoluteLocation}">
 <body>
-	<a href="${location}">Redirecting ${from ? `from <code>${from}</code> ` : ""}to <code>${location}</code></a>
+	<a href="${relativeLocation}">Redirecting ${from ? `from <code>${from}</code> ` : ""}to <code>${relativeLocation}</code></a>
 </body>`;
 }
 export {

package/dist/runtime/server/render/page.js

@@ -51,13 +51,20 @@ async function renderPage(result, componentFactory, props, children, streaming,
     headers.set("Content-Length", body.byteLength.toString());
   }
   let status = init.status;
+  let statusText = init.statusText;
   if (route?.route === "/404") {
     status = 404;
+    if (statusText === "OK") {
+      statusText = "Not Found";
+    }
   } else if (route?.route === "/500") {
     status = 500;
+    if (statusText === "OK") {
+      statusText = "Internal Server Error";
+    }
   }
   if (status) {
-    return new Response(body, { ...init, headers, status });
+    return new Response(body, { ...init, headers, status, statusText });
   } else {
     return new Response(body, { ...init, headers });
   }

package/dist/runtime/server/render/server-islands.js

@@ -70,7 +70,7 @@ function renderServerIsland(result, _displayName, props, slots) {
           `<link rel="preload" as="fetch" href="${serverIslandUrl}" crossorigin="anonymous">`
         );
       }
-      destination.write(`<script async type="module" data-island-id="${hostId}">
+      destination.write(`<script async type="module" data-astro-rerun data-island-id="${hostId}">
 let script = document.querySelector('script[data-island-id="${hostId}"]');
 
 ${useGETRequest ? (
@@ -93,11 +93,11 @@ let response = await fetch('${serverIslandUrl}', {
       )}
 if (script) {
 	if(
-		response.status === 200 
-		&& response.headers.has('content-type') 
+		response.status === 200
+		&& response.headers.has('content-type')
 		&& response.headers.get('content-type').split(";")[0].trim() === 'text/html') {
 		let html = await response.text();
-	
+
 		// Swap!
 		while(script.previousSibling &&
 			script.previousSibling.nodeType !== 8 &&
@@ -105,11 +105,11 @@ if (script) {
 			script.previousSibling.remove();
 		}
 		script.previousSibling?.remove();
-	
+
 		let frag = document.createRange().createContextualFragment(html);
 		script.before(frag);
 	}
-	script.remove();
+	script.remove(); // Prior to v5.4.2, this was the trick to force rerun of scripts.  Keeping it to minimize change to the existing behavior.
 }
 </script>`);
     }

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

@@ -39,7 +39,11 @@ function writeHtmlResponse(res, statusCode, html) {
   res.end();
 }
 function writeRedirectResponse(res, statusCode, location) {
-  const html = redirectTemplate({ status: statusCode, location });
+  const html = redirectTemplate({
+    status: statusCode,
+    absoluteLocation: location,
+    relativeLocation: location
+  });
   res.writeHead(statusCode, {
     Location: location,
     "Content-Type": "text/html",

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

@@ -211,10 +211,12 @@ async function handleRoute({
   }
   if (response.status < 400 && response.status >= 300) {
     if (response.status >= 300 && response.status < 400 && routeIsRedirect(route) && !config.build.redirects && pipeline.settings.buildOutput === "static") {
+      const location = response.headers.get("location");
       response = new Response(
         redirectTemplate({
           status: response.status,
-          location: response.headers.get("location"),
+          absoluteLocation: location,
+          relativeLocation: location,
           from: pathname
         }),
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.5.3",
+  "version": "5.5.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -106,7 +106,6 @@
     "@astrojs/compiler": "^2.11.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
-    "@types/cookie": "^0.6.0",
     "acorn": "^8.14.1",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
@@ -114,7 +113,7 @@
     "ci-info": "^4.2.0",
     "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
-    "cookie": "^0.7.2",
+    "cookie": "^1.0.2",
     "cssesc": "^3.0.0",
     "debug": "^4.4.0",
     "deterministic-object-hash": "^2.0.2",
@@ -150,7 +149,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
-    "vite": "^6.2.1",
+    "vite": "^6.2.3",
     "vitefu": "^1.0.6",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",