astro 4.12.1 → 4.12.2

package/dist/@types/astro.d.ts

@@ -2089,7 +2089,7 @@ export interface AstroUserConfig {
          * <Avatar server:defer />
          * ```
          *
-         * The outer page will be rendered, either at build-time (`hybrid`) or at runtime (`server`) with the island content omitted and a `<script>` tag included in its place.
+         * The outer page will be rendered, either at build time (`hybrid`) or at runtime (`server`) with the island content omitted and a `<script>` tag included in its place.
          *
          * After the page loads in the browser, the script tag will replace itself with the the contents of the island by making a request.
          *
@@ -2108,7 +2108,7 @@ export interface AstroUserConfig {
          *
          * Since your component will not render with the rest of the page, you may want to add generic content (e.g. a loading message) to temporarily show in its place. This content will be displayed when the page first renders but before the island has loaded.
          *
-         * Add placeholder content as a child of your Astro component with the `slot="fallback:` attribute. When your island content is available, the fallback content will be replaced.
+         * Add placeholder content as a child of your Astro component with the `slot="fallback"` attribute. When your island content is available, the fallback content will be replaced.
          *
          * The example below displays a generic avatar as fallback content, then animates into a personalized avatar using view transitions:
          *

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.12.1";
+const ASTRO_VERSION = "4.12.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

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

package/dist/core/messages.d.ts

@@ -5,11 +5,12 @@ import { type ErrorWithMetadata } from './errors/index.js';
  * Prestyled messages for the CLI. Used by astro CLI commands.
  */
 /** Display each request being served with the path and the status code.  */
-export declare function req({ url, method, statusCode, reqTime, }: {
+export declare function req({ url, method, statusCode, reqTime, isRewrite, }: {
     url: string;
     statusCode: number;
     method?: string;
     reqTime?: number;
+    isRewrite?: boolean;
 }): string;
 /** Display server host and startup time */
 export declare function serverStart({ startupTime, resolvedUrls, host, base, }: {

package/dist/core/messages.js

@@ -26,10 +26,11 @@ function req({
   url,
   method,
   statusCode,
-  reqTime
+  reqTime,
+  isRewrite
 }) {
   const color = statusCode >= 500 ? red : statusCode >= 300 ? yellow : blue;
-  return color(`[${statusCode}]`) + ` ` + (method && method !== "GET" ? color(method) + " " : "") + url + ` ` + (reqTime ? dim(Math.round(reqTime) + "ms") : "");
+  return color(`[${statusCode}]`) + ` ${isRewrite ? color("(rewrite) ") : ""}` + (method && method !== "GET" ? color(method) + " " : "") + url + ` ` + (reqTime ? dim(Math.round(reqTime) + "ms") : "");
 }
 function serverStart({
   startupTime,
@@ -37,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.12.1";
+  const version = "4.12.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -269,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.12.1"}`
+        `v${"4.12.2"}`
       )} ${headline}`
     );
   }

package/dist/runtime/server/render/server-islands.js

@@ -9,6 +9,9 @@ const internalProps = /* @__PURE__ */ new Set([
 function containsServerDirective(props) {
   return "server:component-directive" in props;
 }
+function safeJsonStringify(obj) {
+  return JSON.stringify(obj).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029").replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\//g, "\\u002f");
+}
 function renderServerIsland(result, _displayName, props, slots) {
   return {
     async render(destination) {
@@ -35,13 +38,13 @@ function renderServerIsland(result, _displayName, props, slots) {
       }
       const hostId = crypto.randomUUID();
       destination.write(`<script async type="module" data-island-id="${hostId}">
-let componentId = ${JSON.stringify(componentId)};
-let componentExport = ${JSON.stringify(componentExport)};
+let componentId = ${safeJsonStringify(componentId)};
+let componentExport = ${safeJsonStringify(componentExport)};
 let script = document.querySelector('script[data-island-id="${hostId}"]');
 let data = {
 	componentExport,
-	props: ${JSON.stringify(props)},
-	slots: ${JSON.stringify(renderedSlots)},
+	props: ${safeJsonStringify(props)},
+	slots: ${safeJsonStringify(renderedSlots)},
 };
 
 let response = await fetch('/_server-islands/${componentId}', {

package/dist/transitions/router.d.ts

@@ -1,8 +1,9 @@
-import type { Options } from './types.js';
+import type { Fallback, Options } from './types.js';
 export declare const updateScrollPosition: (positions: {
     scrollX: number;
     scrollY: number;
 }) => void;
 export declare const supportsViewTransitions: boolean;
 export declare const transitionEnabledOnThisPage: () => boolean;
+export declare function getFallback(): Fallback;
 export declare function navigate(href: string, options?: Options): Promise<void>;

package/dist/transitions/router.js

@@ -469,6 +469,7 @@ async function prepareForClientOnlyComponents(newDocument, toLocation, signal) {
   }
 }
 export {
+  getFallback,
   navigate,
   supportsViewTransitions,
   transitionEnabledOnThisPage,

package/dist/vite-plugin-astro-server/route.d.ts

@@ -19,7 +19,7 @@ type HandleRoute = {
     manifestData: ManifestData;
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
-    status?: 404 | 500;
+    status?: 404 | 500 | 200;
     pipeline: DevPipeline;
 };
 export declare function handleRoute({ matchedRoute, url, pathname, status, body, origin, pipeline, manifestData, incomingRequest, incomingResponse, }: HandleRoute): Promise<void>;

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

@@ -165,7 +165,8 @@ async function handleRoute({
       req({
         url: pathname,
         method: incomingRequest.method,
-        statusCode: status ?? response.status,
+        statusCode: isRewrite ? response.status : status ?? response.status,
+        isRewrite,
         reqTime: timeEnd - timeStart
       })
     );
@@ -216,6 +217,7 @@ function getStatus(matchedRoute) {
   if (!matchedRoute) return 404;
   if (matchedRoute.route.route === "/404") return 404;
   if (matchedRoute.route.route === "/500") return 500;
+  return 200;
 }
 export {
   handleRoute,

package/package.json

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