astro 4.11.6 → 4.12.0

package/dist/core/app/common.js

@@ -13,6 +13,7 @@ function deserializeManifest(serializedManifest) {
   const componentMetadata = new Map(serializedManifest.componentMetadata);
   const inlinedScripts = new Map(serializedManifest.inlinedScripts);
   const clientDirectives = new Map(serializedManifest.clientDirectives);
+  const serverIslandNameMap = new Map(serializedManifest.serverIslandNameMap);
   return {
     // in case user middleware exists, this no-op middleware will be reassigned (see plugin-ssr.ts)
     middleware(_, next) {
@@ -23,7 +24,8 @@ function deserializeManifest(serializedManifest) {
     componentMetadata,
     inlinedScripts,
     clientDirectives,
-    routes
+    routes,
+    serverIslandNameMap
   };
 }
 export {

package/dist/core/app/index.js

@@ -19,7 +19,7 @@ import {
 } from "../path.js";
 import { RenderContext } from "../render-context.js";
 import { createAssetLink } from "../render/ssr-element.js";
-import { ensure404Route } from "../routing/astro-designed-error-pages.js";
+import { createDefaultRoutes, injectDefaultRoutes } from "../routing/default.js";
 import { matchRoute } from "../routing/match.js";
 import { createOriginCheckMiddleware } from "./middlewares.js";
 import { AppPipeline } from "./pipeline.js";
@@ -37,7 +37,7 @@ class App {
   #renderOptionsDeprecationWarningShown = false;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
-    this.#manifestData = ensure404Route({
+    this.#manifestData = injectDefaultRoutes(manifest, {
       routes: manifest.routes.map((route) => route.routeData)
     });
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
@@ -69,6 +69,7 @@ class App {
       manifest: this.#manifest,
       mode: "production",
       renderers: this.#manifest.renderers,
+      defaultRoutes: createDefaultRoutes(this.#manifest),
       resolve: async (specifier) => {
         if (!(specifier in this.#manifest.entryModules)) {
           throw new Error(`Unable to resolve [${specifier}]`);

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

@@ -3,7 +3,7 @@ import { Pipeline } from '../base-pipeline.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
 export declare class AppPipeline extends Pipeline {
     #private;
-    static create(manifestData: ManifestData, { logger, manifest, mode, renderers, resolve, serverLike, streaming, }: Pick<AppPipeline, 'logger' | 'manifest' | 'mode' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'>): AppPipeline;
+    static create(manifestData: ManifestData, { logger, manifest, mode, renderers, resolve, serverLike, streaming, defaultRoutes, }: Pick<AppPipeline, 'logger' | 'manifest' | 'mode' | 'renderers' | 'resolve' | 'serverLike' | 'streaming' | 'defaultRoutes'>): AppPipeline;
     headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;

package/dist/core/app/pipeline.js

@@ -1,10 +1,6 @@
 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";
 import { findRouteToRewrite } from "../routing/rewrite.js";
 class AppPipeline extends Pipeline {
   #manifestData;
@@ -15,7 +11,8 @@ class AppPipeline extends Pipeline {
     renderers,
     resolve,
     serverLike,
-    streaming
+    streaming,
+    defaultRoutes
   }) {
     const pipeline = new AppPipeline(
       logger,
@@ -33,7 +30,8 @@ class AppPipeline extends Pipeline {
       void 0,
       void 0,
       void 0,
-      false
+      false,
+      defaultRoutes
     );
     pipeline.#manifestData = manifestData;
     return pipeline;
@@ -76,11 +74,13 @@ class AppPipeline extends Pipeline {
     return [foundRoute, componentInstance, finalUrl];
   }
   async getModuleForRoute(route) {
-    if (route.component === DEFAULT_404_COMPONENT) {
-      return {
-        page: async () => ({ default: () => new Response(null, { status: 404 }) }),
-        renderers: []
-      };
+    for (const defaultRoute of this.defaultRoutes) {
+      if (route.component === defaultRoute.component) {
+        return {
+          page: () => Promise.resolve(defaultRoute.instance),
+          renderers: []
+        };
+      }
     }
     if (route.type === "redirect") {
       return RedirectSinglePageBuiltModule;

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

@@ -1,4 +1,4 @@
-import type { Locales, MiddlewareHandler, RouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult, SerializedRouteData } from '../../@types/astro.js';
+import type { ComponentInstance, Locales, MiddlewareHandler, RouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult, SerializedRouteData } from '../../@types/astro.js';
 import type { RoutingStrategies } from '../../i18n/utils.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
 export type ComponentPath = string;
@@ -30,6 +30,7 @@ export type AssetsPrefix = string | ({
     fallback: string;
 } & Record<string, string>) | undefined;
 export type SSRManifest = {
+    hrefRoot: string;
     adapterName: string;
     routes: RouteInfo[];
     site?: string;
@@ -49,6 +50,8 @@ export type SSRManifest = {
     componentMetadata: SSRResult['componentMetadata'];
     pageModule?: SinglePageBuiltModule;
     pageMap?: Map<ComponentPath, ImportComponentInstance>;
+    serverIslandMap?: Map<string, () => Promise<ComponentInstance>>;
+    serverIslandNameMap?: Map<string, string>;
     i18n: SSRManifestI18n | undefined;
     middleware: MiddlewareHandler;
     checkOrigin: boolean;
@@ -62,10 +65,11 @@ export type SSRManifestI18n = {
     defaultLocale: string;
     domainLookupTable: Record<string, string>;
 };
-export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives'> & {
+export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives' | 'serverIslandNameMap'> & {
     routes: SerializedRouteInfo[];
     assets: string[];
     componentMetadata: [string, SSRComponentMetadata][];
     inlinedScripts: [string, string][];
     clientDirectives: [string, string][];
+    serverIslandNameMap: [string, string][];
 };

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

@@ -36,6 +36,16 @@ export declare abstract class Pipeline {
      */
     readonly site: URL | undefined;
     readonly callSetGetEnv: boolean;
+    /**
+     * Array of built-in, internal, routes.
+     * Used to find the route module
+     */
+    readonly defaultRoutes: {
+        instance: ComponentInstance;
+        matchesComponent(filePath: URL): boolean;
+        route: string;
+        component: string;
+    }[];
     readonly internalMiddleware: MiddlewareHandler[];
     constructor(logger: Logger, manifest: SSRManifest, 
     /**
@@ -53,7 +63,17 @@ export declare abstract class Pipeline {
     /**
      * Used for `Astro.site`.
      */
-    site?: URL | undefined, callSetGetEnv?: boolean);
+    site?: URL | undefined, callSetGetEnv?: boolean, 
+    /**
+     * Array of built-in, internal, routes.
+     * Used to find the route module
+     */
+    defaultRoutes?: {
+        instance: ComponentInstance;
+        matchesComponent(filePath: URL): boolean;
+        route: string;
+        component: string;
+    }[]);
     abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
     abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
     /**

package/dist/core/base-pipeline.js

@@ -3,8 +3,9 @@ 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";
+import { createDefaultRoutes } from "./routing/default.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, callSetGetEnv = true) {
+  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, defaultRoutes = createDefaultRoutes(manifest)) {
     this.logger = logger;
     this.manifest = manifest;
     this.mode = mode;
@@ -21,6 +22,7 @@ class Pipeline {
     this.routeCache = routeCache;
     this.site = site;
     this.callSetGetEnv = callSetGetEnv;
+    this.defaultRoutes = defaultRoutes;
     this.internalMiddleware = [];
     if (i18n?.strategy !== "manual") {
       this.internalMiddleware.push(

package/dist/core/build/generate.js

@@ -381,6 +381,7 @@ function createBuildManifest(settings, internals, renderers, middleware) {
     };
   }
   return {
+    hrefRoot: settings.config.root.toString(),
     trailingSlash: settings.config.trailingSlash,
     assets: /* @__PURE__ */ new Set(),
     entryModules: Object.fromEntries(internals.entrySpecifierToBundleMap.entries()),

package/dist/core/build/index.js

@@ -18,6 +18,7 @@ import { createVite } from "../create-vite.js";
 import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
+import { getServerIslandRouteData } from "../server-islands/endpoint.js";
 import { ensureProcessNodeEnv, isServerLikeOutput } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild, viteBuild } from "./static-build.js";
@@ -88,11 +89,12 @@ class AstroBuilder {
       { settings: this.settings, logger: this.logger, mode: "build", command: "build", sync: false }
     );
     await runHookConfigDone({ settings: this.settings, logger });
-    const { syncContentCollections } = await import("../sync/index.js");
-    const syncRet = await syncContentCollections(this.settings, { logger, fs });
-    if (syncRet !== 0) {
-      return process.exit(syncRet);
-    }
+    const { syncInternal } = await import("../sync/index.js");
+    await syncInternal({
+      settings: this.settings,
+      logger,
+      fs
+    });
     return { viteConfig };
   }
   /** Run the build logic. build() is marked private because usage should go through ".run()" */
@@ -143,7 +145,9 @@ class AstroBuilder {
     await runHookBuildDone({
       config: this.settings.config,
       pages: pageNames,
-      routes: Object.values(allPages).flat().map((pageData) => pageData.route),
+      routes: Object.values(allPages).flat().map((pageData) => pageData.route).concat(
+        this.settings.config.experimental.serverIslands ? [getServerIslandRouteData(this.settings.config)] : []
+      ),
       logging: this.logger,
       cacheManifest: internals.cacheManifestUsed
     });

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

@@ -13,6 +13,12 @@ export declare class BuildPipeline extends Pipeline {
     readonly options: StaticBuildOptions;
     readonly config: import("../../@types/astro.js").AstroConfig;
     readonly settings: import("../../@types/astro.js").AstroSettings;
+    readonly defaultRoutes: {
+        instance: ComponentInstance;
+        matchesComponent(filePath: URL): boolean;
+        route: string;
+        component: string;
+    }[];
     get outFolder(): URL;
     private constructor();
     static create({ internals, manifest, options, }: Pick<BuildPipeline, 'internals' | 'manifest' | 'options'>): BuildPipeline;

package/dist/core/build/pipeline.js

@@ -9,7 +9,7 @@ import {
   createModuleScriptsSet,
   createStylesheetElementSet
 } from "../render/ssr-element.js";
-import { default404Page } from "../routing/astro-designed-error-pages.js";
+import { createDefaultRoutes } from "../routing/default.js";
 import { findRouteToRewrite } from "../routing/rewrite.js";
 import { isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd } from "./common.js";
@@ -19,7 +19,7 @@ import { RESOLVED_SPLIT_MODULE_ID } from "./plugins/plugin-ssr.js";
 import { getPagesFromVirtualModulePageName, getVirtualModulePageName } from "./plugins/util.js";
 import { i18nHasFallback } from "./util.js";
 class BuildPipeline extends Pipeline {
-  constructor(internals, manifest, options, config = options.settings.config, settings = options.settings) {
+  constructor(internals, manifest, options, config = options.settings.config, settings = options.settings, defaultRoutes = createDefaultRoutes(manifest)) {
     const resolveCache = /* @__PURE__ */ new Map();
     async function resolve(specifier) {
       if (resolveCache.has(specifier)) {
@@ -53,6 +53,7 @@ class BuildPipeline extends Pipeline {
     this.options = options;
     this.config = config;
     this.settings = settings;
+    this.defaultRoutes = defaultRoutes;
   }
   #componentsInterner = /* @__PURE__ */ new WeakMap();
   /**
@@ -201,13 +202,15 @@ class BuildPipeline extends Pipeline {
     if (this.#componentsInterner.has(routeData)) {
       const entry = this.#componentsInterner.get(routeData);
       return await entry.page();
-    } else if (routeData.component === DEFAULT_404_COMPONENT) {
-      return { default: default404Page };
-    } else {
-      const filePath = this.#routesByFilePath.get(routeData);
-      const module = await this.retrieveSsrEntry(routeData, filePath);
-      return module.page();
     }
+    for (const route of this.defaultRoutes) {
+      if (route.component === routeData.component) {
+        return route.instance;
+      }
+    }
+    const filePath = this.#routesByFilePath.get(routeData);
+    const module = await this.retrieveSsrEntry(routeData, filePath);
+    return module.page();
   }
   async tryRewrite(payload, request, _sourceRoute) {
     const [foundRoute, finalUrl] = findRouteToRewrite({

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

@@ -15,7 +15,7 @@ const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
 const replaceExp = new RegExp(`['"]${manifestReplace}['"]`, "g");
 const SSR_MANIFEST_VIRTUAL_MODULE_ID = "@astrojs-manifest";
 const RESOLVED_SSR_MANIFEST_VIRTUAL_MODULE_ID = "\0" + SSR_MANIFEST_VIRTUAL_MODULE_ID;
-function vitePluginManifest(options, internals) {
+function vitePluginManifest(_options, internals) {
   return {
     name: "@astro/plugin-build-manifest",
     enforce: "post",
@@ -196,6 +196,7 @@ function buildManifest(opts, internals, staticFiles) {
     };
   }
   return {
+    hrefRoot: opts.settings.config.root.toString(),
     adapterName: opts.settings.adapter?.name ?? "",
     routes,
     site: settings.config.site,
@@ -213,6 +214,7 @@ function buildManifest(opts, internals, staticFiles) {
     buildFormat: settings.config.build.format,
     checkOrigin: settings.config.security?.checkOrigin ?? false,
     rewritingEnabled: settings.config.experimental.rewriting,
+    serverIslandNameMap: Array.from(settings.serverIslandNameMap),
     experimentalEnvGetSecretEnabled: settings.config.experimental.env !== void 0 && (settings.adapter?.supportedAstroFeatures.envGetSecret ?? "unsupported") !== "unsupported"
   };
 }

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

@@ -2,6 +2,7 @@ import { join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { isFunctionPerRouteEnabled } from "../../../integrations/hooks.js";
 import { routeIsRedirect } from "../../redirects/index.js";
+import { VIRTUAL_ISLAND_MAP_ID } from "../../server-islands/vite-plugin-server-islands.js";
 import { isServerLikeOutput } from "../../util.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { SSR_MANIFEST_VIRTUAL_MODULE_ID } from "./plugin-manifest.js";
@@ -63,7 +64,7 @@ function vitePluginSSR(internals, adapter, options) {
 ]);`);
         exports.push(`export { pageMap }`);
         const middleware = await this.resolve(MIDDLEWARE_MODULE_ID);
-        const ssrCode = generateSSRCode(adapter, middleware.id);
+        const ssrCode = generateSSRCode(options.settings, adapter, middleware.id);
         imports.push(...ssrCode.imports);
         contents.push(...ssrCode.contents);
         return [...imports, ...contents, ...exports].join("\n");
@@ -147,7 +148,7 @@ function vitePluginSSRSplit(internals, adapter, options) {
           imports.push(`import * as pageModule from "${virtualModuleName}";`);
         }
         const middleware = await this.resolve(MIDDLEWARE_MODULE_ID);
-        const ssrCode = generateSSRCode(adapter, middleware.id);
+        const ssrCode = generateSSRCode(options.settings, adapter, middleware.id);
         imports.push(...ssrCode.imports);
         contents.push(...ssrCode.contents);
         exports.push("export { pageModule }");
@@ -190,19 +191,22 @@ function pluginSSRSplit(options, internals) {
     }
   };
 }
-function generateSSRCode(adapter, middlewareId) {
+function generateSSRCode(settings, adapter, middlewareId) {
   const edgeMiddleware = adapter?.adapterFeatures?.edgeMiddleware ?? false;
   const pageMap = isFunctionPerRouteEnabled(adapter) ? "pageModule" : "pageMap";
   const imports = [
     `import { renderers } from '${RENDERERS_MODULE_ID}';`,
     `import { manifest as defaultManifest } from '${SSR_MANIFEST_VIRTUAL_MODULE_ID}';`,
     `import * as serverEntrypointModule from '${adapter.serverEntrypoint}';`,
-    edgeMiddleware ? `` : `import { onRequest as middleware } from '${middlewareId}';`
+    edgeMiddleware ? `` : `import { onRequest as middleware } from '${middlewareId}';`,
+    settings.config.experimental.serverIslands ? `import { serverIslandMap } from '${VIRTUAL_ISLAND_MAP_ID}';` : ""
   ];
   const contents = [
+    settings.config.experimental.serverIslands ? "" : `const serverIslandMap = new Map()`,
     edgeMiddleware ? `const middleware = (_, next) => next()` : "",
     `const _manifest = Object.assign(defaultManifest, {`,
     `    ${pageMap},`,
+    `    serverIslandMap,`,
     `    renderers,`,
     `    middleware`,
     `});`,

package/dist/core/build/static-build.js

@@ -164,11 +164,11 @@ async function ssrBuild(opts, internals, input, container, logger) {
             if (isContentCache) {
               prefix += `${buildID}/`;
               suffix = ".mjs";
-            }
-            if (isContentCache && name.includes("/content/")) {
-              const parts = name.split("/");
-              if (parts.at(1) === "content") {
-                return encodeName(parts.slice(1).join("/"));
+              if (name.includes("/content/")) {
+                const parts = name.split("/");
+                if (parts.at(1) === "content") {
+                  return encodeName(parts.slice(1).join("/"));
+                }
               }
             }
             if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {