astro 6.3.6 → 6.3.8

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.6";
+  version = "6.3.8";
 }
 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.6") {
+    if (previousAstroVersion && previousAstroVersion !== "6.3.8") {
       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.6") {
-      this.#store.metaStore().set("astro-version", "6.3.6");
+    if ("6.3.8") {
+      this.#store.metaStore().set("astro-version", "6.3.8");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/node.js

@@ -219,6 +219,9 @@ function makeRequestBody(req, bodySizeLimit) {
     if (typeof req.body === "string" && req.body.length > 0) {
       return { body: Buffer.from(req.body) };
     }
+    if (req.body instanceof ArrayBuffer || ArrayBuffer.isView(req.body)) {
+      return { body: req.body };
+    }
     if (typeof req.body === "object" && req.body !== null && Object.keys(req.body).length > 0) {
       return { body: Buffer.from(JSON.stringify(req.body)) };
     }

package/dist/core/base-pipeline.js

@@ -182,7 +182,8 @@ class Pipeline {
     if (this.resolvedActions) {
       return this.resolvedActions;
     } else if (this.actions) {
-      return this.actions();
+      this.resolvedActions = await this.actions();
+      return this.resolvedActions;
     }
     return NOOP_ACTIONS_MOD;
   }

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

@@ -92,6 +92,13 @@ export interface BuildInternals {
         moduleIds: string[];
         prerender: boolean;
     }>;
+    /**
+     * Component exports that were rendered during the SSR build.
+     * Used by the client build's cssScopeTo recovery to distinguish between
+     * CSS that was tree-shaken because the component wasn't rendered in SSR
+     * vs CSS that was included in SSR.
+     */
+    ssrRenderedExports?: Map<string, Set<string>>;
 }
 /**
  * Creates internal maps used to coordinate the CSS and HTML plugins.

package/dist/core/build/plugins/plugin-chunk-imports.d.ts

@@ -6,5 +6,11 @@ import type { StaticBuildOptions } from '../types.js';
  * bypass the HTML rendering pipeline and miss skew protection query params.
  *
  * Uses es-module-lexer to reliably parse both static and dynamic imports.
+ *
+ * This runs in `generateBundle` (not `renderChunk`) so that Vite's CSS plugin
+ * can first remove pure-CSS wrapper chunks and replace their imports with
+ * `/* empty css * /` comments. If we rewrote imports earlier (in `renderChunk`),
+ * the appended query params would break Vite's regex-based CSS chunk cleanup,
+ * leaving dangling imports to deleted chunks that 404 at runtime.
  */
 export declare function pluginChunkImports(options: StaticBuildOptions): VitePlugin | undefined;

package/dist/core/build/plugins/plugin-chunk-imports.js

@@ -12,25 +12,24 @@ function pluginChunkImports(options) {
     applyToEnvironment(environment) {
       return environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.client;
     },
-    async renderChunk(code, _chunk) {
-      if (!code.includes("./")) {
-        return null;
-      }
+    async generateBundle(_options, bundle) {
       await init;
-      const [imports] = parse(code);
-      const relativeImports = imports.filter(
-        (imp) => imp.n && /^\.\.?\//.test(imp.n) && /\.(?:js|mjs)$/.test(imp.n)
-      );
-      if (relativeImports.length === 0) {
-        return null;
-      }
-      let rewritten = code;
-      for (let i = relativeImports.length - 1; i >= 0; i--) {
-        const imp = relativeImports[i];
-        const insertAt = imp.d > -1 ? imp.e - 1 : imp.e;
-        rewritten = rewritten.slice(0, insertAt) + "?" + queryString + rewritten.slice(insertAt);
+      for (const [, chunk] of Object.entries(bundle)) {
+        if (chunk.type !== "chunk") continue;
+        if (!chunk.code.includes("./")) continue;
+        const [imports] = parse(chunk.code);
+        const relativeImports = imports.filter(
+          (imp) => imp.n && /^\.\.?\//.test(imp.n) && /\.(?:js|mjs)$/.test(imp.n)
+        );
+        if (relativeImports.length === 0) continue;
+        let rewritten = chunk.code;
+        for (let i = relativeImports.length - 1; i >= 0; i--) {
+          const imp = relativeImports[i];
+          const insertAt = imp.d > -1 ? imp.e - 1 : imp.e;
+          rewritten = rewritten.slice(0, insertAt) + "?" + queryString + rewritten.slice(insertAt);
+        }
+        chunk.code = rewritten;
       }
-      return { code: rewritten, map: null };
     }
   };
 }

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

@@ -46,10 +46,25 @@ function rollupPluginAstroBuildCSS(options) {
               internals.cssModuleToChunkIdMap.set(moduleId, chunk.fileName);
             }
           }
+          for (const [moduleId, moduleInfo] of Object.entries(chunk.modules || {})) {
+            if (moduleInfo.renderedExports.length > 0) {
+              const existing = internals.ssrRenderedExports?.get(moduleId);
+              if (existing) {
+                for (const exp of moduleInfo.renderedExports) {
+                  existing.add(exp);
+                }
+              } else {
+                internals.ssrRenderedExports ??= /* @__PURE__ */ new Map();
+                internals.ssrRenderedExports.set(moduleId, new Set(moduleInfo.renderedExports));
+              }
+            }
+          }
         }
       }
       const renderedComponentExports = /* @__PURE__ */ new Map();
       const componentToPages = /* @__PURE__ */ new Map();
