astro 6.3.3 → 6.3.5

package/dist/assets/internal.js

@@ -124,22 +124,6 @@ async function getImage(options, imageConfig) {
     }
     const currentPosition = resolvedOptions.position || "center";
     resolvedOptions["data-astro-image-pos"] = currentPosition.replace(/\s+/g, "-");
-    if (resolvedOptions.position) {
-      if (typeof resolvedOptions.style === "object" && resolvedOptions.style !== null) {
-        if (!("objectPosition" in resolvedOptions.style)) {
-          resolvedOptions.style = {
-            ...resolvedOptions.style,
-            objectPosition: resolvedOptions.position
-          };
-        }
-      } else {
-        const existingStyle = typeof resolvedOptions.style === "string" ? resolvedOptions.style : "";
-        if (!existingStyle.includes("object-position")) {
-          const positionStyle = `object-position: ${resolvedOptions.position}`;
-          resolvedOptions.style = existingStyle ? existingStyle.replace(/;?\s*$/, "; ") + positionStyle : positionStyle;
-        }
-      }
-    }
   }
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
   const srcSetTransforms = service.getSrcSet ? await service.getSrcSet(validatedOptions, imageConfig) : [];

package/dist/assets/utils/generateImageStylesCSS.js

@@ -1,4 +1,20 @@
 import { cssFitValues } from "../internal.js";
+const POSITION_KEYWORDS = ["top", "bottom", "left", "right", "center"];
+function getPositionEntries() {
+  const entries = [];
+  for (const kw of POSITION_KEYWORDS) {
+    entries.push([kw, kw]);
+  }
+  for (const a of POSITION_KEYWORDS) {
+    for (const b of POSITION_KEYWORDS) {
+      if (a === b) continue;
+      const cssValue = `${a} ${b}`;
+      const dataAttr = `${a}-${b}`;
+      entries.push([dataAttr, cssValue]);
+    }
+  }
+  return entries;
+}
 function generateImageStylesCSS(defaultObjectFit, defaultObjectPosition) {
   const fitStyles = cssFitValues.map(
     (fit) => `
@@ -10,11 +26,14 @@ function generateImageStylesCSS(defaultObjectFit, defaultObjectPosition) {
 :where([data-astro-image]:not([data-astro-image-fit])) {
   object-fit: ${defaultObjectFit};
 }` : "";
-  const positionStyle = defaultObjectPosition ? `
-[data-astro-image-pos="${defaultObjectPosition.replace(/\s+/g, "-")}"] {
-  object-position: ${defaultObjectPosition};
-}
-
+  const positionEntries = getPositionEntries();
+  const positionStyles = positionEntries.map(
+    ([dataAttr, cssValue]) => `
+[data-astro-image-pos="${dataAttr}"] {
+  object-position: ${cssValue};
+}`
+  ).join("\n");
+  const defaultPositionStyle = defaultObjectPosition ? `
 :where([data-astro-image]:not([data-astro-image-pos])) {
   object-position: ${defaultObjectPosition};
 }` : "";
@@ -30,7 +49,8 @@ function generateImageStylesCSS(defaultObjectFit, defaultObjectPosition) {
 }
 ${fitStyles}
 ${defaultFitStyle}
-${positionStyle}
+${positionStyles}
+${defaultPositionStyle}
 `.trim();
 }
 export {

package/dist/assets/utils/metadata.js

@@ -10,7 +10,7 @@ async function imageMetadata(data, src) {
       message: AstroErrorData.NoImageMetadata.message(src)
     });
   }
