astro 4.4.10 → 4.4.12

package/dist/core/build/generate.js

@@ -241,7 +241,7 @@ async function getPathsForRoute(route, mod, pipeline, builtPaths) {
   let paths = [];
   if (route.pathname) {
     paths.push(route.pathname);
-    builtPaths.add(route.pathname);
+    builtPaths.add(removeTrailingForwardSlash(route.pathname));
   } else {
     const staticPaths = await callGetStaticPaths({
       mod,
@@ -364,7 +364,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
     throw err;
   }
   if (response.status >= 300 && response.status < 400) {
-    if (!config.build.redirects) {
+    if (routeIsRedirect(route) && !config.build.redirects) {
       return;
     }
     const locationSite = getRedirectLocationOrThrow(response.headers);

package/dist/core/build/pipeline.js

@@ -12,11 +12,9 @@ import {
   getPageDataByComponent,
   mergeInlineCss
 } from "./internal.js";
-import {
-  ASTRO_PAGE_RESOLVED_MODULE_ID,
-  getVirtualModulePageNameFromPath
-} from "./plugins/plugin-pages.js";
+import { ASTRO_PAGE_MODULE_ID, ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
 import { RESOLVED_SPLIT_MODULE_ID } from "./plugins/plugin-ssr.js";
+import { getVirtualModulePageNameFromPath } from "./plugins/util.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
 import { i18nHasFallback } from "./util.js";
 class BuildPipeline extends Pipeline {
@@ -165,7 +163,7 @@ class BuildPipeline extends Pipeline {
       if (routeIsRedirect(pageData.route)) {
         pages.set(pageData, path);
       } else if (routeIsFallback(pageData.route) && (i18nHasFallback(this.config) || routeIsFallback(pageData.route) && pageData.route.route === "/")) {
-        const moduleSpecifier = getVirtualModulePageNameFromPath(path);
+        const moduleSpecifier = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path);
         const filePath = this.internals.entrySpecifierToBundleMap.get(moduleSpecifier);
         if (filePath) {
           pages.set(pageData, filePath);

package/dist/core/build/plugins/plugin-pages.d.ts

@@ -3,12 +3,5 @@ import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
 export declare const ASTRO_PAGE_MODULE_ID = "@astro-page:";
 export declare const ASTRO_PAGE_RESOLVED_MODULE_ID: string;
-/**
- * 1. We add a fixed prefix, which is used as virtual module naming convention;
- * 2. We replace the dot that belongs extension with an arbitrary string.
- *
- * @param path
- */
-export declare function getVirtualModulePageNameFromPath(path: string): string;
 export declare function getVirtualModulePageIdFromPath(path: string): string;
 export declare function pluginPages(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

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

@@ -1,20 +1,12 @@
-import { extname } from "node:path";
 import { routeIsRedirect } from "../../redirects/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { eachPageFromAllPages } from "../internal.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
-import { ASTRO_PAGE_EXTENSION_POST_PATTERN, getPathFromVirtualModulePageName } from "./util.js";
+import { getPathFromVirtualModulePageName, getVirtualModulePageNameFromPath } from "./util.js";
 const ASTRO_PAGE_MODULE_ID = "@astro-page:";
 const ASTRO_PAGE_RESOLVED_MODULE_ID = "\0" + ASTRO_PAGE_MODULE_ID;
-function getVirtualModulePageNameFromPath(path) {
-  const extension = extname(path);
-  return `${ASTRO_PAGE_MODULE_ID}${path.replace(
-    extension,
-    extension.replace(".", ASTRO_PAGE_EXTENSION_POST_PATTERN)
-  )}`;
-}
 function getVirtualModulePageIdFromPath(path) {
-  const name = getVirtualModulePageNameFromPath(path);
+  const name = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path);
   return "\0" + name;
 }
 function vitePluginPages(opts, internals) {
@@ -27,7 +19,7 @@ function vitePluginPages(opts, internals) {
           if (routeIsRedirect(pageData.route)) {
             continue;
           }
-          inputs.add(getVirtualModulePageNameFromPath(path));
+          inputs.add(getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path));
         }
         return addRollupInput(options, Array.from(inputs));
       }
@@ -73,6 +65,5 @@ export {
   ASTRO_PAGE_MODULE_ID,
   ASTRO_PAGE_RESOLVED_MODULE_ID,
   getVirtualModulePageIdFromPath,
-  getVirtualModulePageNameFromPath,
   pluginPages
 };

package/dist/core/build/plugins/util.d.ts

@@ -8,8 +8,10 @@ type ExtendManualChunksHooks = {
 export declare function extendManualChunks(outputOptions: OutputOptions, hooks: ExtendManualChunksHooks): void;
 export declare const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
 /**
- * 1. We add a fixed prefix, which is used as virtual module naming convention;
- * 2. We replace the dot that belongs extension with an arbitrary string.
+ * Prevents Rollup from triggering other plugins in the process by masking the extension (hence the virtual file).
+ *
+ * 1. We add a fixed prefix, which is used as virtual module naming convention
+ * 2. If the path has an extension (at the end of the path), we replace the dot that belongs to the extension with an arbitrary string.
  *
  * @param virtualModulePrefix
  * @param path

package/dist/core/build/plugins/util.js

@@ -28,10 +28,7 @@ function extendManualChunks(outputOptions, hooks) {
 const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
 function getVirtualModulePageNameFromPath(virtualModulePrefix, path) {
   const extension = extname(path);
-  return `${virtualModulePrefix}${path.replace(
-    extension,
-    extension.replace(".", ASTRO_PAGE_EXTENSION_POST_PATTERN)
-  )}`;
+  return virtualModulePrefix + (extension.startsWith(".") ? path.slice(0, -extension.length) + extension.replace(".", ASTRO_PAGE_EXTENSION_POST_PATTERN) : path);
 }
 function getPathFromVirtualModulePageName(virtualModulePrefix, id) {
   const pageName = id.slice(virtualModulePrefix.length);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.10";
+const ASTRO_VERSION = "4.4.12";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const REROUTABLE_STATUS_CODES = [404, 500];

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.10";
+  const currentVersion = "4.4.12";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -7,6 +7,7 @@ import { renderEndpoint } from "../runtime/server/endpoint.js";
 import { renderPage } from "../runtime/server/index.js";
 import {
   ASTRO_VERSION,
+  REROUTE_DIRECTIVE_HEADER,
   ROUTE_TYPE_HEADER,
   clientAddressSymbol,
   clientLocalsSymbol
@@ -86,6 +87,9 @@ class RenderContext {
         routeData
       );
       response2.headers.set(ROUTE_TYPE_HEADER, "page");
+      if (routeData.route === "/404" || routeData.route === "/500") {
+        response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+      }
       return response2;
     } : type === "fallback" ? () => new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } }) : () => {
       throw new Error("Unknown type of route: " + type);

package/dist/core/routing/manifest/generator.d.ts

@@ -1,2 +1,2 @@
 import type { AstroConfig, RoutePart } from '../../../@types/astro.js';
-export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): import("path-to-regexp").PathFunction<object>;
+export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: object) => string;

package/dist/core/routing/manifest/generator.js

@@ -16,7 +16,10 @@ function getRouteGenerator(segments, addTrailingSlash) {
     trailing = "/";
   }
   const toPath = compile(template + trailing);
-  return toPath;
+  return (params) => {
+    const path = toPath(params);
+    return path || "/";
+  };
 }
 export {
   getRouteGenerator

package/dist/i18n/middleware.js

@@ -1,6 +1,6 @@
 import { appendForwardSlash, joinPaths } from "@astrojs/internal-helpers/path";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
-import { ROUTE_TYPE_HEADER } from "../core/constants.js";
+import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from "../core/constants.js";
 import { getPathByLocale, normalizeTheLocale } from "./index.js";
 function pathnameHasLocale(pathname, locales) {
   const segments = pathname.split("/");
@@ -28,10 +28,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
         return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
       }
     } else if (!pathnameHasLocale(url.pathname, i18n.locales)) {
-      return new Response(null, {
-        status: 404,
-        headers: response.headers
-      });
+      return notFound(response);
     }
     return void 0;
   };
@@ -46,20 +43,14 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
     if (pathnameContainsDefaultLocale) {
       const newLocation = url.pathname.replace(`/${i18n.defaultLocale}`, "");
       response.headers.set("Location", newLocation);
-      return new Response(null, {
-        status: 404,
-        headers: response.headers
-      });
+      return notFound(response);
     }
     return void 0;
   };
   const prefixAlwaysNoRedirect = (url, response) => {
     const isRoot = url.pathname === base + "/" || url.pathname === base;
     if (!(isRoot || pathnameHasLocale(url.pathname, i18n.locales))) {
-      return new Response(null, {
-        status: 404,
-        headers: response.headers
-      });
+      return notFound(response);
     }
     return void 0;
   };
@@ -151,6 +142,14 @@ function createI18nMiddleware(i18n, base, trailingSlash, buildFormat) {
     return response;
   };
 }
+function notFound(response) {
+  if (response.headers.get(REROUTE_DIRECTIVE_HEADER) === "no")
+    return response;
+  return new Response(null, {
+    status: 404,
+    headers: response.headers
+  });
+}
 function localeHasntDomain(i18n, currentLocale) {
   for (const domainLocale of Object.values(i18n.domainLookupTable)) {
     if (domainLocale === currentLocale) {

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

@@ -127,9 +127,12 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
   }
   let error = null;
   let next = promiseWithResolvers();
+  let cancelled = false;
   const buffer = [];
   const iterator = {
     async next() {
+      if (cancelled)
+        return { done: true, value: void 0 };
       await next.promise;
       if (error) {
         throw error;
@@ -152,6 +155,10 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
         value: mergedArray
       };
       return returnValue;
+    },
+    async return() {
+      cancelled = true;
+      return { done: true, value: void 0 };
     }
   };
   const destination = {

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

@@ -29,9 +29,15 @@ async function renderSlotToString(result, slotted, fallback) {
   let instructions = null;
   const temporaryDestination = {
     write(chunk) {
-      if (chunk instanceof Response)
+      if (chunk instanceof SlotString) {
+        content += chunk;
+        if (chunk.instructions) {
+          instructions ??= [];
+          instructions.push(...chunk.instructions);
+        }
+      } else if (chunk instanceof Response)
         return;
-      if (typeof chunk === "object" && "type" in chunk && typeof chunk.type === "string") {
+      else if (typeof chunk === "object" && "type" in chunk && typeof chunk.type === "string") {
         if (instructions === null) {
           instructions = [];
         }

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

@@ -208,7 +208,7 @@ async function handleRoute({
   }
   if (response.status === 404 && has404Route(manifestData) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
-    if (options && fourOhFourRoute?.route !== options.route)
+    if (options)
       return handleRoute({
         ...options,
         matchedRoute: fourOhFourRoute,
@@ -222,6 +222,9 @@ async function handleRoute({
         incomingResponse
       });
   }
+  if (response.headers.has(REROUTE_DIRECTIVE_HEADER)) {
+    response.headers.delete(REROUTE_DIRECTIVE_HEADER);
+  }
   if (route.type === "endpoint") {
     await writeWebResponse(incomingResponse, response);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.10",
+  "version": "4.4.12",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -163,8 +163,8 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
-    "@astrojs/markdown-remark": "4.2.1",
     "@astrojs/internal-helpers": "0.2.1",
+    "@astrojs/markdown-remark": "4.2.1",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {

package/dist/core/endpoint/index.d.ts

@@ -1,22 +0,0 @@
-import type { APIContext, Locales, Params } from '../../@types/astro.js';
-import { type RoutingStrategies } from '../../i18n/utils.js';
-import type { AstroCookies } from '../cookies/index.js';
-type CreateAPIContext = {
-    request: Request;
-    params: Params;
-    site?: string;
-    props: Record<string, any>;
-    adapterName?: string;
-    locales: Locales | undefined;
-    routingStrategy: RoutingStrategies | undefined;
-    defaultLocale: string | undefined;
-    route: string;
-    cookies: AstroCookies;
-};
-/**
- * Creates a context that holds all the information needed to handle an Astro endpoint.
- *
- * @param {CreateAPIContext} payload
- */
-export declare function createAPIContext({ request, params, site, props, adapterName, locales, routingStrategy, defaultLocale, route, cookies, }: CreateAPIContext): APIContext;
-export {};

package/dist/core/endpoint/index.js

@@ -1,105 +0,0 @@
-import {
-  computeCurrentLocale,
-  computePreferredLocale,
-  computePreferredLocaleList
-} from "../../i18n/utils.js";
-import { ASTRO_VERSION, clientAddressSymbol, clientLocalsSymbol } from "../constants.js";
-import { AstroError, AstroErrorData } from "../errors/index.js";
-function createAPIContext({
-  request,
-  params,
-  site,
-  props,
-  adapterName,
-  locales,
-  routingStrategy,
-  defaultLocale,
-  route,
-  cookies
-}) {
-  let preferredLocale = void 0;
-  let preferredLocaleList = void 0;
-  let currentLocale = void 0;
-  const context = {
-    cookies,
-    request,
-    params,
-    site: site ? new URL(site) : void 0,
-    generator: `Astro v${ASTRO_VERSION}`,
-    props,
-    redirect(path, status) {
-      return new Response(null, {
-        status: status || 302,
-        headers: {
-          Location: path
-        }
-      });
-    },
-    get preferredLocale() {
-      if (preferredLocale) {
-        return preferredLocale;
-      }
-      if (locales) {
-        preferredLocale = computePreferredLocale(request, locales);
-        return preferredLocale;
-      }
-      return void 0;
-    },
-    get preferredLocaleList() {
-      if (preferredLocaleList) {
-        return preferredLocaleList;
-      }
-      if (locales) {
-        preferredLocaleList = computePreferredLocaleList(request, locales);
-        return preferredLocaleList;
-      }
-      return void 0;
-    },
-    get currentLocale() {
-      if (currentLocale) {
-        return currentLocale;
-      }
-      if (locales) {
-        currentLocale = computeCurrentLocale(route, locales, routingStrategy, defaultLocale);
-      }
-      return currentLocale;
-    },
-    url: new URL(request.url),
-    get clientAddress() {
-      if (clientAddressSymbol in request) {
-        return Reflect.get(request, clientAddressSymbol);
-      }
-      if (adapterName) {
-        throw new AstroError({
-          ...AstroErrorData.ClientAddressNotAvailable,
-          message: AstroErrorData.ClientAddressNotAvailable.message(adapterName)
-        });
-      } else {
-        throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
-      }
-    },
-    get locals() {
-      let locals = Reflect.get(request, clientLocalsSymbol);
-      if (locals === void 0) {
-        locals = {};
-        Reflect.set(request, clientLocalsSymbol, locals);
-      }
-      if (typeof locals !== "object") {
-        throw new AstroError(AstroErrorData.LocalsNotAnObject);
-      }
-      return locals;
-    },
-    // We define a custom property, so we can check the value passed to locals
-    set locals(val) {
-      if (typeof val !== "object") {
-        throw new AstroError(AstroErrorData.LocalsNotAnObject);
-      } else {
-        Reflect.set(request, clientLocalsSymbol, val);
-      }
-    }
-  };
-  return context;
-}
-export {
-  createAPIContext
-};