+      const deletedCssAssets = /* @__PURE__ */ new Map();
+      const cssScopeToAddedCss = /* @__PURE__ */ new Set();
       if (this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.client) {
         for (const [, item] of Object.entries(bundle)) {
           if (item.type !== "chunk") continue;
@@ -76,6 +91,9 @@ function rollupPluginAstroBuildCSS(options) {
             );
             if (allCssInSSR && shouldDeleteCSSChunk(allModules, internals)) {
               for (const cssId of meta.importedCss) {
+                if (bundle[cssId]) {
+                  deletedCssAssets.set(cssId, bundle[cssId]);
+                }
                 delete bundle[cssId];
               }
             }
@@ -157,6 +175,14 @@ function rollupPluginAstroBuildCSS(options) {
                     }
                   }
                 }
+                const ssrExports = internals.ssrRenderedExports?.get(scopedToModule);
+                if (!ssrExports || !ssrExports.has(scopedToExport)) {
+                  for (const cssId of meta.importedCss) {
+                    if (deletedCssAssets.has(cssId)) {
+                      cssScopeToAddedCss.add(cssId);
+                    }
+                  }
+                }
               }
             }
           }
@@ -191,6 +217,13 @@ function rollupPluginAstroBuildCSS(options) {
           }
         }
       }
