astro 4.9.2 → 4.10.0

package/dist/core/app/pipeline.js

@@ -1,7 +1,10 @@
 import { Pipeline } from "../base-pipeline.js";
 import { DEFAULT_404_COMPONENT } from "../constants.js";
+import { RewriteEncounteredAnError } from "../errors/errors-data.js";
+import { AstroError } from "../errors/index.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/component.js";
 import { createModuleScriptElement, createStylesheetElementSet } from "../render/ssr-element.js";
+import { DEFAULT_404_ROUTE } from "../routing/astro-designed-error-pages.js";
 class AppPipeline extends Pipeline {
   #manifestData;
   static create(manifestData, {
@@ -20,7 +23,16 @@ class AppPipeline extends Pipeline {
       renderers,
       resolve,
       serverLike,
-      streaming
+      streaming,
+      void 0,
+      void 0,
+      void 0,
+      void 0,
+      void 0,
+      void 0,
+      void 0,
+      void 0,
+      false
     );
     pipeline.#manifestData = manifestData;
     return pipeline;
@@ -50,33 +62,38 @@ class AppPipeline extends Pipeline {
     const module = await this.getModuleForRoute(routeData);
     return module.page();
   }
-  async tryRewrite(payload, request) {
+  async tryRewrite(payload, request, sourceRoute) {
     let foundRoute;
     for (const route of this.#manifestData.routes) {
+      let finalUrl = void 0;
       if (payload instanceof URL) {
-        if (route.pattern.test(payload.pathname)) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = payload;
       } else if (payload instanceof Request) {
-        const url = new URL(payload.url);
-        if (route.pattern.test(url.pathname)) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = new URL(payload.url);
       } else {
-        const newUrl = new URL(payload, new URL(request.url).origin);
-        if (route.pattern.test(decodeURI(newUrl.pathname))) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = new URL(payload, new URL(request.url).origin);
+      }
+      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
+        foundRoute = route;
+        break;
+      } else if (finalUrl.pathname === "/404") {
+        foundRoute = DEFAULT_404_ROUTE;
+        break;
       }
     }
     if (foundRoute) {
-      const componentInstance = await this.getComponentByRoute(foundRoute);
-      return [foundRoute, componentInstance];
+      if (foundRoute.pathname === "/404") {
+        const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
+        return [foundRoute, componentInstance];
+      } else {
+        const componentInstance = await this.getComponentByRoute(foundRoute);
+        return [foundRoute, componentInstance];
+      }
     }
-    throw new Error("Route not found");
+    throw new AstroError({
+      ...RewriteEncounteredAnError,
+      message: RewriteEncounteredAnError.message(payload.toString())
+    });
   }
   async getModuleForRoute(route) {
     if (route.component === DEFAULT_404_COMPONENT) {
@@ -104,6 +121,14 @@ class AppPipeline extends Pipeline {
       );
     }
   }
+  // We don't need to check the source route, we already are in SSR
+  rewriteKnownRoute(pathname, _sourceRoute) {
+    if (pathname === "/404") {
+      return { default: () => new Response(null, { status: 404 }) };
+    } else {
+      return { default: () => new Response(null, { status: 500 }) };
+    }
+  }
 }
 export {
   AppPipeline

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

@@ -53,6 +53,7 @@ export type SSRManifest = {
     middleware: MiddlewareHandler;
     checkOrigin: boolean;
     rewritingEnabled: boolean;
+    experimentalEnvGetSecretEnabled: boolean;
 };
 export type SSRManifestI18n = {
     fallback: Record<string, string> | undefined;

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

@@ -35,6 +35,7 @@ export declare abstract class Pipeline {
      * Used for `Astro.site`.
      */
     readonly site: URL | undefined;
+    readonly callSetGetEnv: boolean;
     readonly internalMiddleware: MiddlewareHandler[];
     constructor(logger: Logger, manifest: SSRManifest, 
     /**
@@ -52,7 +53,7 @@ export declare abstract class Pipeline {
     /**
      * Used for `Astro.site`.
      */
-    site?: URL | undefined);
+    site?: URL | undefined, callSetGetEnv?: boolean);
     abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
     abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
     /**
@@ -62,14 +63,25 @@ export declare abstract class Pipeline {
      *
      * - if not `RouteData` is found
      *
-     * @param {RewritePayload} rewritePayload
+     * @param {RewritePayload} rewritePayload The payload provided by the user
+     * @param {Request} request The original request
+     * @param {RouteData} sourceRoute The original `RouteData`
      */
-    abstract tryRewrite(rewritePayload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
+    abstract tryRewrite(rewritePayload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
     /**
      * Tells the pipeline how to retrieve a component give a `RouteData`
      * @param routeData
      */
     abstract getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
+    /**
+     * Attempts to execute a rewrite of a known Astro route:
+     * - /404 -> src/pages/404.astro -> template
+     * - /500 -> src/pages/500.astro
+     *
+     * @param pathname The pathname where the user wants to rewrite e.g. "/404"
+     * @param sourceRoute The original route where the first request started. This is needed in case a pipeline wants to check if the current route is pre-rendered or not
+     */
+    abstract rewriteKnownRoute(pathname: string, sourceRoute: RouteData): ComponentInstance;
 }
 export interface HeadElements extends Pick<SSRResult, 'scripts' | 'styles' | 'links'> {
 }

package/dist/core/base-pipeline.js

@@ -1,7 +1,10 @@
+import { setGetEnv } from "../env/runtime.js";
 import { createI18nMiddleware } from "../i18n/middleware.js";
+import { AstroError } from "./errors/errors.js";
+import { AstroErrorData } from "./errors/index.js";
 import { RouteCache } from "./render/route-cache.js";
 class Pipeline {
-  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0) {
+  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0, callSetGetEnv = true) {
     this.logger = logger;
     this.manifest = manifest;
     this.mode = mode;
@@ -17,12 +20,18 @@ class Pipeline {
     this.middleware = middleware;
     this.routeCache = routeCache;
     this.site = site;
+    this.callSetGetEnv = callSetGetEnv;
     this.internalMiddleware = [];
     if (i18n?.strategy !== "manual") {
       this.internalMiddleware.push(
         createI18nMiddleware(i18n, manifest.base, manifest.trailingSlash, manifest.buildFormat)
       );
     }
+    if (callSetGetEnv && manifest.experimentalEnvGetSecretEnabled) {
+      setGetEnv(() => {
+        throw new AstroError(AstroErrorData.EnvUnsupportedGetSecret);
+      });
+    }
   }
   internalMiddleware;
 }

package/dist/core/build/generate.js

@@ -30,8 +30,6 @@ import { getOutputFilename, isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
 import { cssOrder, mergeInlineCss } from "./internal.js";
 import { BuildPipeline } from "./pipeline.js";
-import { ASTRO_PAGE_MODULE_ID } from "./plugins/plugin-pages.js";
-import { getVirtualModulePageName } from "./plugins/util.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
@@ -264,7 +262,18 @@ function addPageName(pathname, opts) {
   opts.pageNames.push(pageName);
 }
 function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType) {
-  const ending = format === "directory" ? trailingSlash === "never" ? "" : "/" : ".html";
+  let ending;
+  switch (format) {
+    case "directory":
+    case "preserve": {
+      ending = trailingSlash === "never" ? "" : "/";
+      break;
+    }
+    default: {
+      ending = ".html";
+      break;
+    }
+  }
   let buildPathname;
   if (pathname === "/" || pathname === "") {
     buildPathname = base;
@@ -388,7 +397,8 @@ function createBuildManifest(settings, internals, renderers, middleware) {
     buildFormat: settings.config.build.format,
     middleware,
     rewritingEnabled: settings.config.experimental.rewriting,
-    checkOrigin: settings.config.security?.checkOrigin ?? false
+    checkOrigin: settings.config.security?.checkOrigin ?? false,
+    experimentalEnvGetSecretEnabled: false
   };
 }
 export {

package/dist/core/build/pipeline.d.ts

@@ -38,6 +38,7 @@ export declare class BuildPipeline extends Pipeline {
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance]>;
+    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance]>;
     retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
+    rewriteKnownRoute(_pathname: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/core/build/pipeline.js

@@ -1,6 +1,6 @@
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { RouteNotFound } from "../errors/errors-data.js";
+import { InvalidRewrite404, RewriteEncounteredAnError } from "../errors/errors-data.js";
 import { AstroError } from "../errors/index.js";
 import { routeIsFallback, routeIsRedirect } from "../redirects/helpers.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
@@ -10,6 +10,7 @@ import {
   createModuleScriptsSet,
   createStylesheetElementSet
 } from "../render/ssr-element.js";
+import { DEFAULT_404_ROUTE } from "../routing/astro-designed-error-pages.js";
 import { isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd } from "./common.js";
 import { cssOrder, getPageData, mergeInlineCss } from "./internal.js";
@@ -206,33 +207,38 @@ class BuildPipeline extends Pipeline {
       return module.page();
     }
   }
-  async tryRewrite(payload, request) {
+  async tryRewrite(payload, request, sourceRoute) {
     let foundRoute;
     for (const route of this.options.manifest.routes) {
+      let finalUrl = void 0;
       if (payload instanceof URL) {
-        if (route.pattern.test(payload.pathname)) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = payload;
       } else if (payload instanceof Request) {
-        const url = new URL(payload.url);
-        if (route.pattern.test(url.pathname)) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = new URL(payload.url);
       } else {
-        const newUrl = new URL(payload, new URL(request.url).origin);
-        if (route.pattern.test(decodeURI(newUrl.pathname))) {
-          foundRoute = route;
-          break;
-        }
+        finalUrl = new URL(payload, new URL(request.url).origin);
+      }
+      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
+        foundRoute = route;
+        break;
+      } else if (finalUrl.pathname === "/404") {
+        foundRoute = DEFAULT_404_ROUTE;
+        break;
       }
     }
     if (foundRoute) {
-      const componentInstance = await this.getComponentByRoute(foundRoute);
-      return [foundRoute, componentInstance];
+      if (foundRoute.pathname === "/404") {
+        const componentInstance = await this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
+        return [foundRoute, componentInstance];
+      } else {
+        const componentInstance = await this.getComponentByRoute(foundRoute);
+        return [foundRoute, componentInstance];
+      }
     } else {
-      throw new AstroError(RouteNotFound);
+      throw new AstroError({
+        ...RewriteEncounteredAnError,
+        message: RewriteEncounteredAnError.message(payload.toString())
+      });
     }
   }
   async retrieveSsrEntry(route, filePath) {
@@ -279,6 +285,12 @@ class BuildPipeline extends Pipeline {
     }
     return RedirectSinglePageBuiltModule;
   }
+  rewriteKnownRoute(_pathname, sourceRoute) {
+    if (!isServerLikeOutput(this.config) || sourceRoute.prerender) {
+      throw new AstroError(InvalidRewrite404);
+    }
+    throw new Error(`Unreachable, in SSG this route shouldn't be generated`);
+  }
 }
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);

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

@@ -192,7 +192,8 @@ export default {}`
       const clientComponents = /* @__PURE__ */ new Set([
         ...oldManifest.clientEntries,
         ...internals.discoveredHydratedComponents.keys(),
-        ...internals.discoveredClientOnlyComponents.keys()
+        ...internals.discoveredClientOnlyComponents.keys(),
+        ...internals.discoveredScripts
       ]);
       const serverComponents = /* @__PURE__ */ new Set([
         ...oldManifest.serverEntries,

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

@@ -213,7 +213,8 @@ function buildManifest(opts, internals, staticFiles) {
     i18n: i18nManifest,
     buildFormat: settings.config.build.format,
     checkOrigin: settings.config.security?.checkOrigin ?? false,
-    rewritingEnabled: settings.config.experimental.rewriting
+    rewritingEnabled: settings.config.experimental.rewriting,
+    experimentalEnvGetSecretEnabled: settings.config.experimental.env !== void 0 && (settings.adapter?.supportedAstroFeatures.envGetSecret ?? "unsupported") !== "unsupported"
   };
 }
 export {

package/dist/core/config/config.js

@@ -114,7 +114,7 @@ async function resolveConfig(inlineConfig, command, fsMod = fs) {
   const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod);
   const mergedConfig = mergeConfig(userConfig, inlineUserConfig);
   const astroConfig = await validateConfig(mergedConfig, root, command);
-  return { userConfig, astroConfig };
+  return { userConfig: mergedConfig, astroConfig };
 }
 export {
   configPaths,