astro 1.0.0-beta.52 → 1.0.0-beta.55

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.52";
+  const version = "1.0.0-beta.55";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.52" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.55" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.52",
+          astroVersion: "1.0.0-beta.55",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.55", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.55", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.55", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.52", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.55", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.52",
+          astroVersion: "1.0.0-beta.55",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/add/index.js

@@ -289,7 +289,7 @@ async function getInstallIntegrationsCommand({
   debug("add", `package manager: ${JSON.stringify(pm)}`);
   if (!pm)
     return null;
-  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version}`).sort();
+  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`).sort();
   switch (pm.name) {
     case "npm":
       return { pm: "npm", command: "install", flags: ["--save-dev"], dependencies };

package/dist/core/app/index.js

@@ -105,7 +105,7 @@ renderPage_fn = async function(request, routeData, mod) {
       scripts.add(createModuleScriptElement(script, manifest.site));
     }
   }
-  const result = await render({
+  const response = await render({
     links,
     logging: __privateGet(this, _logging),
     markdown: manifest.markdown,
@@ -127,16 +127,7 @@ renderPage_fn = async function(request, routeData, mod) {
     ssr: true,
     request
   });
-  if (result.type === "response") {
-    return result.response;
-  }
-  let html = result.html;
-  let init = result.response;
-  let headers = init.headers;
-  let bytes = __privateGet(this, _encoder).encode(html);
-  headers.set("Content-Type", "text/html");
-  headers.set("Content-Length", bytes.byteLength.toString());
-  return new Response(bytes, init);
+  return response;
 };
 _callEndpoint = new WeakSet();
 callEndpoint_fn = async function(request, routeData, mod) {

package/dist/core/build/generate.js

@@ -155,11 +155,11 @@ async function generatePath(pathname, opts, gopts) {
     }
     body = result.body;
   } else {
-    const result = await render(options);
-    if (result.type !== "html") {
+    const response = await render(options);
+    if (response.status !== 200 || !response.body) {
       return;
     }
-    body = result.html;
+    body = await response.text();
   }
   const outFolder = getOutFolder(astroConfig, pathname, pageData.route.type);
   const outFile = getOutFile(astroConfig, outFolder, pathname, pageData.route.type);

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

@@ -98,12 +98,13 @@ async function ssrBuild(opts, internals, input) {
       outDir: fileURLToPath(out),
       rollupOptions: {
         input: [],
-        output: __spreadValues({
+        output: __spreadProps(__spreadValues({
           format: "esm",
-          entryFileNames: opts.buildConfig.serverEntry,
           chunkFileNames: "chunks/[name].[hash].mjs",
           assetFileNames: "assets/[name].[hash][extname]"
-        }, (_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output)
+        }, (_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output), {
+          entryFileNames: opts.buildConfig.serverEntry
+        })
       },
       ssr: true,
       target: "esnext",

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

@@ -11,7 +11,7 @@ function vitePluginAnalyzer(astroConfig, internals) {
         var _a;
         const hoistedScripts = /* @__PURE__ */ new Set();
         for (let i = 0; i < scripts.length; i++) {
-          const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}`;
+          const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {

package/dist/core/dev/index.js

@@ -47,7 +47,7 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.52";
+  const currentVersion = "1.0.0-beta.55";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/logger/core.js

@@ -74,7 +74,7 @@ function timerMessage(message, startTime = Date.now()) {
 function warnIfUsingExperimentalSSR(opts, config) {
   var _a;
   if ((_a = config._ctx.adapter) == null ? void 0 : _a.serverEntrypoint) {
-    warn(opts, "warning", bold(`Warning:`), `SSR support is still experimental and subject to API changes. If using in production pin your dependencies to prevent accidental breakage.`);
+    warn(opts, "warning", bold(`Warning:`), `SSR support is still experimental and subject to API changes. If using in production, pin your dependencies to prevent accidental breakage.`);
   }
 }
 export {

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.52";
+  const version = "1.0.0-beta.55";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.52"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.55"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/render/core.js

@@ -17,7 +17,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { renderComponent, renderHead, renderPage } from "../../runtime/server/index.js";
+import { renderComponent, renderPage } from "../../runtime/server/index.js";
 import { getParams } from "../routing/params.js";
 import { createResult } from "./result.js";
 import { callGetStaticPaths, findPathItemByKey } from "./route-cache.js";
@@ -100,33 +100,13 @@ async function render(opts) {
     scripts,
     ssr
   });
-  let page;
   if (!Component.isAstroComponentFactory) {
     const props = __spreadProps(__spreadValues({}, pageProps ?? {}), { "server:root": true });
-    const html2 = await renderComponent(result, Component.name, Component, props, null);
-    page = {
-      type: "html",
-      html: html2.toString()
-    };
+    const html = await renderComponent(result, Component.name, Component, props, null);
+    return new Response(html.toString(), result.response);
   } else {
-    page = await renderPage(result, Component, pageProps, null);
+    return await renderPage(result, Component, pageProps, null);
   }
-  if (page.type === "response") {
-    return page;
-  }
-  let html = page.html;
-  if (html.indexOf("<!--astro:head:injected-->") == -1) {
-    html = await renderHead(result) + html;
-  }
-  html = html.replace("<!--astro:head:injected-->", "");
-  if (!/<!doctype html/i.test(html)) {
-    html = "<!DOCTYPE html>\n" + html;
-  }
-  return {
-    type: "html",
-    html,
-    response: result.response
-  };
 }
 export {
   GetParamsAndPropsError,

package/dist/core/render/dev/index.js

@@ -24,7 +24,6 @@ import { render as coreRender } from "../core.js";
 import { createModuleScriptElementWithSrcSet } from "../ssr-element.js";
 import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
-import { injectTags } from "./html.js";
 import { resolveClientDevPath } from "./resolve.js";
 const svelteStylesRE = /svelte\?svelte&type=style/;
 async function loadRenderer(viteServer, renderer) {
@@ -100,15 +99,15 @@ async function render(renderers, mod, ssrOpts) {
     });
   });
   let styles = /* @__PURE__ */ new Set();
-  [...stylesMap].forEach(([url, content2]) => {
+  [...stylesMap].forEach(([url, content]) => {
     styles.add({
       props: {
         "data-astro-injected": svelteStylesRE.test(url) ? url : true
       },
-      children: content2
+      children: content
     });
   });
-  let content = await coreRender({
+  let response = await coreRender({
     links,
     styles,
     logging,
@@ -130,19 +129,7 @@ async function render(renderers, mod, ssrOpts) {
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : void 0,
     ssr: isBuildingToSSR(astroConfig)
   });
-  if ((route == null ? void 0 : route.type) === "endpoint" || content.type === "response") {
-    return content;
-  }
-  const tags = [];
-  let html = injectTags(content.html, tags);
-  if (!/<!doctype html/i.test(html)) {
-    html = "<!DOCTYPE html>\n" + content;
-  }
-  return {
-    type: "html",
-    html,
-    response: content.response
-  };
+  return response;
 }
 async function ssr(preloadedComponent, ssrOpts) {
   const [renderers, mod] = preloadedComponent;

package/dist/core/render/result.js

@@ -114,10 +114,12 @@ function createResult(args) {
   const paginated = isPaginatedRoute(pageProps);
   const url = new URL(request.url);
   const canonicalURL = createCanonicalURL("." + pathname, site ?? url.origin, paginated);
+  const headers = new Headers();
+  headers.set("Transfer-Encoding", "chunked");
   const response = {
     status: 200,
     statusText: "OK",
-    headers: new Headers()
+    headers
   };
   Object.defineProperty(response, "headers", {
     value: response.headers,
@@ -138,7 +140,7 @@ function createResult(args) {
         request,
         redirect: args.ssr ? (path) => {
           return new Response(null, {
-            status: 301,
+            status: 302,
             headers: {
               Location: path
             }
@@ -190,7 +192,6 @@ ${extra}`);
     },
     resolve,
     _metadata: {
-      needsHydrationStyles: false,
       renderers,
       pathname
     },

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

@@ -21,23 +21,26 @@ var _a;
       constructor() {
         super(...arguments);
         this.hydrate = () => {
-          var _a2;
+          var _a2, _b, _c;
           if (!this.hydrator || ((_a2 = this.parentElement) == null ? void 0 : _a2.closest("astro-island[ssr]"))) {
             return;
           }
-          let innerHTML = null;
-          let fragment = this.querySelector("astro-fragment");
-          if (fragment == null && this.hasAttribute("tmpl")) {
-            let template = this.querySelector("template[data-astro-template]");
-            if (template) {
-              innerHTML = template.innerHTML;
-              template.remove();
-            }
-          } else if (fragment) {
-            innerHTML = fragment.innerHTML;
+          const slotted = this.querySelectorAll("astro-slot");
+          const slots = {};
+          const templates = this.querySelectorAll("template[data-astro-template]");
+          for (const template of templates) {
+            if (!((_b = template.closest(this.tagName)) == null ? void 0 : _b.isSameNode(this)))
+              continue;
+            slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
+            template.remove();
+          }
+          for (const slot of slotted) {
+            if (!((_c = slot.closest(this.tagName)) == null ? void 0 : _c.isSameNode(this)))
+              continue;
+            slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
           }
           const props = this.hasAttribute("props") ? JSON.parse(this.getAttribute("props"), reviver) : {};
-          this.hydrator(this)(this.Component, props, innerHTML, {
+          this.hydrator(this)(this.Component, props, slots, {
             client: this.getAttribute("client")
           });
           this.removeAttribute("ssr");

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

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `var o;{const a={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,e)=>{if(t===""||!Array.isArray(e))return e;const[r,s]=e;return r in a?a[r](s):void 0};customElements.get("astro-island")||customElements.define("astro-island",(o=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest("astro-island[ssr]"))return;let e=null,r=this.querySelector("astro-fragment");if(r==null&&this.hasAttribute("tmpl")){let i=this.querySelector("template[data-astro-template]");i&&(e=i.innerHTML,i.remove())}else r&&(e=r.innerHTML);const s=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,s,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}async connectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url"));const e=JSON.parse(this.getAttribute("opts"));Astro[this.getAttribute("client")](async()=>{const r=this.getAttribute("renderer-url"),[s,{default:i}]=await Promise.all([import(this.getAttribute("component-url")),r?import(r):()=>()=>{}]);return this.Component=s[this.getAttribute("component-export")||"default"],this.hydrator=i,this.hydrate},e,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},o.observedAttributes=["props"],o))}`;
+var astro_island_prebuilt_default = `var a;{const l={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===""||!Array.isArray(s))return s;const[e,i]=s;return e in l?l[e](i):void 0};customElements.get("astro-island")||customElements.define("astro-island",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest("astro-island[ssr]"))return;const s=this.querySelectorAll("astro-slot"),e={},i=this.querySelectorAll("template[data-astro-template]");for(const r of i)!r.closest(this.tagName)?.isSameNode(this)||(e[r.getAttribute("data-astro-template")||"default"]=r.innerHTML,r.remove());for(const r of s)!r.closest(this.tagName)?.isSameNode(this)||(e[r.getAttribute("name")||"default"]=r.innerHTML);const n=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,n,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}async connectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url"));const s=JSON.parse(this.getAttribute("opts"));Astro[this.getAttribute("client")](async()=>{const e=this.getAttribute("renderer-url"),[i,{default:n}]=await Promise.all([import(this.getAttribute("component-url")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute("component-export")||"default"],this.hydrator=n,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/index.js

@@ -15,6 +15,7 @@ var __objRest = (source, exclude) => {
 };
 import { escapeHTML, HTMLString, markHTMLString } from "./escape.js";
 import { extractDirectives, generateHydrateScript } from "./hydration.js";
+import { createResponse } from "./response.js";
 import {
   determineIfNeedsHydrationScript,
   determinesIfNeedsDirectiveScript,
@@ -29,21 +30,25 @@ const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|l
 const htmlBooleanAttributes = /^(allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
 const htmlEnumAttributes = /^(contenteditable|draggable|spellcheck|value)$/i;
 const svgEnumAttributes = /^(autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
-async function _render(child) {
+async function* _render(child) {
   child = await child;
   if (child instanceof HTMLString) {
-    return child;
+    yield child;
   } else if (Array.isArray(child)) {
-    return markHTMLString((await Promise.all(child.map((value) => _render(value)))).join(""));
+    for (const value of child) {
+      yield markHTMLString(await _render(value));
+    }
   } else if (typeof child === "function") {
-    return _render(child());
+    yield* _render(child());
   } else if (typeof child === "string") {
-    return markHTMLString(escapeHTML(child));
+    yield markHTMLString(escapeHTML(child));
   } else if (!child && child !== 0) {
   } else if (child instanceof AstroComponent || Object.prototype.toString.call(child) === "[object AstroComponent]") {
-    return markHTMLString(await renderAstroComponent(child));
+    yield* renderAstroComponent(child);
+  } else if (typeof child === "object" && Symbol.asyncIterator in child) {
+    yield* child;
   } else {
-    return child;
+    yield child;
   }
 }
 class AstroComponent {
@@ -54,13 +59,13 @@ class AstroComponent {
   get [Symbol.toStringTag]() {
     return "AstroComponent";
   }
-  *[Symbol.iterator]() {
+  async *[Symbol.asyncIterator]() {
     const { htmlParts, expressions } = this;
     for (let i = 0; i < htmlParts.length; i++) {
       const html = htmlParts[i];
       const expression = expressions[i];
       yield markHTMLString(html);
-      yield _render(expression);
+      yield* _render(expression);
     }
   }
 }
@@ -76,7 +81,12 @@ function createComponent(cb) {
 }
 async function renderSlot(_result, slotted, fallback) {
   if (slotted) {
-    return await _render(slotted);
+    let iterator = _render(slotted);
+    let content = "";
+    for await (const chunk of iterator) {
+      content += chunk;
+    }
+    return markHTMLString(content);
   }
   return fallback;
 }
@@ -112,8 +122,7 @@ async function renderComponent(result, displayName, Component, _props, slots = {
     return markHTMLString(children2);
   }
   if (Component && Component.isAstroComponentFactory) {
-    const output = await renderToString(result, Component, _props, slots);
-    return markHTMLString(output);
+    return renderToIterable(result, Component, _props, slots);
   }
   if (!Component && !_props["client:only"]) {
     throw new Error(`Unable to render ${displayName} because it is ${Component}!
@@ -139,7 +148,12 @@ There are no \`integrations\` set in your \`astro.config.mjs\` file.
 Did you mean to add ${formatList(probableRendererNames.map((r) => "`" + r + "`"))}?`;
     throw new Error(message);
   }
-  const children = await renderSlot(result, slots == null ? void 0 : slots.default);
+  const children = {};
+  if (slots) {
+    await Promise.all(Object.entries(slots).map(([key, value]) => renderSlot(result, value).then((output) => {
+      children[key] = output;
+    })));
+  }
   let renderer;
   if (metadata.hydrate !== "only") {
     let error;
@@ -215,24 +229,36 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     }
   }
   if (!html && typeof Component === "string") {
-    html = await renderAstroComponent(await render`<${Component}${internalSpreadAttributes(props)}${markHTMLString((children == null || children == "") && voidElementNames.test(Component) ? `/>` : `>${children == null ? "" : children}</${Component}>`)}`);
+    const childSlots = Object.values(children).join("");
+    const iterable = renderAstroComponent(await render`<${Component}${internalSpreadAttributes(props)}${markHTMLString(childSlots === "" && voidElementNames.test(Component) ? `/>` : `>${childSlots}</${Component}>`)}`);
+    html = "";
+    for await (const chunk of iterable) {
+      html += chunk;
+    }
   }
   if (!hydration) {
     if (isPage) {
       return html;
     }
-    return markHTMLString(html.replace(/\<\/?astro-fragment\>/g, ""));
+    return markHTMLString(html.replace(/\<\/?astro-slot\>/g, ""));
   }
   const astroId = shorthash(`<!--${metadata.componentExport.value}:${metadata.componentUrl}-->
 ${html}
 ${serializeProps(props)}`);
   const island = await generateHydrateScript({ renderer, result, astroId, props }, metadata);
-  result._metadata.needsHydrationStyles = true;
-  const needsAstroTemplate = children && !/<\/?astro-fragment\>/.test(html);
-  const template = needsAstroTemplate ? `<template data-astro-template>${children}</template>` : "";
-  if (needsAstroTemplate) {
-    island.props.tmpl = "";
+  let unrenderedSlots = [];
+  if (html) {
+    if (Object.keys(children).length > 0) {
+      for (const key of Object.keys(children)) {
+        if (!html.includes(key === "default" ? `<astro-slot>` : `<astro-slot name="${key}">`)) {
+          unrenderedSlots.push(key);
+        }
+      }
+    }
+  } else {
+    unrenderedSlots = Object.keys(children);
   }
+  const template = unrenderedSlots.length > 0 ? unrenderedSlots.map((key) => `<template data-astro-template${key !== "default" ? `="${key}"` : ""}>${children[key]}</template>`).join("") : "";
   island.children = `${html ?? ""}${template}`;
   let prescriptType = needsHydrationScript ? "both" : needsDirectiveScript ? "directive" : null;
   let prescripts = getPrescripts(prescriptType, hydration.directive);
@@ -390,47 +416,56 @@ Update your code to remove this warning.`);
   });
   return handler.call(mod, proxy, request);
 }
-async function replaceHeadInjection(result, html) {
-  let template = html;
-  if (template.indexOf("<!--astro:head-->") > -1) {
-    template = template.replace("<!--astro:head-->", await renderHead(result));
+async function renderToString(result, componentFactory, props, children) {
+  const Component = await componentFactory(result, props, children);
+  if (!isAstroComponent(Component)) {
+    const response = Component;
+    throw response;
+  }
+  let html = "";
+  for await (const chunk of renderAstroComponent(Component)) {
+    html += chunk;
   }
-  return template;
+  return html;
 }
-async function renderToString(result, componentFactory, props, children) {
+async function renderToIterable(result, componentFactory, props, children) {
   const Component = await componentFactory(result, props, children);
   if (!isAstroComponent(Component)) {
+    console.warn(`Returning a Response is only supported inside of page components. Consider refactoring this logic into something like a function that can be used in the page.`);
     const response = Component;
     throw response;
   }
-  let template = await renderAstroComponent(Component);
-  return template;
+  return renderAstroComponent(Component);
 }
+const encoder = new TextEncoder();
 async function renderPage(result, componentFactory, props, children) {
-  try {
-    const response = await componentFactory(result, props, children);
-    if (isAstroComponent(response)) {
-      let template = await renderAstroComponent(response);
-      const html = await replaceHeadInjection(result, template);
-      return {
-        type: "html",
-        html
-      };
-    } else {
-      return {
-        type: "response",
-        response
-      };
-    }
-  } catch (err) {
-    if (err instanceof Response) {
-      return {
-        type: "response",
-        response: err
-      };
-    } else {
-      throw err;
-    }
+  const factoryReturnValue = await componentFactory(result, props, children);
+  if (isAstroComponent(factoryReturnValue)) {
+    let iterable = renderAstroComponent(factoryReturnValue);
+    let stream = new ReadableStream({
+      start(controller) {
+        async function read() {
+          let i = 0;
+          for await (const chunk of iterable) {
+            let html = chunk.toString();
+            if (i === 0) {
+              if (!/<!doctype html/i.test(html)) {
+                controller.enqueue(encoder.encode("<!DOCTYPE html>\n"));
+              }
+            }
+            controller.enqueue(encoder.encode(html));
+            i++;
+          }
+          controller.close();
+        }
+        read();
+      }
+    });
+    let init = result.response;
+    let response = createResponse(stream, init);
+    return response;
+  } else {
+    return factoryReturnValue;
   }
 }
 const uniqueElements = (item, index, all) => {
@@ -438,32 +473,30 @@ const uniqueElements = (item, index, all) => {
   const children = item.children;
   return index === all.findIndex((i) => JSON.stringify(i.props) === props && i.children == children);
 };
+const alreadyHeadRenderedResults = /* @__PURE__ */ new WeakSet();
 async function renderHead(result) {
+  alreadyHeadRenderedResults.add(result);
   const styles = Array.from(result.styles).filter(uniqueElements).map((style) => renderElement("style", style));
-  let needsHydrationStyles = result._metadata.needsHydrationStyles;
   const scripts = Array.from(result.scripts).filter(uniqueElements).map((script, i) => {
-    if ("data-astro-component-hydration" in script.props) {
-      needsHydrationStyles = true;
-    }
     return renderElement("script", script);
   });
-  if (needsHydrationStyles) {
-    styles.push(renderElement("style", {
-      props: {},
-      children: "astro-island, astro-fragment { display: contents; }"
-    }));
-  }
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));
-  return markHTMLString(links.join("\n") + styles.join("\n") + scripts.join("\n") + "\n<!--astro:head:injected-->");
+  return markHTMLString(links.join("\n") + styles.join("\n") + scripts.join("\n"));
 }
-async function renderAstroComponent(component) {
-  let template = [];
+function maybeRenderHead(result) {
+  if (alreadyHeadRenderedResults.has(result)) {
+    return "";
+  }
+  return renderHead(result);
+}
+async function* renderAstroComponent(component) {
   for await (const value of component) {
     if (value || value === 0) {
-      template.push(value);
+      for await (const chunk of _render(value)) {
+        yield markHTMLString(chunk);
+      }
     }
   }
-  return markHTMLString(await _render(template));
 }
 function componentIsHTMLElement(Component) {
   return typeof HTMLElement !== "undefined" && HTMLElement.isPrototypeOf(Component);
@@ -515,6 +548,7 @@ export {
   defineScriptVars,
   defineStyleVars,
   markHTMLString2 as markHTMLString,
+  maybeRenderHead,
   render,
   renderAstroComponent,
   renderComponent,
@@ -523,6 +557,7 @@ export {
   renderHead,
   renderPage,
   renderSlot,
+  renderToIterable,
   renderToString,
   spreadAttributes,
   markHTMLString3 as unescapeHTML

package/dist/runtime/server/metadata.js

@@ -30,7 +30,7 @@ class Metadata {
     for (const metadata of this.deepMetadata()) {
       let i = 0, pathname = metadata.mockURL.pathname;
       while (i < metadata.hoisted.length) {
-        yield `${pathname.replace("/@fs", "")}?astro&type=script&index=${i}`;
+        yield `${pathname.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
         i++;
       }
     }

package/dist/runtime/server/response.js

@@ -0,0 +1,83 @@
+var __accessCheck = (obj, member, msg) => {
+  if (!member.has(obj))
+    throw TypeError("Cannot " + msg);
+};
+var __privateGet = (obj, member, getter) => {
+  __accessCheck(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
+var __privateAdd = (obj, member, value) => {
+  if (member.has(obj))
+    throw TypeError("Cannot add the same private member more than once");
+  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+};
+var __privateSet = (obj, member, value, setter) => {
+  __accessCheck(obj, member, "write to private field");
+  setter ? setter.call(obj, value) : member.set(obj, value);
+  return value;
+};
+const isNodeJS = typeof process === "object" && Object.prototype.toString.call(process) === "[object process]";
+let StreamingCompatibleResponse;
+function createResponseClass() {
+  var _isStream, _body, _a;
+  StreamingCompatibleResponse = (_a = class extends Response {
+    constructor(body, init) {
+      let isStream = body instanceof ReadableStream;
+      super(isStream ? null : body, init);
+      __privateAdd(this, _isStream, void 0);
+      __privateAdd(this, _body, void 0);
+      __privateSet(this, _isStream, isStream);
+      __privateSet(this, _body, body);
+    }
+    get body() {
+      return __privateGet(this, _body);
+    }
+    async text() {
+      if (__privateGet(this, _isStream) && isNodeJS) {
+        let decoder = new TextDecoder();
+        let body = __privateGet(this, _body);
+        let reader = body.getReader();
+        let buffer = [];
+        while (true) {
+          let r = await reader.read();
+          if (r.value) {
+            buffer.push(...r.value);
+          }
+          if (r.done) {
+            break;
+          }
+        }
+        return decoder.decode(Uint8Array.from(buffer));
+      }
+      return super.text();
+    }
+    async arrayBuffer() {
+      if (__privateGet(this, _isStream) && isNodeJS) {
+        let body = __privateGet(this, _body);
+        let reader = body.getReader();
+        let chunks = [];
+        while (true) {
+          let r = await reader.read();
+          if (r.value) {
+            chunks.push(...r.value);
+          }
+          if (r.done) {
+            break;
+          }
+        }
+        return Uint8Array.from(chunks);
+      }
+      return super.arrayBuffer();
+    }
+  }, _isStream = new WeakMap(), _body = new WeakMap(), _a);
+  return StreamingCompatibleResponse;
+}
+const createResponse = isNodeJS ? (body, init) => {
+  if (typeof StreamingCompatibleResponse === "undefined") {
+    return new (createResponseClass())(body, init);
+  }
+  return new StreamingCompatibleResponse(body, init);
+} : (body, init) => new Response(body, init);
+export {
+  createResponse
+};

package/dist/runtime/server/scripts.js

@@ -41,7 +41,7 @@ function getDirectiveScriptText(directive) {
 function getPrescripts(type, directive) {
   switch (type) {
     case "both":
-      return `<script>${getDirectiveScriptText(directive) + islandScript}<\/script>`;
+      return `<style>astro-island,astro-slot{display:contents}</style><script>${getDirectiveScriptText(directive) + islandScript}<\/script>`;
     case "directive":
       return `<script>${getDirectiveScriptText(directive)}<\/script>`;
   }

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

@@ -673,7 +673,7 @@ export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
         }[];
     };
 }
-export declare type AsyncRendererComponentFn<U> = (Component: any, props: any, children: string | undefined, metadata?: AstroComponentMetadata) => Promise<U>;
+export declare type AsyncRendererComponentFn<U> = (Component: any, props: any, slots: Record<string, string>, metadata?: AstroComponentMetadata) => Promise<U>;
 /** Generic interface for a component (Astro, Svelte, React, etc.) */
 export interface ComponentInstance {
     $$metadata: Metadata;
@@ -907,7 +907,6 @@ export interface SSRElement {
 export interface SSRMetadata {
     renderers: SSRLoadedRenderer[];
     pathname: string;
-    needsHydrationStyles: boolean;
 }
 export interface SSRResult {
     styles: Set<SSRElement>;

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

@@ -31,12 +31,5 @@ export interface RenderOptions {
     ssr: boolean;
     request: Request;
 }
-export declare function render(opts: RenderOptions): Promise<{
-    type: 'html';
-    html: string;
-    response: ResponseInit;
-} | {
-    type: 'response';
-    response: Response;
-}>;
+export declare function render(opts: RenderOptions): Promise<Response>;
 export {};

package/dist/types/core/render/dev/index.d.ts

@@ -25,16 +25,8 @@ export interface SSROptions {
     request: Request;
 }
 export declare type ComponentPreload = [SSRLoadedRenderer[], ComponentInstance];
-export declare type RenderResponse = {
-    type: 'html';
-    html: string;
-    response: ResponseInit;
-} | {
-    type: 'response';
-    response: Response;
-};
 export declare function loadRenderers(viteServer: ViteDevServer, astroConfig: AstroConfig): Promise<SSRLoadedRenderer[]>;
 export declare function preload({ astroConfig, filePath, viteServer, }: Pick<SSROptions, 'astroConfig' | 'filePath' | 'viteServer'>): Promise<ComponentPreload>;
 /** use Vite to SSR */
-export declare function render(renderers: SSRLoadedRenderer[], mod: ComponentInstance, ssrOpts: SSROptions): Promise<RenderResponse>;
-export declare function ssr(preloadedComponent: ComponentPreload, ssrOpts: SSROptions): Promise<RenderResponse>;
+export declare function render(renderers: SSRLoadedRenderer[], mod: ComponentInstance, ssrOpts: SSROptions): Promise<Response>;
+export declare function ssr(preloadedComponent: ComponentPreload, ssrOpts: SSROptions): Promise<Response>;

package/dist/types/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 o;{const a={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,e)=>{if(t===\"\"||!Array.isArray(e))return e;const[r,s]=e;return r in a?a[r](s):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(o=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest(\"astro-island[ssr]\"))return;let e=null,r=this.querySelector(\"astro-fragment\");if(r==null&&this.hasAttribute(\"tmpl\")){let i=this.querySelector(\"template[data-astro-template]\");i&&(e=i.innerHTML,i.remove())}else r&&(e=r.innerHTML);const s=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),n):{};this.hydrator(this)(this.Component,s,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}async connectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\"));const e=JSON.parse(this.getAttribute(\"opts\"));Astro[this.getAttribute(\"client\")](async()=>{const r=this.getAttribute(\"renderer-url\"),[s,{default:i}]=await Promise.all([import(this.getAttribute(\"component-url\")),r?import(r):()=>()=>{}]);return this.Component=s[this.getAttribute(\"component-export\")||\"default\"],this.hydrator=i,this.hydrate},e,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},o.observedAttributes=[\"props\"],o))}";
+declare const _default: "var a;{const l={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,s)=>{if(t===\"\"||!Array.isArray(s))return s;const[e,i]=s;return e in l?l[e](i):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest(\"astro-island[ssr]\"))return;const s=this.querySelectorAll(\"astro-slot\"),e={},i=this.querySelectorAll(\"template[data-astro-template]\");for(const r of i)!r.closest(this.tagName)?.isSameNode(this)||(e[r.getAttribute(\"data-astro-template\")||\"default\"]=r.innerHTML,r.remove());for(const r of s)!r.closest(this.tagName)?.isSameNode(this)||(e[r.getAttribute(\"name\")||\"default\"]=r.innerHTML);const n=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,n,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}async connectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\"));const s=JSON.parse(this.getAttribute(\"opts\"));Astro[this.getAttribute(\"client\")](async()=>{const e=this.getAttribute(\"renderer-url\"),[i,{default:n}]=await Promise.all([import(this.getAttribute(\"component-url\")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute(\"component-export\")||\"default\"],this.hydrator=n,this.hydrate},s,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=[\"props\"],a))}";
 export default _default;

package/dist/types/runtime/server/index.d.ts

@@ -7,7 +7,7 @@ export declare class AstroComponent {
     private expressions;
     constructor(htmlParts: TemplateStringsArray, expressions: any[]);
     get [Symbol.toStringTag](): string;
-    [Symbol.iterator](): Generator<any, void, unknown>;
+    [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
 }
 export declare function render(htmlParts: TemplateStringsArray, ...expressions: any[]): Promise<AstroComponent>;
 export interface AstroComponentFactory {
@@ -15,9 +15,9 @@ export interface AstroComponentFactory {
     isAstroComponentFactory?: boolean;
 }
 export declare function createComponent(cb: AstroComponentFactory): AstroComponentFactory;
-export declare function renderSlot(_result: any, slotted: string, fallback?: any): Promise<any>;
+export declare function renderSlot(_result: any, slotted: string, fallback?: any): Promise<string>;
 export declare const Fragment: unique symbol;
-export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<any>;
+export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string>>;
 export declare function createAstro(filePathname: string, _site: string, projectRootStr: string): AstroGlobalPartial;
 export declare function addAttribute(value: any, key: string, shouldEscape?: boolean): any;
 export declare function spreadAttributes(values: Record<any, any>, name: string, { class: scopedClassName }?: {
@@ -28,13 +28,9 @@ export declare function defineScriptVars(vars: Record<any, any>): any;
 /** Renders an endpoint request to completion, returning the body. */
 export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput>;
 export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
-export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<{
-    type: 'html';
-    html: string;
-} | {
-    type: 'response';
-    response: Response;
-}>;
+export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<AsyncIterable<string>>;
+export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<Response>;
 export declare function renderHead(result: SSRResult): Promise<string>;
-export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): Promise<any>;
+export declare function maybeRenderHead(result: SSRResult): string | Promise<string>;
+export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string>;
 export declare function renderHTMLElement(result: SSRResult, constructor: typeof HTMLElement, props: any, slots: any): Promise<any>;

package/dist/types/runtime/server/response.d.ts

@@ -0,0 +1,3 @@
+declare type CreateResponseFn = (body?: BodyInit | null, init?: ResponseInit) => Response;
+export declare const createResponse: CreateResponseFn;
+export {};

package/dist/types/vite-plugin-astro/query.d.ts

@@ -6,7 +6,8 @@ export interface AstroQuery {
     lang?: string;
     raw?: boolean;
 }
-export declare function parseAstroRequest(id: string): {
+export interface ParsedRequestResult {
     filename: string;
     query: AstroQuery;
-};
+}
+export declare function parseAstroRequest(id: string): ParsedRequestResult;

package/dist/vite-plugin-astro/index.js

@@ -31,6 +31,15 @@ function astro({ config, logging }) {
   let viteDevServer = null;
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb);
+  function resolveRelativeFromAstroParent(id, parsedFrom) {
+    const filename = normalizeFilename(parsedFrom.filename);
+    const resolvedURL = new URL(id, `file://${filename}`);
+    const resolved = resolvedURL.pathname;
+    if (isBrowserPath(resolved)) {
+      return relativeToRoot(resolved + resolvedURL.search);
+    }
+    return slash(fileURLToPath(resolvedURL)) + resolvedURL.search;
+  }
   return {
     name: "astro:build",
     enforce: "pre",
@@ -41,17 +50,15 @@ function astro({ config, logging }) {
     configureServer(server) {
       viteDevServer = server;
     },
-    async resolveId(id, from) {
+    async resolveId(id, from, opts) {
       if (from) {
         const parsedFrom = parseAstroRequest(from);
-        if (parsedFrom.query.astro && isRelativePath(id) && parsedFrom.query.type === "script") {
-          const filename = normalizeFilename(parsedFrom.filename);
-          const resolvedURL = new URL(id, `file://${filename}`);
-          const resolved = resolvedURL.pathname;
-          if (isBrowserPath(resolved)) {
-            return relativeToRoot(resolved + resolvedURL.search);
-          }
-          return slash(fileURLToPath(resolvedURL)) + resolvedURL.search;
+        const isAstroScript = parsedFrom.query.astro && parsedFrom.query.type === "script";
+        if (isAstroScript && isRelativePath(id)) {
+          return this.resolve(resolveRelativeFromAstroParent(id, parsedFrom), from, {
+            custom: opts.custom,
+            skipSelf: true
+          });
         }
       }
       const { query } = parseAstroRequest(id);
@@ -133,7 +140,12 @@ File: ${filename}`);
             }
           }
           return {
-            code: hoistedScript.type === "inline" ? hoistedScript.code : `import "${hoistedScript.src}";`
+            code: hoistedScript.type === "inline" ? hoistedScript.code : `import "${hoistedScript.src}";`,
+            meta: {
+              vite: {
+                lang: "ts"
+              }
+            }
           };
         }
       }
@@ -161,8 +173,8 @@ const $$url = ${JSON.stringify(url)};export { $$file as file, $$url as url };
           }
           let i = 0;
           while (i < transformResult.scripts.length) {
-            deps.add(`${id}?astro&type=script&index=${i}`);
-            SUFFIX += `import "${id}?astro&type=script&index=${i}";`;
+            deps.add(`${id}?astro&type=script&index=${i}&lang.ts`);
+            SUFFIX += `import "${id}?astro&type=script&index=${i}&lang.ts";`;
             i++;
           }
           SUFFIX += `

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

@@ -52,7 +52,12 @@ async function writeWebResponse(res, webResponse) {
   }
   res.writeHead(status, _headers);
   if (body) {
-    if (body instanceof Readable) {
+    if (Symbol.for("astro.responseBody") in webResponse) {
+      let stream = webResponse[Symbol.for("astro.responseBody")];
+      for await (const chunk of stream) {
+        res.write(chunk.toString());
+      }
+    } else if (body instanceof Readable) {
       body.pipe(res);
       return;
     } else {
@@ -69,17 +74,8 @@ async function writeWebResponse(res, webResponse) {
   }
   res.end();
 }
-async function writeSSRResult(result, res, statusCode) {
-  if (result.type === "response") {
-    const { response } = result;
-    await writeWebResponse(res, response);
-    return;
-  }
-  const { html, response: init } = result;
-  const headers = init.headers;
-  headers.set("Content-Type", "text/html; charset=utf-8");
-  headers.set("Content-Length", Buffer.byteLength(html, "utf-8").toString());
-  return writeWebResponse(res, new Response(html, init));
+async function writeSSRResult(webResponse, res) {
+  return writeWebResponse(res, webResponse);
 }
 async function handle404Response(origin, config, req, res) {
   const site = config.site ? new URL(config.base, config.site) : void 0;
@@ -214,7 +210,7 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
           routeCache,
           viteServer
         });
-        return await writeSSRResult(result, res, statusCode);
+        return await writeSSRResult(result, res);
       } else {
         return handle404Response(origin, config, req, res);
       }
@@ -241,7 +237,7 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       }
     } else {
       const result = await ssr(preloadedComponent, options);
-      return await writeSSRResult(result, res, statusCode);
+      return await writeSSRResult(result, res);
     }
   } catch (_err) {
     const err = fixViteErrorMessage(createSafeError(_err), viteServer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.52",
+  "version": "1.0.0-beta.55",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -66,7 +66,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.16.1",
+    "@astrojs/compiler": "^0.17.0",
     "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.11.3",
     "@astrojs/prism": "0.4.1",
@@ -93,7 +93,6 @@
     "gray-matter": "^4.0.3",
     "html-entities": "^2.3.3",
     "html-escaper": "^3.0.3",
-    "htmlparser2": "^7.2.0",
     "kleur": "^4.1.4",
     "magic-string": "^0.25.9",
     "micromorph": "^0.1.2",

package/dist/core/render/dev/html.js

@@ -1,90 +0,0 @@
-import htmlparser2 from "htmlparser2";
-function injectTags(html, tags) {
-  let output = html;
-  if (!tags.length)
-    return output;
-  const pos = { "head-prepend": -1, head: -1, "body-prepend": -1, body: -1 };
-  const parser = new htmlparser2.Parser({
-    onopentag(tagname) {
-      if (tagname === "head")
-        pos["head-prepend"] = parser.endIndex + 1;
-      if (tagname === "body")
-        pos["body-prepend"] = parser.endIndex + 1;
-    },
-    onclosetag(tagname) {
-      if (tagname === "head")
-        pos["head"] = parser.startIndex;
-      if (tagname === "body")
-        pos["body"] = parser.startIndex;
-    }
-  });
-  parser.write(html);
-  parser.end();
-  const lastToFirst = Object.entries(pos).sort((a, b) => b[1] - a[1]);
-  lastToFirst.forEach(([name, i]) => {
-    if (i === -1) {
-      if (name === "head-prepend" || name === "head")
-        i = 0;
-      if (name === "body-prepend" || name === "body")
-        i = html.length;
-    }
-    let selected = tags.filter(({ injectTo }) => {
-      if (name === "head-prepend" && !injectTo) {
-        return true;
-      } else {
-        return injectTo === name;
-      }
-    });
-    if (!selected.length)
-      return;
-    output = output.substring(0, i) + serializeTags(selected) + html.substring(i);
-  });
-  return output;
-}
-function collectResources(html) {
-  let resources = [];
-  const parser = new htmlparser2.Parser({
-    onopentag(tagname, attrs) {
-      if (tagname === "link")
-        resources.push(attrs);
-    }
-  });
-  parser.write(html);
-  parser.end();
-  return resources;
-}
-const unaryTags = /* @__PURE__ */ new Set(["link", "meta", "base"]);
-function serializeTag({ tag, attrs, children }, indent = "") {
-  if (unaryTags.has(tag)) {
-    return `<${tag}${serializeAttrs(attrs)}>`;
-  } else {
-    return `<${tag}${serializeAttrs(attrs)}>${serializeTags(children, incrementIndent(indent))}</${tag}>`;
-  }
-}
-function serializeTags(tags, indent = "") {
-  if (typeof tags === "string") {
-    return tags;
-  } else if (tags && tags.length) {
-    return tags.map((tag) => `${indent}${serializeTag(tag, indent)}
-`).join("");
-  }
-  return "";
-}
-function serializeAttrs(attrs) {
-  let res = "";
-  for (const key in attrs) {
-    if (typeof attrs[key] === "boolean") {
-      res += attrs[key] ? ` ${key}` : ``;
-    } else {
-      res += ` ${key}=${JSON.stringify(attrs[key])}`;
-    }
-  }
-  return res;
-}
-function incrementIndent(indent = "") {
-  return `${indent}${indent[0] === "	" ? "	" : "  "}`;
-}
-export {
-  collectResources,
-  injectTags
-};

package/dist/types/core/render/dev/html.d.ts

@@ -1,7 +0,0 @@
-import type * as vite from 'vite';
-/** Inject tags into HTML (note: for best performance, group as many tags as possible into as few calls as you can) */
-export declare function injectTags(html: string, tags: vite.HtmlTagDescriptor[]): string;
-declare type Resource = Record<string, string>;
-/** Collect resources (scans final, rendered HTML so expressions have been applied) */
-export declare function collectResources(html: string): Resource[];
-export {};