-  if (!result.height || !result.width || !result.type) {
+  if (result.height == null || result.width == null || !result.type) {
     throw new AstroError({
       ...AstroErrorData.NoImageMetadata,
       message: AstroErrorData.NoImageMetadata.message(src)

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

@@ -77,7 +77,7 @@ const SVG = {
     const root = extractorRegExps.root.exec(toUTF8String(input));
     if (root) {
       const attrs = parseAttributes(root[0]);
-      if (attrs.width && attrs.height) {
+      if (attrs.width != null && attrs.height != null) {
         return calculateByDimensions(attrs);
       }
       if (attrs.viewbox) {

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.3.3";
+  version = "6.3.5";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -134,9 +134,10 @@ function createGetEntry({ liveCollections }) {
         return;
       }
       const { default: imageAssetMap } = await import("astro:asset-imports");
-      entry.data = updateImageReferencesInData(entry.data, entry.filePath, imageAssetMap);
+      const data = updateImageReferencesInData(entry.data, entry.filePath, imageAssetMap);
       const result = {
         ...entry,
+        data,
         collection
       };
       warnForPropertyAccess(
@@ -354,7 +355,8 @@ async function updateImageReferencesInBody(html, fileName) {
   });
 }
 function updateImageReferencesInData(data, fileName, imageAssetMap) {
-  return new Traverse(data).map(function(ctx, val) {
+  const copy = structuredClone(data);
+  new Traverse(copy).forEach(function(ctx, val) {
     if (typeof val === "string" && val.startsWith(IMAGE_IMPORT_PREFIX)) {
       const src = val.replace(IMAGE_IMPORT_PREFIX, "");
       const id = imageSrcToImportId(src, fileName);
@@ -375,6 +377,7 @@ function updateImageReferencesInData(data, fileName, imageAssetMap) {
       }
     }
   });
+  return copy;
 }
 async function renderEntry(entry) {
   if (!entry) {

package/dist/core/build/generate.js

@@ -187,13 +187,20 @@ ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
     const cpuCount = os.cpus().length;
     const assetsCreationPipeline = await prepareAssetsGenerationEnv(options, totalCount);
     const queue = new PQueue({ concurrency: Math.max(cpuCount, 1) });
+    const errors = [];
     const assetsTimer = performance.now();
     for (const [originalPath, transforms] of staticImageList) {
       queue.add(() => generateImagesForPath(originalPath, transforms, assetsCreationPipeline)).catch((e) => {
-        throw e;
+        logger.warn("build", `Unable to generate optimized image for ${originalPath}: ${e}`);
+        errors.push(new Error(`Error generating image for ${originalPath}: ${e}`, { cause: e }));
       });
     }
     await queue.onIdle();
+    if (errors.length === 1) {
+      throw errors[0];
+    } else if (errors.length > 1) {
+      throw new AggregateError(errors, `${errors.length} errors occurred during asset generation`);
+    }
     const assetsTimeEnd = performance.now();
     logger.info(null, colors.green(`\u2713 Completed in ${getTimeStat(assetsTimer, assetsTimeEnd)}.
 `));

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

@@ -32,7 +32,7 @@ function pluginInternals(options, internals) {
           },
           resolve: {
             // Always bundle Astro runtime when building for SSR
-            noExternal: ["astro"]
+            noExternal: ["astro", "@astrojs/internal-helpers"]
           }
         };
       }

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

@@ -10,31 +10,21 @@ import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash } from "../../core/path.js";
 import { runHookBuildSetup } from "../../integrations/hooks.js";
 import { SERIALIZED_MANIFEST_RESOLVED_ID } from "../../manifest/serialized.js";
-import {
-  getClientOutputDirectory,
-  getPrerenderOutputDirectory,
-  getServerOutputDirectory
-} from "../../prerender/utils.js";
-import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../../vite-plugin-pages/const.js";
+import { getPrerenderOutputDirectory } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { routeIsRedirect } from "../routing/helpers.js";
 import { getOutDirWithinCwd } from "./common.js";
-import { CHUNKS_PATH } from "./consts.js";
 import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { getAllBuildPlugins } from "./plugins/index.js";
 import { manifestBuildPostHook } from "./plugins/plugin-manifest.js";
-import {
-  isLegacyAdapter,
-  LEGACY_SSR_ENTRY_VIRTUAL_MODULE,
-  RESOLVED_LEGACY_SSR_ENTRY_VIRTUAL_MODULE
-} from "./plugins/plugin-ssr.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
-import { cleanChunkName, getTimeStat, viteBuildReturnToRollupOutputs } from "./util.js";
+import { getTimeStat, viteBuildReturnToRollupOutputs } from "./util.js";
 import { NOOP_MODULE_ID } from "./plugins/plugin-noop.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
 import { getSSRAssets } from "./internal.js";
 import { SERVER_ISLAND_MAP_MARKER } from "../server-islands/vite-plugin-server-islands.js";
+import { createViteBuildConfig } from "./vite-build-config.js";
 const PRERENDER_ENTRY_FILENAME_PREFIX = "prerender-entry";
 function extractRelevantChunks(outputs, prerender) {
   const extracted = [];
@@ -83,7 +73,6 @@ async function viteBuild(opts) {
 async function buildEnvironments(opts, internals) {
   const { allPages, settings, viteConfig } = opts;
   const routes = Object.values(allPages).flatMap((pageData) => pageData.route);
-  const legacyAdapter = !settings.adapter || isLegacyAdapter(settings.adapter);
   const buildPlugins = getAllBuildPlugins(internals, opts);
   const flatPlugins = buildPlugins.flat().filter(Boolean);
   const plugins = [...flatPlugins, ...viteConfig.plugins || []];
@@ -149,76 +138,10 @@ async function buildEnvironments(opts, internals) {
       return Object.keys(currentRollupInput).includes(moduleName);
     }
   }
-  const viteBuildConfig = {
-    ...viteConfig,
-    logLevel: viteConfig.logLevel ?? "error",
-    build: {
-      target: "esnext",
-      // Vite defaults cssMinify to false in SSR by default, but we want to minify it
-      // as the CSS generated are used and served to the client.
-      cssMinify: viteConfig.build?.minify == null ? true : !!viteConfig.build?.minify,
-      ...viteConfig.build,
-      emptyOutDir: false,
-      copyPublicDir: false,
-      manifest: false,
-      rollupOptions: {
-        ...viteConfig.build?.rollupOptions,
-        // Setting as `exports-only` allows us to safely delete inputs that are only used during prerendering
-        preserveEntrySignatures: "exports-only",
-        ...legacyAdapter && settings.buildOutput === "server" ? { input: LEGACY_SSR_ENTRY_VIRTUAL_MODULE } : {},
-        output: {
-          hoistTransitiveImports: false,
-          format: "esm",
-          minifyInternalExports: true,
-          // Server chunks can't go in the assets (_astro) folder
-          // We need to keep these separate
-          chunkFileNames(chunkInfo) {
-            const { name } = chunkInfo;
-            let prefix = CHUNKS_PATH;
-            let suffix = "_[hash].mjs";
-            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
-              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
-              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
-            }
-            if (name.startsWith("pages/")) {
-              const sanitizedName = name.split(".")[0];
-              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
-            }
-            return [prefix, cleanChunkName(name), suffix].join("");
-          },
-          assetFileNames(assetInfo) {
-            const name = assetInfo.names?.[0] ?? "";
-            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
-              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
-              return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
-            }
-            return `${settings.config.build.assets}/[name].[hash][extname]`;
-          },
-          ...viteConfig.build?.rollupOptions?.output,
-          entryFileNames(chunkInfo) {
-            if (chunkInfo.facadeModuleId?.startsWith(VIRTUAL_PAGE_RESOLVED_MODULE_ID)) {
-              return makeAstroPageEntryPointFileName(
-                VIRTUAL_PAGE_RESOLVED_MODULE_ID,
-                chunkInfo.facadeModuleId,
-                routes
-              );
-            } else if (chunkInfo.facadeModuleId === RESOLVED_LEGACY_SSR_ENTRY_VIRTUAL_MODULE || // This catches the case when the adapter uses `entrypointResolution: 'auto'`. When doing so,
-            // the adapter must set rollupOptions.input or Astro sets it from `serverEntrypoint`.
-            isRollupInput(chunkInfo.name) || isRollupInput(chunkInfo.facadeModuleId)) {
-              return opts.settings.config.build.serverEntry;
-            } else {
-              return "[name].mjs";
-            }
-          }
-        }
-      },
-      ssr: true,
-      ssrEmitAssets: true,
-      // improve build performance
-      minify: false,
-      modulePreload: { polyfill: false },
-      reportCompressedSize: false
-    },
+  const viteBuildConfig = createViteBuildConfig({
+    settings,
+    viteConfig,
+    routes,
     plugins,
     // Top-level buildApp for framework build orchestration
     // This takes precedence over platform plugin fallbacks (e.g., Cloudflare)
@@ -258,69 +181,8 @@ async function buildEnvironments(opts, internals) {
         internals.extractedChunks = [...ssrChunks, ...prerenderChunks];
       }
     },
-    envPrefix: viteConfig.envPrefix ?? "PUBLIC_",
-    base: settings.config.base,
-    environments: {
-      ...viteConfig.environments ?? {},
-      [ASTRO_VITE_ENVIRONMENT_NAMES.prerender]: {
-        build: {
-          emitAssets: true,
-          outDir: fileURLToPath(getPrerenderOutputDirectory(settings)),
-          rollupOptions: {
-            // Only skip the default prerender entrypoint if an adapter with `entrypointResolution: 'self'` is used
-            // AND provides a custom prerenderer. Otherwise, use the default.
-            ...!legacyAdapter && settings.prerenderer ? {} : { input: "astro/entrypoints/prerender" },
-            output: {
-              entryFileNames: `${PRERENDER_ENTRY_FILENAME_PREFIX}.[hash].mjs`,
-              format: "esm",
-              ...viteConfig.environments?.prerender?.build?.rollupOptions?.output
-            }
-          },
-          ssr: true
-        }
-      },
-      [ASTRO_VITE_ENVIRONMENT_NAMES.client]: {
-        build: {
-          emitAssets: true,
-          target: "esnext",
-          outDir: fileURLToPath(getClientOutputDirectory(settings)),
-          copyPublicDir: true,
-          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? false,
-          minify: true,
-          rollupOptions: {
-            preserveEntrySignatures: "exports-only",
-            output: {
-              entryFileNames(chunkInfo) {
-                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
-              },
-              chunkFileNames(chunkInfo) {
-                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
-              },
-              assetFileNames(assetInfo) {
-                const name = assetInfo.names?.[0] ?? "";
-                if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
-                  const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
-                  return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
-                }
-                return `${settings.config.build.assets}/[name].[hash][extname]`;
-              },
-              ...viteConfig.environments?.client?.build?.rollupOptions?.output
-            }
-          }
-        }
-      },
-      [ASTRO_VITE_ENVIRONMENT_NAMES.ssr]: {
-        build: {
-          outDir: fileURLToPath(getServerOutputDirectory(settings)),
-          rollupOptions: {
-            output: {
-              ...viteConfig.environments?.ssr?.build?.rollupOptions?.output
-            }
-          }
-        }
-      }
-    }
-  };
+    isRollupInput
+  });
   const updatedViteBuildConfig = await runHookBuildSetup({
     config: settings.config,
     pages: internals.pagesByKeys,

package/dist/core/build/vite-build-config.d.ts

@@ -0,0 +1,28 @@
+import type * as vite from 'vite';
+import type { RouteData } from '../../types/public/internal.js';
+import type { AstroSettings } from '../../types/astro.js';
+export interface CreateViteBuildConfigOptions {
+    /** The resolved Astro settings. */
+    settings: AstroSettings;
+    /** The base Vite config produced by createVite(). */
+    viteConfig: vite.InlineConfig;
+    /** All routes to be built. */
+    routes: RouteData[];
+    /** Assembled Vite plugins (build plugins + user plugins). */
+    plugins: vite.PluginOption[];
+    /** The buildApp callback for the Vite builder. */
+    builder: vite.BuilderOptions;
+    /**
+     * A function that checks whether a given module name is a rollup input.
+     * Used by entryFileNames to determine the server entry.
+     */
+    isRollupInput: (moduleName: string | null) => boolean;
+}
+/**
+ * Creates the Vite InlineConfig used for the multi-environment build.
+ *
+ * This is a pure config assembly function — it does not execute the build.
+ * Extracted from `buildEnvironments()` to enable unit testing of config
+ * merging behavior (e.g. user rollup output overrides).
+ */
+export declare function createViteBuildConfig(opts: CreateViteBuildConfigOptions): vite.InlineConfig;

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

@@ -0,0 +1,160 @@
+import { fileURLToPath } from "node:url";
+import {
+  getClientOutputDirectory,
+  getPrerenderOutputDirectory,
+  getServerOutputDirectory
+} from "../../prerender/utils.js";
+import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../../vite-plugin-pages/const.js";
+import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
+import { CHUNKS_PATH } from "./consts.js";
+import {
+  isLegacyAdapter,
+  LEGACY_SSR_ENTRY_VIRTUAL_MODULE,
+  RESOLVED_LEGACY_SSR_ENTRY_VIRTUAL_MODULE
+} from "./plugins/plugin-ssr.js";
+import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
+import { cleanChunkName } from "./util.js";
+import { makeAstroPageEntryPointFileName } from "./static-build.js";
+const PRERENDER_ENTRY_FILENAME_PREFIX = "prerender-entry";
+function createViteBuildConfig(opts) {
+  const { settings, viteConfig, routes, plugins, builder, isRollupInput } = opts;
+  const legacyAdapter = !settings.adapter || isLegacyAdapter(settings.adapter);
+  return {
+    ...viteConfig,
+    logLevel: viteConfig.logLevel ?? "error",
+    build: {
+      target: "esnext",
+      // Vite defaults cssMinify to false in SSR by default, but we want to minify it
+      // as the CSS generated are used and served to the client.
+      cssMinify: viteConfig.build?.minify == null ? true : !!viteConfig.build?.minify,
+      ...viteConfig.build,
+      emptyOutDir: false,
+      copyPublicDir: false,
+      manifest: false,
+      rollupOptions: {
+        ...viteConfig.build?.rollupOptions,
+        // Setting as `exports-only` allows us to safely delete inputs that are only used during prerendering
+        preserveEntrySignatures: "exports-only",
+        ...legacyAdapter && settings.buildOutput === "server" ? { input: LEGACY_SSR_ENTRY_VIRTUAL_MODULE } : {},
+        output: {
+          hoistTransitiveImports: false,
+          format: "esm",
+          minifyInternalExports: true,
+          // Server chunks can't go in the assets (_astro) folder
+          // We need to keep these separate
+          chunkFileNames(chunkInfo) {
+            const { name } = chunkInfo;
+            let prefix = CHUNKS_PATH;
+            let suffix = "_[hash].mjs";
+            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
+            }
+            if (name.startsWith("pages/")) {
+              const sanitizedName = name.split(".")[0];
+              return [prefix, cleanChunkName(sanitizedName), suffix].join("");
+            }
+            return [prefix, cleanChunkName(name), suffix].join("");
+          },
+          assetFileNames(assetInfo) {
+            const name = assetInfo.names?.[0] ?? "";
+            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+              return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
+            }
+            return `${settings.config.build.assets}/[name].[hash][extname]`;
+          },
+          ...viteConfig.build?.rollupOptions?.output,
+          entryFileNames(chunkInfo) {
+            if (chunkInfo.facadeModuleId?.startsWith(VIRTUAL_PAGE_RESOLVED_MODULE_ID)) {
+              return makeAstroPageEntryPointFileName(
+                VIRTUAL_PAGE_RESOLVED_MODULE_ID,
+                chunkInfo.facadeModuleId,
+                routes
+              );
+            } else if (chunkInfo.facadeModuleId === RESOLVED_LEGACY_SSR_ENTRY_VIRTUAL_MODULE || // This catches the case when the adapter uses `entrypointResolution: 'auto'`. When doing so,
+            // the adapter must set rollupOptions.input or Astro sets it from `serverEntrypoint`.
+            isRollupInput(chunkInfo.name) || isRollupInput(chunkInfo.facadeModuleId)) {
+              return settings.config.build.serverEntry;
+            } else {
+              return "[name].mjs";
+            }
+          }
+        }
+      },
+      ssr: true,
+      ssrEmitAssets: true,
+      // improve build performance
+      minify: false,
+      modulePreload: { polyfill: false },
+      reportCompressedSize: false
+    },
+    plugins,
+    builder,
+    envPrefix: viteConfig.envPrefix ?? "PUBLIC_",
+    base: settings.config.base,
+    environments: {
+      ...viteConfig.environments ?? {},
+      [ASTRO_VITE_ENVIRONMENT_NAMES.prerender]: {
+        build: {
+          emitAssets: true,
+          outDir: fileURLToPath(getPrerenderOutputDirectory(settings)),
+          rollupOptions: {
+            // Only skip the default prerender entrypoint if an adapter with `entrypointResolution: 'self'` is used
+            // AND provides a custom prerenderer. Otherwise, use the default.
+            ...!legacyAdapter && settings.prerenderer ? {} : { input: "astro/entrypoints/prerender" },
+            output: {
+              entryFileNames: `${PRERENDER_ENTRY_FILENAME_PREFIX}.[hash].mjs`,
+              format: "esm",
+              ...viteConfig.environments?.prerender?.build?.rollupOptions?.output
+            }
+          },
+          ssr: true
+        }
+      },
+      [ASTRO_VITE_ENVIRONMENT_NAMES.client]: {
+        build: {
+          emitAssets: true,
+          target: "esnext",
+          outDir: fileURLToPath(getClientOutputDirectory(settings)),
+          copyPublicDir: true,
+          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? false,
+          minify: true,
+          rollupOptions: {
+            preserveEntrySignatures: "exports-only",
+            output: {
+              entryFileNames(chunkInfo) {
+                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
+              },
+              chunkFileNames(chunkInfo) {
+                return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
+              },
+              assetFileNames(assetInfo) {
+                const name = assetInfo.names?.[0] ?? "";
+                if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+                  const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+                  return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
+                }
+                return `${settings.config.build.assets}/[name].[hash][extname]`;
+              },
+              ...viteConfig.environments?.client?.build?.rollupOptions?.output
+            }
+          }
+        }
+      },
+      [ASTRO_VITE_ENVIRONMENT_NAMES.ssr]: {
+        build: {
+          outDir: fileURLToPath(getServerOutputDirectory(settings)),
+          rollupOptions: {
+            output: {
+              ...viteConfig.environments?.ssr?.build?.rollupOptions?.output
+            }
+          }
+        }
+      }
+    }
+  };
+}
+export {
+  createViteBuildConfig
+};

package/dist/core/config/schemas/base.d.ts

@@ -501,7 +501,9 @@ export declare const AstroConfigSchema: z.ZodObject<{
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
-        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
+            fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
+        }, z.core.$strict>]>>>;
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         chromeDevtoolsWorkspace: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;

package/dist/core/config/schemas/base.js

@@ -310,7 +310,12 @@ const AstroConfigSchema = z.object({
   prerenderConflictBehavior: z.enum(["error", "warn", "ignore"]).optional().default(ASTRO_CONFIG_DEFAULTS.prerenderConflictBehavior),
   fonts: z.array(FontFamilySchema).optional(),
   experimental: z.strictObject({
-    advancedRouting: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.advancedRouting),
+    advancedRouting: z.union([
+      z.boolean(),
+      z.strictObject({
+        fetchFile: z.string().nullable().optional().default("app")
+      })
+    ]).optional().default(ASTRO_CONFIG_DEFAULTS.experimental.advancedRouting),
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     contentIntellisense: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
     chromeDevtoolsWorkspace: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.chromeDevtoolsWorkspace),

package/dist/core/config/schemas/relative.d.ts

@@ -382,7 +382,9 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
-        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
+            fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
+        }, z.core.$strict>]>>>;
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         chromeDevtoolsWorkspace: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -576,7 +578,9 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     };
     prerenderConflictBehavior: "error" | "ignore" | "warn";
     experimental: {
-        advancedRouting: boolean;
+        advancedRouting: boolean | {
+            fetchFile: string | null;
+        };
         clientPrerender: boolean;
         contentIntellisense: boolean;
         chromeDevtoolsWorkspace: boolean;
@@ -826,7 +830,9 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     };
     prerenderConflictBehavior: "error" | "ignore" | "warn";
     experimental: {
-        advancedRouting: boolean;
+        advancedRouting: boolean | {
+            fetchFile: string | null;
+        };
         clientPrerender: boolean;
         contentIntellisense: boolean;
         chromeDevtoolsWorkspace: boolean;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.3.3";
+const ASTRO_VERSION = "6.3.5";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

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