+      if (cssScopeToAddedCss.size > 0) {
+        for (const cssId of cssScopeToAddedCss) {
+          if (deletedCssAssets.has(cssId) && !bundle[cssId]) {
+            bundle[cssId] = deletedCssAssets.get(cssId);
+          }
+        }
+      }
     }
   };
   const singleCssPlugin = {

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

@@ -118,11 +118,16 @@ function createViteBuildConfig(opts) {
           target: "esnext",
           outDir: fileURLToPath(getClientOutputDirectory(settings)),
           copyPublicDir: true,
-          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? false,
-          minify: true,
+          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? viteConfig.build?.sourcemap ?? false,
+          minify: viteConfig.environments?.client?.build?.minify ?? viteConfig.build?.minify ?? true,
           rollupOptions: {
             preserveEntrySignatures: "exports-only",
             output: {
+              // Inherit top-level rollup output options (e.g. compact) as a
+              // base, then layer Astro defaults on top so that Astro's
+              // naming functions are preserved unless explicitly overridden
+              // via the environment-specific config.
+              ...viteConfig.build?.rollupOptions?.output,
               entryFileNames(chunkInfo) {
                 return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
               },

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.3.6";
+const ASTRO_VERSION = "6.3.8";
 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.6";
+  const currentVersion = "6.3.8";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/errors/errors-data.d.ts

@@ -946,17 +946,22 @@ export declare const UnsupportedExternalRedirect: {
 };
 /**
  * @docs
+ * @message
+ * **Example error message:**<br/>
+ * InvalidRedirectDestination: The redirect from "/posts" to "/blog" is invalid. The destination "/blog" does not match any existing route in your project.
  * @see
  * - [Configured redirects](https://docs.astro.build/en/guides/routing/#configured-redirects)
  * @description
- * A dynamic redirect destination must match an existing route pattern.
+ * A dynamic redirect destination must match an existing route pattern and include
+ * all dynamic parameters from the source route.
  * This error occurs when a redirect with dynamic parameters points to a destination
- * that doesn't correspond to any page in your project.
+ * that doesn't correspond to any page in your project, or when the destination route
+ * has fewer dynamic parameters than the source route.
  */
 export declare const InvalidRedirectDestination: {
     name: string;
     title: string;
-    message: (from: string, to: string) => string;
+    message(from: string, to: string, missingParams?: string[]): string;
     hint: string;
 };
 /**

package/dist/core/errors/errors-data.js

@@ -335,8 +335,14 @@ const UnsupportedExternalRedirect = {
 const InvalidRedirectDestination = {
   name: "InvalidRedirectDestination",
   title: "Invalid redirect destination.",
-  message: (from, to) => `The redirect from "${from}" to "${to}" is invalid. The destination "${to}" does not match any existing route in your project.`,
-  hint: 'If you are redirecting to a specific page of a dynamic route (e.g., "/posts/[slug]/1"), this is not supported. The destination must be either a static path or a route pattern that matches an existing page (e.g., "/posts/[slug]/[page]").'
+  message(from, to, missingParams) {
+    if (missingParams && missingParams.length > 0) {
+      const formatted = missingParams.map((p) => `[${p}]`).join(", ");
+      return `The redirect from "${from}" to "${to}" is invalid. The destination route is missing dynamic parameter(s) ${formatted} required by the source route "${from}".`;
+    }
+    return `The redirect from "${from}" to "${to}" is invalid. The destination "${to}" does not match any existing route in your project.`;
+  },
+  hint: 'The destination of a dynamic redirect must include all dynamic parameters from the source route. For example, a redirect from "/old/[slug]" must go to a route that also has a [slug] parameter, like "/new/[slug]".'
 };
 const InvalidDynamicRoute = {
   name: "InvalidDynamicRoute",

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.3.6"}`
+        `v${"6.3.8"}`
       )} ${headline}`
     );
   }

package/dist/core/render/route-cache.d.ts

@@ -13,7 +13,7 @@ interface CallGetStaticPathsOptions {
 }
 export declare function callGetStaticPaths({ mod, route, routeCache, ssr, base, trailingSlash, }: CallGetStaticPathsOptions): Promise<GetStaticPathsResultKeyed>;
 interface RouteCacheEntry {
-    mod?: ComponentInstance;
+    mod: ComponentInstance;
     staticPaths: GetStaticPathsResultKeyed;
 }
 /**

package/dist/core/render/route-cache.js

@@ -19,7 +19,7 @@ async function callGetStaticPaths({
   validateDynamicRouteModule(mod, { ssr, route });
   if (ssr && !route.prerender) {
     const entry = Object.assign([], { keyed: /* @__PURE__ */ new Map() });
-    routeCache.set(route, { ...cached, staticPaths: entry });
+    routeCache.set(route, { ...cached, mod, staticPaths: entry });
     return entry;
   }
   let staticPaths = [];

package/dist/core/routing/create-manifest.js

@@ -388,6 +388,16 @@ function createRedirectRoutes({ settings }, routeMap) {
         message: InvalidRedirectDestination.message(from, destination)
       });
     }
