astro 2.10.3 → 2.10.5

package/content-types.template.d.ts

@@ -10,7 +10,9 @@ declare module 'astro:content' {
 
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
-	export type CollectionEntry<C extends keyof AnyEntryMap> = AnyEntryMap[C][keyof AnyEntryMap[C]];
+
+	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
+	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
 
 	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
 	/**

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

@@ -1186,6 +1186,27 @@ export interface AstroUserConfig {
          * ```
          */
         viewTransitions?: boolean;
+        /**
+         * @docs
+         * @name experimental.optimizeHoistedScript
+         * @type {boolean}
+         * @default `false`
+         * @version 2.10.4
+         * @description
+         * Prevents unused components' scripts from being included in a page unexpectedly.
+         * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
+         * before publishing.
+         * Enable hoisted script analysis optimization by adding the experimental flag:
+         *
+         * ```js
+         * {
+         * 	experimental: {
+         *		optimizeHoistedScript: true,
+         * 	},
+         * }
+         * ```
+         */
+        optimizeHoistedScript?: boolean;
     };
     /** @deprecated - Use "integrations" instead. Run Astro to learn more about migrating. */
     renderers?: never;
@@ -1653,10 +1674,13 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      */
     locals: App.Locals;
 }
-export interface EndpointOutput {
+export type EndpointOutput = {
     body: Body;
-    encoding?: BufferEncoding;
-}
+    encoding?: Exclude<BufferEncoding, 'binary'>;
+} | {
+    body: Uint8Array;
+    encoding: 'binary';
+};
 export type APIRoute<Props extends Record<string, any> = Record<string, any>> = (context: APIContext<Props>) => EndpointOutput | Response | Promise<EndpointOutput | Response>;
 export interface EndpointHandler {
     [method: string]: APIRoute | ((params: Params, request: Request) => EndpointOutput | Response);

package/dist/core/app/index.js

@@ -162,7 +162,6 @@ class App {
         }
         return response.response;
       } else {
-        const body = response.body;
         const headers = new Headers();
         const mimeType = mime.getType(url.pathname);
         if (mimeType) {
@@ -170,7 +169,7 @@ class App {
         } else {
           headers.set("Content-Type", "text/plain;charset=utf-8");
         }
-        const bytes = this.#encoder.encode(body);
+        const bytes = response.encoding !== "binary" ? this.#encoder.encode(response.body) : response.body;
         headers.set("Content-Length", bytes.byteLength.toString());
         const newResponse = new Response(bytes, {
           status: 200,

package/dist/core/build/plugins/index.js

@@ -14,7 +14,7 @@ import { pluginSSR, pluginSSRSplit } from "./plugin-ssr.js";
 function registerAllPlugins({ internals, options, register }) {
   register(pluginComponentEntry(internals));
   register(pluginAliasResolve(internals));
-  register(pluginAnalyzer(internals));
+  register(pluginAnalyzer(options, internals));
   register(pluginInternals(internals));
   register(pluginRenderers(options));
   register(pluginMiddleware(options, internals));

package/dist/core/build/plugins/plugin-analyzer.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
-export declare function vitePluginAnalyzer(internals: BuildInternals): VitePlugin;
-export declare function pluginAnalyzer(internals: BuildInternals): AstroBuildPlugin;
+import type { StaticBuildOptions } from '../types.js';
+export declare function vitePluginAnalyzer(options: StaticBuildOptions, internals: BuildInternals): VitePlugin;
+export declare function pluginAnalyzer(options: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

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

@@ -1,4 +1,3 @@
-import { walk } from "estree-walker";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { prependForwardSlash } from "../../../core/path.js";
 import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "../graph.js";
@@ -19,15 +18,13 @@ async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
   }
   const imports = [];
   const exports = [];
-  walk(parentInfo.ast, {
-    enter(node) {
-      if (node.type === "ImportDeclaration") {
-        imports.push(node);
-      } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
-        exports.push(node);
-      }
+  for (const node of parentInfo.ast.body) {
+    if (node.type === "ImportDeclaration") {
+      imports.push(node);
+    } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
+      exports.push(node);
     }
-  });
+  }
   const importNames = [];
   const exportNames = [];
   for (const node of imports) {
@@ -89,7 +86,7 @@ async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
   }
   return exportNames;
 }
-function vitePluginAnalyzer(internals) {
+function vitePluginAnalyzer(options, internals) {
   function hoistedScriptScanner() {
     const uniqueHoistedIds = /* @__PURE__ */ new Map();
     const pageScripts = /* @__PURE__ */ new Map();
@@ -108,20 +105,22 @@ function vitePluginAnalyzer(internals) {
           for (const [parentInfo, depth] of walkParentInfos(from, this, function until(importer) {
             return isPropagatedAsset(importer);
           })) {
-            depthsToChildren.set(depth, parentInfo);
-            if (depth > 0) {
-              const childInfo = depthsToChildren.get(depth - 1);
-              const childExportNames = depthsToExportNames.get(depth - 1);
-              const doesImport = await doesParentImportChild.call(
-                this,
-                parentInfo,
-                childInfo,
-                childExportNames
-              );
-              if (doesImport === "no") {
-                continue;
+            if (options.settings.config.experimental.optimizeHoistedScript) {
+              depthsToChildren.set(depth, parentInfo);
+              if (depth > 0) {
+                const childInfo = depthsToChildren.get(depth - 1);
+                const childExportNames = depthsToExportNames.get(depth - 1);
+                const doesImport = await doesParentImportChild.call(
+                  this,
+                  parentInfo,
+                  childInfo,
+                  childExportNames
+                );
+                if (doesImport === "no") {
+                  continue;
+                }
+                depthsToExportNames.set(depth, doesImport);
               }
-              depthsToExportNames.set(depth, doesImport);
             }
             if (isPropagatedAsset(parentInfo.id)) {
               for (const [nestedParentInfo] of walkParentInfos(from, this)) {
@@ -241,13 +240,13 @@ function vitePluginAnalyzer(internals) {
     }
   };
 }
-function pluginAnalyzer(internals) {
+function pluginAnalyzer(options, internals) {
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
         return {
-          vitePlugin: vitePluginAnalyzer(internals)
+          vitePlugin: vitePluginAnalyzer(options, internals)
         };
       }
     }

package/dist/core/config/schema.d.ts

@@ -179,18 +179,23 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        optimizeHoistedScript: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
 }, "strip", z.ZodTypeAny, {
@@ -259,6 +264,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -319,6 +325,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;
@@ -435,18 +442,23 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        optimizeHoistedScript: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
@@ -581,6 +593,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -641,6 +654,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -710,6 +724,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -770,6 +785,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -39,7 +39,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   redirects: {},
   experimental: {
     assets: false,
-    viewTransitions: false
+    viewTransitions: false,
+    optimizeHoistedScript: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -143,7 +144,8 @@ const AstroConfigSchema = z.object({
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   experimental: z.object({
     assets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.assets),
-    viewTransitions: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.viewTransitions)
+    viewTransitions: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.viewTransitions),
+    optimizeHoistedScript: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript)
   }).passthrough().refine(
     (d) => {
       const validKeys = Object.keys(ASTRO_CONFIG_DEFAULTS.experimental);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.10.3";
+const ASTRO_VERSION = "2.10.5";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "2.10.3";
+  const currentVersion = "2.10.5";
   if (currentVersion.includes("-")) {
     warn(logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.d.ts

@@ -1,13 +1,10 @@
-/// <reference types="node" />
 import type { APIContext, EndpointHandler, EndpointOutput, MiddlewareHandler, Params } from '../../@types/astro';
 import type { Environment, RenderContext } from '../render/index';
 import { AstroCookies } from '../cookies/index.js';
-export type EndpointCallResult = {
+export type EndpointCallResult = (EndpointOutput & {
     type: 'simple';
-    body: string;
-    encoding?: BufferEncoding;
     cookies: AstroCookies;
-} | {
+}) | {
     type: 'response';
     response: Response;
 };

package/dist/core/endpoint/index.js

@@ -104,9 +104,8 @@ async function callEndpoint(mod, env, ctx, onRequest) {
     }
   }
   return {
+    ...response,
     type: "simple",
-    body: response.body,
-    encoding: response.encoding,
     cookies: context.cookies
   };
 }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.10.3";
+  const version = "2.10.5";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.10.3"}`
+        `v${"2.10.5"}`
       )} ${headline}`
     );
   }

package/dist/jsx/renderer.js

@@ -3,10 +3,9 @@ const renderer = {
   serverEntrypoint: "astro/jsx/server.js",
   jsxImportSource: "astro",
   jsxTransformOptions: async () => {
-    const {
-      default: { default: jsx }
-      // @ts-expect-error
-    } = await import("@babel/plugin-transform-react-jsx");
+    var _a;
+    const plugin = await import("@babel/plugin-transform-react-jsx");
+    const jsx = ((_a = plugin.default) == null ? void 0 : _a.default) ?? plugin.default;
     const { default: astroJSX } = await import("./babel.js");
     return {
       plugins: [

package/dist/runtime/server/astro-island.js

@@ -1,24 +1,28 @@
 var _a;
 {
   const propTypes = {
-    0: (value) => value,
-    1: (value) => JSON.parse(value, reviver),
+    0: (value) => reviveObject(value),
+    1: (value) => reviveArray(value),
     2: (value) => new RegExp(value),
     3: (value) => new Date(value),
-    4: (value) => new Map(JSON.parse(value, reviver)),
-    5: (value) => new Set(JSON.parse(value, reviver)),
+    4: (value) => new Map(reviveArray(value)),
+    5: (value) => new Set(reviveArray(value)),
     6: (value) => BigInt(value),
     7: (value) => new URL(value),
-    8: (value) => new Uint8Array(JSON.parse(value)),
-    9: (value) => new Uint16Array(JSON.parse(value)),
-    10: (value) => new Uint32Array(JSON.parse(value))
+    8: (value) => new Uint8Array(value),
+    9: (value) => new Uint16Array(value),
+    10: (value) => new Uint32Array(value)
   };
-  const reviver = (propKey, raw) => {
-    if (propKey === "" || !Array.isArray(raw))
-      return raw;
+  const reviveTuple = (raw) => {
     const [type, value] = raw;
     return type in propTypes ? propTypes[type](value) : void 0;
   };
+  const reviveArray = (raw) => raw.map(reviveTuple);
+  const reviveObject = (raw) => {
+    if (typeof raw !== "object" || raw === null)
+      return raw;
+    return Object.fromEntries(Object.entries(raw).map(([key, value]) => [key, reviveTuple(value)]));
+  };
   if (!customElements.get("astro-island")) {
     customElements.define(
       "astro-island",
@@ -54,7 +58,7 @@ var _a;
             }
             let props;
             try {
-              props = this.hasAttribute("props") ? JSON.parse(this.getAttribute("props"), reviver) : {};
+              props = this.hasAttribute("props") ? reviveObject(JSON.parse(this.getAttribute("props"))) : {};
             } catch (e) {
               let componentName = this.getAttribute("component-url") || "<unknown>";
               const componentExport = this.getAttribute("component-export");

package/dist/runtime/server/astro-island.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(()=>{var d;{let p={0:t=>t,1:t=>JSON.parse(t,a),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,a)),5:t=>new Set(JSON.parse(t,a)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},a=(t,r)=>{if(t===\"\"||!Array.isArray(r))return r;let[s,i]=r;return s in p?p[s](i):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(d=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=async()=>{var o;if(!this.hydrator||!this.isConnected)return;let r=(o=this.parentElement)==null?void 0:o.closest(\"astro-island[ssr]\");if(r){r.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let s=this.querySelectorAll(\"astro-slot\"),i={},c=this.querySelectorAll(\"template[data-astro-template]\");for(let e of c){let n=e.closest(this.tagName);n!=null&&n.isSameNode(this)&&(i[e.getAttribute(\"data-astro-template\")||\"default\"]=e.innerHTML,e.remove())}for(let e of s){let n=e.closest(this.tagName);n!=null&&n.isSameNode(this)&&(i[e.getAttribute(\"name\")||\"default\"]=e.innerHTML)}let l;try{l=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),a):{}}catch(e){let n=this.getAttribute(\"component-url\")||\"<unknown>\",h=this.getAttribute(\"component-export\");throw h&&(n+=` (export ${h})`),console.error(`[hydrate] Error parsing props for component ${n}`,this.getAttribute(\"props\"),e),e}await this.hydrator(this)(this.Component,l,i,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),this.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,s)=>{s.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let r=this.getAttribute(\"before-hydration-url\");r&&await import(r),this.start()}start(){let r=JSON.parse(this.getAttribute(\"opts\")),s=this.getAttribute(\"client\");if(Astro[s]===void 0){window.addEventListener(`astro:${s}`,()=>this.start(),{once:!0});return}Astro[s](async()=>{let i=this.getAttribute(\"renderer-url\"),[c,{default:l}]=await Promise.all([import(this.getAttribute(\"component-url\")),i?import(i):()=>()=>{}]),o=this.getAttribute(\"component-export\")||\"default\";if(!o.includes(\".\"))this.Component=c[o];else{this.Component=c;for(let e of o.split(\".\"))this.Component=this.Component[e]}return this.hydrator=l,this.hydrate},r,this)}attributeChangedCallback(){this.hydrate()}},d.observedAttributes=[\"props\"],d))}})();";
+declare const _default: "(()=>{var d;{let p={0:t=>u(t),1:t=>l(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(l(t)),5:t=>new Set(l(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},h=t=>{let[e,n]=t;return e in p?p[e](n):void 0},l=t=>t.map(h),u=t=>typeof t!=\"object\"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,n])=>[e,h(n)]));customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(d=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=async()=>{var i;if(!this.hydrator||!this.isConnected)return;let e=(i=this.parentElement)==null?void 0:i.closest(\"astro-island[ssr]\");if(e){e.addEventListener(\"astro:hydrate\",this.hydrate,{once:!0});return}let n=this.querySelectorAll(\"astro-slot\"),o={},a=this.querySelectorAll(\"template[data-astro-template]\");for(let r of a){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(o[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove())}for(let r of n){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(o[r.getAttribute(\"name\")||\"default\"]=r.innerHTML)}let c;try{c=this.hasAttribute(\"props\")?u(JSON.parse(this.getAttribute(\"props\"))):{}}catch(r){let s=this.getAttribute(\"component-url\")||\"<unknown>\",y=this.getAttribute(\"component-export\");throw y&&(s+=` (export ${y})`),console.error(`[hydrate] Error parsing props for component ${s}`,this.getAttribute(\"props\"),r),r}await this.hydrator(this)(this.Component,c,o,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),this.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((e,n)=>{n.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let e=this.getAttribute(\"before-hydration-url\");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute(\"opts\")),n=this.getAttribute(\"client\");if(Astro[n]===void 0){window.addEventListener(`astro:${n}`,()=>this.start(),{once:!0});return}Astro[n](async()=>{let o=this.getAttribute(\"renderer-url\"),[a,{default:c}]=await Promise.all([import(this.getAttribute(\"component-url\")),o?import(o):()=>()=>{}]),i=this.getAttribute(\"component-export\")||\"default\";if(!i.includes(\".\"))this.Component=a[i];else{this.Component=a;for(let r of i.split(\".\"))this.Component=this.Component[r]}return this.hydrator=c,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},d.observedAttributes=[\"props\"],d))}})();";
 export default _default;

package/dist/runtime/server/astro-island.prebuilt.js

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `(()=>{var d;{let p={0:t=>t,1:t=>JSON.parse(t,a),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,a)),5:t=>new Set(JSON.parse(t,a)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(JSON.parse(t)),9:t=>new Uint16Array(JSON.parse(t)),10:t=>new Uint32Array(JSON.parse(t))},a=(t,r)=>{if(t===""||!Array.isArray(r))return r;let[s,i]=r;return s in p?p[s](i):void 0};customElements.get("astro-island")||customElements.define("astro-island",(d=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=async()=>{var o;if(!this.hydrator||!this.isConnected)return;let r=(o=this.parentElement)==null?void 0:o.closest("astro-island[ssr]");if(r){r.addEventListener("astro:hydrate",this.hydrate,{once:!0});return}let s=this.querySelectorAll("astro-slot"),i={},c=this.querySelectorAll("template[data-astro-template]");for(let e of c){let n=e.closest(this.tagName);n!=null&&n.isSameNode(this)&&(i[e.getAttribute("data-astro-template")||"default"]=e.innerHTML,e.remove())}for(let e of s){let n=e.closest(this.tagName);n!=null&&n.isSameNode(this)&&(i[e.getAttribute("name")||"default"]=e.innerHTML)}let l;try{l=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),a):{}}catch(e){let n=this.getAttribute("component-url")||"<unknown>",h=this.getAttribute("component-export");throw h&&(n+=\` (export \${h})\`),console.error(\`[hydrate] Error parsing props for component \${n}\`,this.getAttribute("props"),e),e}await this.hydrator(this)(this.Component,l,i,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),this.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,s)=>{s.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let r=this.getAttribute("before-hydration-url");r&&await import(r),this.start()}start(){let r=JSON.parse(this.getAttribute("opts")),s=this.getAttribute("client");if(Astro[s]===void 0){window.addEventListener(\`astro:\${s}\`,()=>this.start(),{once:!0});return}Astro[s](async()=>{let i=this.getAttribute("renderer-url"),[c,{default:l}]=await Promise.all([import(this.getAttribute("component-url")),i?import(i):()=>()=>{}]),o=this.getAttribute("component-export")||"default";if(!o.includes("."))this.Component=c[o];else{this.Component=c;for(let e of o.split("."))this.Component=this.Component[e]}return this.hydrator=l,this.hydrate},r,this)}attributeChangedCallback(){this.hydrate()}},d.observedAttributes=["props"],d))}})();`;
+var astro_island_prebuilt_default = `(()=>{var d;{let p={0:t=>u(t),1:t=>l(t),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(l(t)),5:t=>new Set(l(t)),6:t=>BigInt(t),7:t=>new URL(t),8:t=>new Uint8Array(t),9:t=>new Uint16Array(t),10:t=>new Uint32Array(t)},h=t=>{let[e,n]=t;return e in p?p[e](n):void 0},l=t=>t.map(h),u=t=>typeof t!="object"||t===null?t:Object.fromEntries(Object.entries(t).map(([e,n])=>[e,h(n)]));customElements.get("astro-island")||customElements.define("astro-island",(d=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=async()=>{var i;if(!this.hydrator||!this.isConnected)return;let e=(i=this.parentElement)==null?void 0:i.closest("astro-island[ssr]");if(e){e.addEventListener("astro:hydrate",this.hydrate,{once:!0});return}let n=this.querySelectorAll("astro-slot"),o={},a=this.querySelectorAll("template[data-astro-template]");for(let r of a){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(o[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove())}for(let r of n){let s=r.closest(this.tagName);s!=null&&s.isSameNode(this)&&(o[r.getAttribute("name")||"default"]=r.innerHTML)}let c;try{c=this.hasAttribute("props")?u(JSON.parse(this.getAttribute("props"))):{}}catch(r){let s=this.getAttribute("component-url")||"<unknown>",y=this.getAttribute("component-export");throw y&&(s+=\` (export \${y})\`),console.error(\`[hydrate] Error parsing props for component \${s}\`,this.getAttribute("props"),r),r}await this.hydrator(this)(this.Component,c,o,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),this.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((e,n)=>{n.disconnect(),setTimeout(()=>this.childrenConnectedCallback(),0)}).observe(this,{childList:!0})}async childrenConnectedCallback(){let e=this.getAttribute("before-hydration-url");e&&await import(e),this.start()}start(){let e=JSON.parse(this.getAttribute("opts")),n=this.getAttribute("client");if(Astro[n]===void 0){window.addEventListener(\`astro:\${n}\`,()=>this.start(),{once:!0});return}Astro[n](async()=>{let o=this.getAttribute("renderer-url"),[a,{default:c}]=await Promise.all([import(this.getAttribute("component-url")),o?import(o):()=>()=>{}]),i=this.getAttribute("component-export")||"default";if(!i.includes("."))this.Component=a[i];else{this.Component=a;for(let r of i.split("."))this.Component=this.Component[r]}return this.hydrator=c,this.hydrate},e,this)}attributeChangedCallback(){this.hydrate()}},d.observedAttributes=["props"],d))}})();`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/serialize.js

@@ -1,6 +1,7 @@
 const PROP_TYPE = {
   Value: 0,
   JSON: 1,
+  // Actually means Array
   RegExp: 2,
   Date: 3,
   Map: 4,
@@ -49,16 +50,10 @@ function convertToSerializedForm(value, metadata = {}, parents = /* @__PURE__ */
       return [PROP_TYPE.RegExp, value.source];
     }
     case "[object Map]": {
-      return [
-        PROP_TYPE.Map,
-        JSON.stringify(serializeArray(Array.from(value), metadata, parents))
-      ];
+      return [PROP_TYPE.Map, serializeArray(Array.from(value), metadata, parents)];
     }
     case "[object Set]": {
-      return [
-        PROP_TYPE.Set,
-        JSON.stringify(serializeArray(Array.from(value), metadata, parents))
-      ];
+      return [PROP_TYPE.Set, serializeArray(Array.from(value), metadata, parents)];
     }
     case "[object BigInt]": {
       return [PROP_TYPE.BigInt, value.toString()];
@@ -67,16 +62,16 @@ function convertToSerializedForm(value, metadata = {}, parents = /* @__PURE__ */
       return [PROP_TYPE.URL, value.toString()];
     }
     case "[object Array]": {
-      return [PROP_TYPE.JSON, JSON.stringify(serializeArray(value, metadata, parents))];
+      return [PROP_TYPE.JSON, serializeArray(value, metadata, parents)];
     }
     case "[object Uint8Array]": {
-      return [PROP_TYPE.Uint8Array, JSON.stringify(Array.from(value))];
+      return [PROP_TYPE.Uint8Array, Array.from(value)];
     }
     case "[object Uint16Array]": {
-      return [PROP_TYPE.Uint16Array, JSON.stringify(Array.from(value))];
+      return [PROP_TYPE.Uint16Array, Array.from(value)];
     }
     case "[object Uint32Array]": {
-      return [PROP_TYPE.Uint32Array, JSON.stringify(Array.from(value))];
+      return [PROP_TYPE.Uint32Array, Array.from(value)];
     }
     default: {
       if (value !== null && typeof value === "object") {

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

@@ -178,12 +178,15 @@ async function handleRoute({
       if (computedMimeType) {
         contentType = computedMimeType;
       }
-      const response = new Response(Buffer.from(result.body, result.encoding), {
-        status: 200,
-        headers: {
-          "Content-Type": `${contentType};charset=utf-8`
+      const response = new Response(
+        result.encoding !== "binary" ? Buffer.from(result.body, result.encoding) : result.body,
+        {
+          status: 200,
+          headers: {
+            "Content-Type": `${contentType};charset=utf-8`
+          }
         }
-      });
+      );
       attachToResponse(response, result.cookies);
       await writeWebResponse(incomingResponse, response);
     }

package/package.json

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