astro 1.0.0-beta.63 → 1.0.0-beta.64

package/dist/core/app/index.js

@@ -153,7 +153,9 @@ callEndpoint_fn = async function(request, routeData, mod) {
     const headers = new Headers();
     const mimeType = mime.getType(url.pathname);
     if (mimeType) {
-      headers.set("Content-Type", mimeType);
+      headers.set("Content-Type", `${mimeType};charset=utf-8`);
+    } else {
+      headers.set("Content-Type", "text/plain;charset=utf-8");
     }
     const bytes = __privateGet(this, _encoder).encode(body);
     headers.set("Content-Length", bytes.byteLength.toString());

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.63";
+  const currentVersion = "1.0.0-beta.64";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.0.0-beta.63";
+const ASTRO_VERSION = "1.0.0-beta.64";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

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

@@ -48,7 +48,17 @@ var _a;
           window.dispatchEvent(new CustomEvent("astro:hydrate"));
         };
       }
-      async connectedCallback() {
+      connectedCallback() {
+        if (this.getAttribute("client") === "only" || this.firstChild) {
+          this.childrenConnectedCallback();
+        } else {
+          new MutationObserver((_, mo) => {
+            mo.disconnect();
+            this.childrenConnectedCallback();
+          }).observe(this, { childList: true });
+        }
+      }
+      async childrenConnectedCallback() {
         window.addEventListener("astro:hydrate", this.hydrate);
         await import(this.getAttribute("before-hydration-url"));
         const opts = JSON.parse(this.getAttribute("opts"));

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

@@ -1,4 +1,4 @@
-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))}`;
+var astro_island_prebuilt_default = `var a;{const l={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,r)=>{if(t===""||!Array.isArray(r))return r;const[e,i]=r;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 r=this.querySelectorAll("astro-slot"),e={},i=this.querySelectorAll("template[data-astro-template]");for(const s of i)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute("data-astro-template")||"default"]=s.innerHTML,s.remove());for(const s of r)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute("name")||"default"]=s.innerHTML);const o=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,o,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){this.getAttribute("client")==="only"||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url"));const r=JSON.parse(this.getAttribute("opts"));Astro[this.getAttribute("client")](async()=>{const e=this.getAttribute("renderer-url"),[i,{default:o}]=await Promise.all([import(this.getAttribute("component-url")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute("component-export")||"default"],this.hydrator=o,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/index.js

@@ -448,25 +448,28 @@ async function renderToIterable(result, componentFactory, props, children) {
 }
 const encoder = new TextEncoder();
 async function renderPage(result, componentFactory, props, children, streaming) {
-  let iterable;
   if (!componentFactory.isAstroComponentFactory) {
     const pageProps = { ...props ?? {}, "server:root": true };
     const output = await renderComponent(result, componentFactory.name, componentFactory, pageProps, null);
     let html = output.toString();
     if (!/<!doctype html/i.test(html)) {
-      html = `<!DOCTYPE html>
-${await maybeRenderHead(result)}${html}`;
+      let rest = html;
+      html = `<!DOCTYPE html>`;
+      for await (let chunk of maybeRenderHead(result)) {
+        html += chunk;
+      }
+      html += rest;
     }
     return new Response(html, {
       headers: new Headers([
         ["Content-Type", "text/html; charset=utf-8"],
-        ["Content-Length", `${Buffer.byteLength(html, "utf-8")}`]
+        ["Content-Length", Buffer.byteLength(html, "utf-8").toString()]
       ])
     });
   }
   const factoryReturnValue = await componentFactory(result, props, children);
   if (isAstroComponent(factoryReturnValue)) {
-    let iterable2 = renderAstroComponent(factoryReturnValue);
+    let iterable = renderAstroComponent(factoryReturnValue);
     let init = result.response;
     let headers = new Headers(init.headers);
     let body;
@@ -475,7 +478,7 @@ ${await maybeRenderHead(result)}${html}`;
         start(controller) {
           async function read() {
             let i = 0;
-            for await (const chunk of iterable2) {
+            for await (const chunk of iterable) {
               let html = chunk.toString();
               if (i === 0) {
                 if (!/<!doctype html/i.test(html)) {
@@ -493,7 +496,7 @@ ${await maybeRenderHead(result)}${html}`;
     } else {
       body = "";
       let i = 0;
-      for await (const chunk of iterable2) {
+      for await (const chunk of iterable) {
         let html = chunk.toString();
         if (i === 0) {
           if (!/<!doctype html/i.test(html)) {
@@ -504,7 +507,7 @@ ${await maybeRenderHead(result)}${html}`;
         i++;
       }
       const bytes = encoder.encode(body);
-      headers.set("Content-Length", `${bytes.byteLength}`);
+      headers.set("Content-Length", bytes.byteLength.toString());
     }
     let response = createResponse(body, { ...init, headers });
     return response;
@@ -518,7 +521,7 @@ const uniqueElements = (item, index, all) => {
   return index === all.findIndex((i) => JSON.stringify(i.props) === props && i.children == children);
 };
 const alreadyHeadRenderedResults = /* @__PURE__ */ new WeakSet();
-async function renderHead(result) {
+function renderHead(result) {
   alreadyHeadRenderedResults.add(result);
   const styles = Array.from(result.styles).filter(uniqueElements).map((style) => renderElement("style", style));
   result.styles.clear();
@@ -528,11 +531,11 @@ async function renderHead(result) {
   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"));
 }
-function maybeRenderHead(result) {
+async function* maybeRenderHead(result) {
   if (alreadyHeadRenderedResults.has(result)) {
-    return "";
+    return;
   }
-  return renderHead(result);
+  yield renderHead(result);
 }
 async function* renderAstroComponent(component) {
   for await (const value of component) {

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 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))}";
+declare const _default: "var a;{const l={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,r)=>{if(t===\"\"||!Array.isArray(r))return r;const[e,i]=r;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 r=this.querySelectorAll(\"astro-slot\"),e={},i=this.querySelectorAll(\"template[data-astro-template]\");for(const s of i)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute(\"data-astro-template\")||\"default\"]=s.innerHTML,s.remove());for(const s of r)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute(\"name\")||\"default\"]=s.innerHTML);const o=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),n):{};this.hydrator(this)(this.Component,o,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){this.getAttribute(\"client\")===\"only\"||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\"));const r=JSON.parse(this.getAttribute(\"opts\"));Astro[this.getAttribute(\"client\")](async()=>{const e=this.getAttribute(\"renderer-url\"),[i,{default:o}]=await Promise.all([import(this.getAttribute(\"component-url\")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute(\"component-export\")||\"default\"],this.hydrator=o,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=[\"props\"],a))}";
 export default _default;

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

@@ -32,6 +32,6 @@ export declare function renderToString(result: SSRResult, componentFactory: Astr
 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, streaming: boolean): Promise<Response>;
 export declare function renderHead(result: SSRResult): Promise<string>;
-export declare function maybeRenderHead(result: SSRResult): string | Promise<string>;
+export declare function maybeRenderHead(result: SSRResult): AsyncIterable<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/vite-plugin-astro-server/index.js

@@ -1,3 +1,4 @@
+import mime from "mime";
 import { Readable } from "stream";
 import stripAnsi from "strip-ansi";
 import { call as callEndpoint } from "../core/endpoint/dev/index.js";
@@ -234,7 +235,12 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       if (result.type === "response") {
         await writeWebResponse(res, result.response);
       } else {
-        res.writeHead(200);
+        let contentType = "text/plain";
+        const computedMimeType = route.pathname ? mime.getType(route.pathname) : null;
+        if (computedMimeType) {
+          contentType = computedMimeType;
+        }
+        res.writeHead(200, { "Content-Type": `${contentType};charset=utf-8` });
         res.end(result.body);
       }
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.63",
+  "version": "1.0.0-beta.64",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -72,7 +72,7 @@
     "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.11.3",
     "@astrojs/prism": "0.4.1",
-    "@astrojs/telemetry": "^0.2.3",
+    "@astrojs/telemetry": "^0.2.4",
     "@astrojs/webapi": "^0.12.0",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",