+    if (params.length > 0 && redirectRoute && !URL.canParse(destination) && getPrerenderDefault(config)) {
+      const destParams = redirectRoute.params ?? [];
+      const missingParams = params.filter((p) => !destParams.includes(p));
+      if (missingParams.length > 0) {
+        throw new AstroError({
+          ...InvalidRedirectDestination,
+          message: InvalidRedirectDestination.message(from, destination, missingParams)
+        });
+      }
+    }
     routes.push({
       type: "redirect",
       // For backwards compatibility, a redirect is never considered an index route.

package/dist/core/util/pathname.js

@@ -4,16 +4,18 @@ class MultiLevelEncodingError extends Error {
     this.name = "MultiLevelEncodingError";
   }
 }
+const ENCODING_REGEX = /%25[0-9a-fA-F]{2}/;
 function validateAndDecodePathname(pathname) {
+  if (ENCODING_REGEX.test(pathname)) {
+    throw new MultiLevelEncodingError();
+  }
   let decoded;
   try {
     decoded = decodeURI(pathname);
   } catch (_e) {
     throw new Error("Invalid URL encoding");
   }
-  const hasDecoding = decoded !== pathname;
-  const decodedStillHasEncoding = /%[0-9a-fA-F]{2}/.test(decoded);
-  if (hasDecoding && decodedStillHasEncoding) {
+  if (ENCODING_REGEX.test(decoded)) {
     throw new MultiLevelEncodingError();
   }
   return decoded;

package/dist/manifest/virtual-module.js

@@ -17,7 +17,8 @@ function virtualModulePlugin({ settings }) {
   defaultLocale: ${JSON.stringify(config.i18n.defaultLocale)},
   locales: ${JSON.stringify(config.i18n.locales)},
   routing: ${JSON.stringify(routing)},
-  fallback: ${JSON.stringify(config.i18n.fallback)}
+  fallback: ${JSON.stringify(config.i18n.fallback)},
+  domains: ${JSON.stringify(config.i18n.domains)}
 };`;
   }
   let imageCode = "const image = undefined;";

package/dist/runtime/server/jsx.js

@@ -75,7 +75,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       }
       case (!vnode.type && vnode.type !== 0):
         return "";
-      case (typeof vnode.type === "string" && vnode.type !== ClientOnlyPlaceholder):
+      case (typeof vnode.type === "string" && vnode.type !== ClientOnlyPlaceholder && !vnode.type.includes("-")):
         return markHTMLString(await renderElement(result, vnode.type, vnode.props ?? {}));
     }
     if (vnode.type) {

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

@@ -18,7 +18,8 @@ import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { maybeRenderHead } from "./head.js";
 import { createRenderInstruction } from "./instruction.js";
 import { containsServerDirective, ServerIslandComponent } from "./server-islands.js";
-import { renderSlot, renderSlots, renderSlotToString } from "./slot.js";
+import { renderChild } from "./any.js";
+import { renderSlots, renderSlotToString } from "./slot.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
 const needsHeadRenderingSymbol = /* @__PURE__ */ Symbol.for("astro.needsHeadRendering");
 const rendererAliases = /* @__PURE__ */ new Map([["solid", "solid-js"]]);
@@ -333,10 +334,11 @@ function sanitizeElementName(tag) {
 }
 function renderFragmentComponent(result, slots = {}) {
   const slot = slots?.default;
+  const preRendered = slot?.(result);
   return {
     render(destination) {
-      if (slot == null) return;
-      return renderSlot(result, slot).render(destination);
+      if (preRendered == null) return;
+      return renderChild(destination, preRendered);
     }
   };
 }

package/dist/types/public/config.d.ts

@@ -426,7 +426,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *
      * By default, Astro removes whitespace from your HTML, including line breaks, in a lossless manner from `.astro` components. Some whitespace may be preserved as needed to maintain the visual rendering of your HTML.
      *
-     * Setting this option to `"jsx"` instead applies the JSX whitespace stripping rules used by frameworks like React. Leading and trailing whitespace is only preserved when explicitly included in the source code through constructs such as `{" "}`, and is otherwise removed entirely.
+     * Since 6.2.0, this option can also be set to `"jsx"`, Astro will apply the JSX whitespace stripping rules used by frameworks like React. Leading and trailing whitespace is only preserved when explicitly included in the source code through constructs such as `{" "}`, and is otherwise removed entirely.
      *
      * Setting this option to false disables HTML compression and preserves all whitespace.
      *

package/dist/virtual-modules/i18n.js

@@ -1,4 +1,4 @@
-import * as config from "astro:config/server";
+import * as config from "astro:config/client";
 import { toFallbackType } from "../core/app/common.js";
 import { toRoutingStrategy } from "../core/app/entrypoints/index.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.3.6",
+  "version": "6.3.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",