astro 1.0.4 → 1.0.7

package/dist/cli/index.js

@@ -20,7 +20,7 @@ function printAstroHelp() {
   printHelp({
     commandName: "astro",
     usage: "[command] [...flags]",
-    headline: "Futuristic web development tool.",
+    headline: "Build faster websites.",
     tables: {
       Commands: [
         ["add", "Add an integration."],

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

@@ -78,30 +78,27 @@ ${bgMagenta(black(" finalizing server assets "))}
   }
 }
 async function ssrBuild(opts, internals, input) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const { astroConfig, viteConfig } = opts;
   const ssr = astroConfig.output === "server";
   const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
   const viteBuildConfig = {
+    ...viteConfig,
     logLevel: opts.viteConfig.logLevel ?? "error",
     mode: "production",
-    css: viteConfig.css,
-    optimizeDeps: {
-      include: [...((_a = viteConfig.optimizeDeps) == null ? void 0 : _a.include) ?? []],
-      exclude: [...((_b = viteConfig.optimizeDeps) == null ? void 0 : _b.exclude) ?? []]
-    },
     build: {
       ...viteConfig.build,
       emptyOutDir: false,
       manifest: false,
       outDir: fileURLToPath(out),
       rollupOptions: {
+        ...(_a = viteConfig.build) == null ? void 0 : _a.rollupOptions,
         input: [],
         output: {
           format: "esm",
           chunkFileNames: "chunks/[name].[hash].mjs",
           assetFileNames: "assets/[name].[hash][extname]",
-          ...(_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output,
+          ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output,
           entryFileNames: opts.buildConfig.serverEntry
         }
       },
@@ -125,12 +122,7 @@ async function ssrBuild(opts, internals, input) {
       vitePluginAnalyzer(internals)
     ],
     publicDir: ssr ? false : viteConfig.publicDir,
-    root: viteConfig.root,
-    envPrefix: "PUBLIC_",
-    server: viteConfig.server,
-    base: astroConfig.base,
-    ssr: viteConfig.ssr,
-    resolve: viteConfig.resolve
+    envPrefix: "PUBLIC_"
   };
   await runHookBuildSetup({
     config: astroConfig,
@@ -141,7 +133,7 @@ async function ssrBuild(opts, internals, input) {
   return await vite.build(viteBuildConfig);
 }
 async function clientBuild(opts, internals, input) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const { astroConfig, viteConfig } = opts;
   const timer = performance.now();
   const ssr = astroConfig.output === "server";
@@ -155,26 +147,23 @@ async function clientBuild(opts, internals, input) {
   info(opts.logging, null, `
 ${bgGreen(black(" building client "))}`);
   const viteBuildConfig = {
+    ...viteConfig,
     logLevel: "info",
     mode: "production",
-    css: viteConfig.css,
-    optimizeDeps: {
-      include: [...((_a = viteConfig.optimizeDeps) == null ? void 0 : _a.include) ?? []],
-      exclude: [...((_b = viteConfig.optimizeDeps) == null ? void 0 : _b.exclude) ?? []]
-    },
     build: {
       ...viteConfig.build,
       emptyOutDir: false,
       minify: "esbuild",
       outDir: fileURLToPath(out),
       rollupOptions: {
+        ...(_a = viteConfig.build) == null ? void 0 : _a.rollupOptions,
         input: Array.from(input),
         output: {
           format: "esm",
           entryFileNames: "[name].[hash].js",
           chunkFileNames: "chunks/[name].[hash].js",
           assetFileNames: "assets/[name].[hash][extname]",
-          ...(_d = (_c = viteConfig.build) == null ? void 0 : _c.rollupOptions) == null ? void 0 : _d.output
+          ...(_c = (_b = viteConfig.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.output
         },
         preserveEntrySignatures: "exports-only"
       },
@@ -191,11 +180,7 @@ ${bgGreen(black(" building client "))}`);
       }),
       ...viteConfig.plugins || []
     ],
-    publicDir: viteConfig.publicDir,
-    root: viteConfig.root,
-    envPrefix: "PUBLIC_",
-    server: viteConfig.server,
-    base: astroConfig.base
+    envPrefix: "PUBLIC_"
   };
   await runHookBuildSetup({
     config: astroConfig,

package/dist/core/config.js

@@ -218,7 +218,7 @@ function resolveFlags(flags) {
     port: typeof flags.port === "number" ? flags.port : void 0,
     config: typeof flags.config === "string" ? flags.config : void 0,
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-    drafts: typeof flags.drafts === "boolean" ? flags.drafts : false
+    drafts: typeof flags.drafts === "boolean" ? flags.drafts : void 0
   };
 }
 function mergeCLIFlags(astroConfig, flags, cmd) {

package/dist/core/dev/index.js

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

package/dist/core/errors.js

@@ -12,7 +12,7 @@ var AstroErrorCodes = /* @__PURE__ */ ((AstroErrorCodes2) => {
   return AstroErrorCodes2;
 })(AstroErrorCodes || {});
 function cleanErrorStack(stack) {
-  return stack.split(/\n/g).filter((l) => /^\s*at/.test(l)).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
+  return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
 }
 function fixViteErrorMessage(_err, server, filePath) {
   var _a, _b;

package/dist/core/messages.js

@@ -15,7 +15,6 @@ import {
   yellow
 } from "kleur/colors";
 import os from "os";
-import { cleanErrorStack } from "./errors.js";
 import { emoji, getLocalAddress, padMultilineString } from "./util.js";
 const PREFIX_PADDING = 6;
 function req({
@@ -47,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.4";
+  const version = "1.0.7";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -190,10 +189,10 @@ function formatErrorMessage(err, args = []) {
     args.push(red(padMultilineString(err.frame, 4)));
   }
   if (args.length === 1 && err.stack) {
-    args.push(dim(cleanErrorStack(err.stack)));
+    args.push(dim(err.stack));
   } else if (err.stack) {
     args.push(`  ${bold("Stacktrace:")}`);
-    args.push(dim(cleanErrorStack(err.stack)));
+    args.push(dim(err.stack));
     args.push(``);
   }
   return args.join("\n");
@@ -226,7 +225,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.0.4"}`
+        `v${"1.0.7"}`
       )} ${headline}`
     );
   }

package/dist/core/preview/index.js

@@ -9,6 +9,11 @@ import * as msg from "../messages.js";
 import { getResolvedHostForHttpServer } from "./util.js";
 const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
 async function preview(config, { logging }) {
+  if (config.output === "server") {
+    throw new Error(
+      `[preview] 'output: server' not supported. Use your deploy platform's preview command directly instead, if one exists. (ex: 'netlify dev', 'vercel dev', 'wrangler', etc.)`
+    );
+  }
   const startServerTime = performance.now();
   const defaultOrigin = "http://localhost";
   const trailingSlash = config.trailingSlash;

package/dist/core/render/result.js

@@ -223,8 +223,7 @@ const canonicalURL = new URL(Astro.url.pathname, Astro.site);
       renderers,
       pathname,
       hasHydrationScript: false,
-      hasDirectives: /* @__PURE__ */ new Set(),
-      pendingInstructions: /* @__PURE__ */ new Set()
+      hasDirectives: /* @__PURE__ */ new Set()
     },
     response
   };

package/dist/core/util.js

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

package/dist/runtime/client/idle.js

@@ -9,3 +9,4 @@
     setTimeout(cb, 200);
   }
 };
+window.dispatchEvent(new Event("astro:idle"));

package/dist/runtime/client/idle.prebuilt.js

@@ -1,4 +1,4 @@
-var idle_prebuilt_default = `(self.Astro=self.Astro||{}).idle=a=>{const e=async()=>{await(await a())()};"requestIdleCallback"in window?window.requestIdleCallback(e):setTimeout(e,200)};`;
+var idle_prebuilt_default = `(self.Astro=self.Astro||{}).idle=t=>{const e=async()=>{await(await t())()};"requestIdleCallback"in window?window.requestIdleCallback(e):setTimeout(e,200)},window.dispatchEvent(new Event("astro:idle"));`;
 export {
   idle_prebuilt_default as default
 };

package/dist/runtime/client/load.js

@@ -4,3 +4,4 @@
     await hydrate();
   })();
 };
+window.dispatchEvent(new Event("astro:load"));

package/dist/runtime/client/load.prebuilt.js

@@ -1,4 +1,4 @@
-var load_prebuilt_default = `(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};`;
+var load_prebuilt_default = `(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()},window.dispatchEvent(new Event("astro:load"));`;
 export {
   load_prebuilt_default as default
 };

package/dist/runtime/client/media.js

@@ -12,3 +12,4 @@
     }
   }
 };
+window.dispatchEvent(new Event("astro:media"));

package/dist/runtime/client/media.prebuilt.js

@@ -1,4 +1,4 @@
-var media_prebuilt_default = `(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener("change",t,{once:!0})}};`;
+var media_prebuilt_default = `(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener("change",t,{once:!0})}},window.dispatchEvent(new Event("astro:media"));`;
 export {
   media_prebuilt_default as default
 };

package/dist/runtime/client/only.js

@@ -4,3 +4,4 @@
     await hydrate();
   })();
 };
+window.dispatchEvent(new Event("astro:only"));

package/dist/runtime/client/only.prebuilt.js

@@ -1,4 +1,4 @@
-var only_prebuilt_default = `(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};`;
+var only_prebuilt_default = `(self.Astro=self.Astro||{}).only=t=>{(async()=>await(await t())())()},window.dispatchEvent(new Event("astro:only"));`;
 export {
   only_prebuilt_default as default
 };

package/dist/runtime/client/visible.js

@@ -17,3 +17,4 @@
     io.observe(child);
   }
 };
+window.dispatchEvent(new Event("astro:visible"));

package/dist/runtime/client/visible.prebuilt.js

@@ -1,4 +1,4 @@
-var visible_prebuilt_default = `(self.Astro=self.Astro||{}).visible=(i,c,n)=>{const r=async()=>{await(await i())()};let s=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){s.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];s.observe(t)}};`;
+var visible_prebuilt_default = `(self.Astro=self.Astro||{}).visible=(s,c,n)=>{const r=async()=>{await(await s())()};let i=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){i.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];i.observe(t)}},window.dispatchEvent(new Event("astro:visible"));`;
 export {
   visible_prebuilt_default as default
 };

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

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.0.4";
+const ASTRO_VERSION = "1.0.7";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

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

@@ -63,8 +63,16 @@ var _a;
         async childrenConnectedCallback() {
           window.addEventListener("astro:hydrate", this.hydrate);
           await import(this.getAttribute("before-hydration-url"));
+          this.start();
+        }
+        start() {
           const opts = JSON.parse(this.getAttribute("opts"));
-          Astro[this.getAttribute("client")](
+          const directive = this.getAttribute("client");
+          if (Astro[directive] === void 0) {
+            window.addEventListener(`astro:${directive}`, () => this.start(), { once: true });
+            return;
+          }
+          Astro[directive](
             async () => {
               const rendererUrl = this.getAttribute("renderer-url");
               const [componentModule, { default: hydrator }] = await Promise.all([

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,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[s,i]=r;return s in l?l[s](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"),s={},i=this.querySelectorAll("template[data-astro-template]");for(const e of i)!e.closest(this.tagName)?.isSameNode(this)||(s[e.getAttribute("data-astro-template")||"default"]=e.innerHTML,e.remove());for(const e of r)!e.closest(this.tagName)?.isSameNode(this)||(s[e.getAttribute("name")||"default"]=e.innerHTML);const o=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,o,s,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,s)=>{s.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 s=this.getAttribute("renderer-url"),[i,{default:o}]=await Promise.all([import(this.getAttribute("component-url")),s?import(s):()=>()=>{}]),e=this.getAttribute("component-export")||"default";if(!e.includes("."))this.Component=i[e];else{this.Component=i;for(const c of e.split("."))this.Component=this.Component[c]}return this.hydrator=o,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
+var astro_island_prebuilt_default = `var d;{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",(d=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.hasAttribute("await-children")||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")),this.start()}start(){const r=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const i=this.getAttribute("renderer-url"),[o,{default:s}]=await Promise.all([import(this.getAttribute("component-url")),i?import(i):()=>()=>{}]),a=this.getAttribute("component-export")||"default";if(!a.includes("."))this.Component=o[a];else{this.Component=o;for(const c of a.split("."))this.Component=this.Component[c]}return this.hydrator=s,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},d.observedAttributes=["props"],d))}`;
 export {
   astro_island_prebuilt_default as default
 };

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

@@ -1,5 +1,6 @@
 import { escapeHTML, HTMLString, markHTMLString } from "../escape.js";
 import { AstroComponent, renderAstroComponent } from "./astro.js";
+import { stringifyChunk } from "./common.js";
 async function* renderChild(child) {
   child = await child;
   if (child instanceof HTMLString) {
@@ -27,7 +28,7 @@ async function renderSlot(result, slotted, fallback) {
     let content = "";
     for await (const chunk of iterator) {
       if (chunk.type === "directive") {
-        result._metadata.pendingInstructions.add(chunk);
+        content += stringifyChunk(result, chunk);
       } else {
         content += chunk;
       }

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

@@ -35,6 +35,9 @@ class AstroComponent {
 function isAstroComponent(obj) {
   return typeof obj === "object" && Object.prototype.toString.call(obj) === "[object AstroComponent]";
 }
+function isAstroComponentFactory(obj) {
+  return obj == null ? false : !!obj.isAstroComponentFactory;
+}
 async function* renderAstroComponent(component) {
   for await (const value of component) {
     if (value || value === 0) {
@@ -83,6 +86,7 @@ async function renderTemplate(htmlParts, ...expressions) {
 export {
   AstroComponent,
   isAstroComponent,
+  isAstroComponentFactory,
   renderAstroComponent,
   renderTemplate,
   renderToIterable,

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

@@ -3,7 +3,12 @@ import { extractDirectives, generateHydrateScript } from "../hydration.js";
 import { serializeProps } from "../serialize.js";
 import { shorthash } from "../shorthash.js";
 import { renderSlot } from "./any.js";
-import { renderAstroComponent, renderTemplate, renderToIterable } from "./astro.js";
+import {
+  isAstroComponentFactory,
+  renderAstroComponent,
+  renderTemplate,
+  renderToIterable
+} from "./astro.js";
 import { Fragment, Renderer } from "./common.js";
 import { componentIsHTMLElement, renderHTMLElement } from "./dom.js";
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from "./util.js";
@@ -29,7 +34,7 @@ function getComponentType(Component) {
   if (Component && typeof Component === "object" && Component["astro:html"]) {
     return "html";
   }
-  if (Component && Component.isAstroComponentFactory) {
+  if (isAstroComponentFactory(Component)) {
     return "astro-factory";
   }
   return "unknown";

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

@@ -1,11 +1,15 @@
 import { createResponse } from "../response.js";
-import { isAstroComponent, renderAstroComponent } from "./astro.js";
+import { isAstroComponent, isAstroComponentFactory, renderAstroComponent } from "./astro.js";
 import { stringifyChunk } from "./common.js";
 import { renderComponent } from "./component.js";
 import { maybeRenderHead } from "./head.js";
 const encoder = new TextEncoder();
+const needsHeadRenderingSymbol = Symbol.for("astro.needsHeadRendering");
+function nonAstroPageNeedsHeadInjection(pageComponent) {
+  return needsHeadRenderingSymbol in pageComponent && !!pageComponent[needsHeadRenderingSymbol];
+}
 async function renderPage(result, componentFactory, props, children, streaming) {
-  if (!componentFactory.isAstroComponentFactory) {
+  if (!isAstroComponentFactory(componentFactory)) {
     const pageProps = { ...props ?? {}, "server:root": true };
     const output = await renderComponent(
       result,
@@ -18,15 +22,18 @@ async function renderPage(result, componentFactory, props, children, streaming)
     if (!/<!doctype html/i.test(html)) {
       let rest = html;
       html = `<!DOCTYPE html>`;
-      for await (let chunk of maybeRenderHead(result)) {
-        html += chunk;
+      if (nonAstroPageNeedsHeadInjection(componentFactory)) {
+        for await (let chunk of maybeRenderHead(result)) {
+          html += chunk;
+        }
       }
       html += rest;
     }
-    return new Response(html, {
+    const bytes = encoder.encode(html);
+    return new Response(bytes, {
       headers: new Headers([
         ["Content-Type", "text/html; charset=utf-8"],
-        ["Content-Length", Buffer.byteLength(html, "utf-8").toString()]
+        ["Content-Length", bytes.byteLength.toString()]
       ])
     });
   }
@@ -36,24 +43,13 @@ async function renderPage(result, componentFactory, props, children, streaming)
     let init = result.response;
     let headers = new Headers(init.headers);
     let body;
-    async function* eachChunk() {
-      for await (const chunk of iterable) {
-        if (result._metadata.pendingInstructions.size) {
-          for (const instr of result._metadata.pendingInstructions) {
-            result._metadata.pendingInstructions.delete(instr);
-            yield instr;
-          }
-        }
-        yield chunk;
-      }
-    }
     if (streaming) {
       body = new ReadableStream({
         start(controller) {
           async function read() {
             let i = 0;
             try {
-              for await (const chunk of eachChunk()) {
+              for await (const chunk of iterable) {
                 let html = stringifyChunk(result, chunk);
                 if (i === 0) {
                   if (!/<!doctype html/i.test(html)) {
@@ -74,7 +70,7 @@ async function renderPage(result, componentFactory, props, children, streaming)
     } else {
       body = "";
       let i = 0;
-      for await (const chunk of eachChunk()) {
+      for await (const chunk of iterable) {
         let html = stringifyChunk(result, chunk);
         if (i === 0) {
           if (!/<!doctype html/i.test(html)) {

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

@@ -799,8 +799,7 @@ export interface MarkdownLayoutProps<T extends Record<string, any>> {
     rawContent: MarkdownInstance<T>['rawContent'];
     compiledContent: MarkdownInstance<T>['compiledContent'];
 }
-export interface MDXLayoutProps<T> extends Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'> {
-}
+export declare type MDXLayoutProps<T> = Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'>;
 export declare type GetHydrateCallback = () => Promise<() => void | Promise<void>>;
 /**
  * getStaticPaths() options
@@ -1016,25 +1015,11 @@ export interface SSRElement {
     props: Record<string, any>;
     children: string;
 }
-export interface HydrationMetadata {
-    directive: string;
-    value: string;
-    componentUrl: string;
-    componentExport: {
-        value: string;
-    };
-}
-export interface SSRRenderInstruction {
-    type: 'directive';
-    result: SSRResult;
-    hydration: HydrationMetadata;
-}
 export interface SSRMetadata {
     renderers: SSRLoadedRenderer[];
     pathname: string;
     hasHydrationScript: boolean;
     hasDirectives: Set<string>;
-    pendingInstructions: Set<SSRRenderInstruction>;
 }
 export interface SSRResult {
     styles: Set<SSRElement>;

package/dist/types/runtime/client/idle.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: "(self.Astro=self.Astro||{}).idle=a=>{const e=async()=>{await(await a())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)};";
+declare const _default: "(self.Astro=self.Astro||{}).idle=t=>{const e=async()=>{await(await t())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)},window.dispatchEvent(new Event(\"astro:idle\"));";
 export default _default;

package/dist/types/runtime/client/load.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: "(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};";
+declare const _default: "(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()},window.dispatchEvent(new Event(\"astro:load\"));";
 export default _default;

package/dist/types/runtime/client/media.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: "(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener(\"change\",t,{once:!0})}};";
+declare const _default: "(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener(\"change\",t,{once:!0})}},window.dispatchEvent(new Event(\"astro:media\"));";
 export default _default;

package/dist/types/runtime/client/only.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: "(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};";
+declare const _default: "(self.Astro=self.Astro||{}).only=t=>{(async()=>await(await t())())()},window.dispatchEvent(new Event(\"astro:only\"));";
 export default _default;

package/dist/types/runtime/client/visible.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: "(self.Astro=self.Astro||{}).visible=(i,c,n)=>{const r=async()=>{await(await i())()};let s=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){s.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];s.observe(t)}};";
+declare const _default: "(self.Astro=self.Astro||{}).visible=(s,c,n)=>{const r=async()=>{await(await s())()};let i=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){i.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];i.observe(t)}},window.dispatchEvent(new Event(\"astro:visible\"));";
 export default _default;

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

@@ -1,4 +1,4 @@
 declare type directiveAstroKeys = 'load' | 'idle' | 'visible' | 'media' | 'only';
 declare const Astro: {
-    [k in directiveAstroKeys]: (fn: () => Promise<() => void>, opts: Record<string, any>, root: HTMLElement) => void;
+    [k in directiveAstroKeys]?: (fn: () => Promise<() => void>, opts: Record<string, any>, root: HTMLElement) => void;
 };

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

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

@@ -1,6 +1,13 @@
-import type { AstroComponentMetadata, HydrationMetadata, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { AstroComponentMetadata, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
 export declare const HydrationDirectiveProps: Set<string>;
-export { HydrationMetadata };
+export interface HydrationMetadata {
+    directive: string;
+    value: string;
+    componentUrl: string;
+    componentExport: {
+        value: string;
+    };
+}
 interface ExtractedProps {
     isPage: boolean;
     hydration: HydrationMetadata | null;
@@ -16,3 +23,4 @@ interface HydrateScriptOptions {
 }
 /** For hydrated components, generate a <script type="module"> to load the component */
 export declare function generateHydrateScript(scriptOptions: HydrateScriptOptions, metadata: Required<AstroComponentMetadata>): Promise<SSRElement>;
+export {};

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

@@ -4,7 +4,7 @@ export { escapeHTML, HTMLString, markHTMLString, markHTMLString as unescapeHTML,
 export type { Metadata } from './metadata';
 export { createMetadata } from './metadata.js';
 export { addAttribute, defineScriptVars, Fragment, maybeRenderHead, renderAstroComponent, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderTemplate as render, renderTemplate, renderToString, stringifyChunk, voidElementNames, } from './render/index.js';
-export type { AstroComponentFactory } from './render/index.js';
+export type { AstroComponentFactory, RenderInstruction } from './render/index.js';
 import type { AstroComponentFactory } from './render/index.js';
 export declare function createComponent(cb: AstroComponentFactory): AstroComponentFactory;
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;

package/dist/types/runtime/server/render/any.d.ts

@@ -1,3 +1,2 @@
-import { SSRResult } from '../../../@types/astro';
 export declare function renderChild(child: any): AsyncIterable<any>;
-export declare function renderSlot(result: SSRResult, slotted: string, fallback?: any): Promise<string>;
+export declare function renderSlot(result: any, slotted: string, fallback?: any): Promise<string>;

package/dist/types/runtime/server/render/astro.d.ts

@@ -1,5 +1,6 @@
-import type { SSRRenderInstruction, SSRResult } from '../../../@types/astro';
+import type { SSRResult } from '../../../@types/astro';
 import type { AstroComponentFactory } from './index';
+import type { RenderInstruction } from './types';
 export declare class AstroComponent {
     private htmlParts;
     private expressions;
@@ -8,7 +9,8 @@ export declare class AstroComponent {
     [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
 }
 export declare function isAstroComponent(obj: any): obj is AstroComponent;
-export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string | SSRRenderInstruction>;
+export declare function isAstroComponentFactory(obj: any): obj is AstroComponentFactory;
+export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string | RenderInstruction>;
 export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
-export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, displayName: string, props: any, children: any): Promise<AsyncIterable<string | SSRRenderInstruction>>;
+export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, displayName: string, props: any, children: any): Promise<AsyncIterable<string | RenderInstruction>>;
 export declare function renderTemplate(htmlParts: TemplateStringsArray, ...expressions: any[]): Promise<AstroComponent>;

package/dist/types/runtime/server/render/common.d.ts

@@ -1,4 +1,5 @@
-import type { SSRRenderInstruction, SSRResult } from '../../../@types/astro';
+import type { SSRResult } from '../../../@types/astro';
+import type { RenderInstruction } from './types.js';
 export declare const Fragment: unique symbol;
 export declare const Renderer: unique symbol;
-export declare function stringifyChunk(result: SSRResult, chunk: string | SSRRenderInstruction): any;
+export declare function stringifyChunk(result: SSRResult, chunk: string | RenderInstruction): any;

package/dist/types/runtime/server/render/component.d.ts

@@ -1,2 +1,3 @@
-import type { SSRRenderInstruction, SSRResult } from '../../../@types/astro';
-export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string | SSRRenderInstruction>>;
+import type { SSRResult } from '../../../@types/astro';
+import type { RenderInstruction } from './types.js';
+export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string | RenderInstruction>>;

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

@@ -6,6 +6,7 @@ export { renderComponent } from './component.js';
 export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export { renderPage } from './page.js';
+export type { RenderInstruction } from './types';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';
 export interface AstroComponentFactory {
     (result: any, props: any, slots: any): ReturnType<typeof renderTemplate> | Response;

package/dist/types/runtime/server/render/page.d.ts

@@ -1,3 +1,9 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { AstroComponentFactory } from './index';
-export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any, streaming: boolean): Promise<Response>;
+declare const needsHeadRenderingSymbol: unique symbol;
+declare type NonAstroPageComponent = {
+    name: string;
+    [needsHeadRenderingSymbol]: boolean;
+};
+export declare function renderPage(result: SSRResult, componentFactory: AstroComponentFactory | NonAstroPageComponent, props: any, children: any, streaming: boolean): Promise<Response>;
+export {};

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

@@ -0,0 +1,7 @@
+import type { SSRResult } from '../../../@types/astro';
+import type { HydrationMetadata } from '../hydration.js';
+export interface RenderInstruction {
+    type: 'directive';
+    result: SSRResult;
+    hydration: HydrationMetadata;
+}

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

@@ -176,12 +176,6 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
   });
   async function matchRoute() {
     const matches = matchAllRoutes(pathname, manifest);
-    if (config.output === "server" && matches.length > 1) {
-      throw new Error(`Found multiple matching routes for "${pathname}"! When using \`output: 'server'\`, only one route in \`src/pages\` can match a given URL. Found:
-
-${matches.map(({ component }) => `- ${component}`).join("\n")}
-`);
-    }
     for await (const maybeRoute of matches) {
       const filePath2 = new URL(`./${maybeRoute.component}`, config.root);
       const preloadedComponent = await preload({ astroConfig: config, filePath: filePath2, viteServer });
@@ -259,7 +253,8 @@ ${matches.map(({ component }) => `- ${component}`).join("\n")}
         await writeWebResponse(res, result.response);
       } else {
         let contentType = "text/plain";
-        const computedMimeType = route.pathname ? mime.getType(route.pathname) : null;
+        const filepath = route.pathname || route.segments.map((segment) => segment.map((p) => p.content).join("")).join("/");
+        const computedMimeType = mime.getType(filepath);
         if (computedMimeType) {
           contentType = computedMimeType;
         }

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

@@ -6,7 +6,6 @@ import path from "path";
 import { error } from "../core/logger/core.js";
 import { parseNpmName } from "../core/util.js";
 import tagExportsPlugin from "./tag.js";
-const JSX_RENDERER_CACHE = /* @__PURE__ */ new WeakMap();
 const JSX_EXTENSIONS = /* @__PURE__ */ new Set([".jsx", ".tsx", ".mdx"]);
 const IMPORT_STATEMENTS = {
   react: "import React from 'react'",
@@ -15,6 +14,7 @@ const IMPORT_STATEMENTS = {
   astro: "import 'astro/jsx-runtime'"
 };
 const PREVENT_UNUSED_IMPORTS = ";;(React,Fragment,h);";
+const IMPORT_KEYWORD_REGEX = /import/;
 function getEsbuildLoader(fileExt) {
   if (fileExt === ".mdx")
     return "jsx";
@@ -26,6 +26,36 @@ function collectJSXRenderers(renderers) {
     renderersWithJSXSupport.map((r) => [r.jsxImportSource, r])
   );
 }
+function detectImportSourceFromComments(code) {
+  const multiline = code.match(/\/\*\*?[\S\s]*\*\//gm) || [];
+  for (const comment of multiline) {
+    const [_, lib] = comment.slice(0, -2).match(/@jsxImportSource\s*(\S+)/) || [];
+    if (lib) {
+      return lib.trim();
+    }
+  }
+}
+async function detectImportSourceFromImports(code, id, jsxRenderers) {
+  const { code: jsCode } = await esbuild.transform(code + PREVENT_UNUSED_IMPORTS, {
+    loader: getEsbuildLoader(path.extname(id)),
+    jsx: "transform",
+    jsxFactory: "h",
+    jsxFragment: "Fragment",
+    sourcefile: id,
+    sourcemap: "inline"
+  });
+  const [imports] = eslexer.parse(jsCode);
+  if (imports.length > 0) {
+    for (let { n: spec } of imports) {
+      const pkg = spec && parseNpmName(spec);
+      if (!pkg)
+        continue;
+      if (jsxRenderers.has(pkg.name)) {
+        return pkg.name;
+      }
+    }
+  }
+}
 async function transformJSX({
   code,
   mode,
@@ -73,11 +103,25 @@ async function transformJSX({
 }
 function jsx({ config, logging }) {
   let viteConfig;
+  const jsxRenderers = /* @__PURE__ */ new Map();
+  const jsxRenderersIntegrationOnly = /* @__PURE__ */ new Map();
+  let astroJSXRenderer;
+  let defaultJSXRendererEntry;
   return {
     name: "astro:jsx",
     enforce: "pre",
-    configResolved(resolvedConfig) {
+    async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
+      const possibleRenderers = await collectJSXRenderers(config._ctx.renderers);
+      for (const [importSource, renderer] of possibleRenderers) {
+        jsxRenderers.set(importSource, renderer);
+        if (importSource === "astro") {
+          astroJSXRenderer = renderer;
+        } else {
+          jsxRenderersIntegrationOnly.set(importSource, renderer);
+        }
+      }
+      defaultJSXRendererEntry = [...jsxRenderersIntegrationOnly.entries()][0];
     },
     async transform(code, id, opts) {
       const ssr = Boolean(opts == null ? void 0 : opts.ssr);
@@ -85,130 +129,78 @@ function jsx({ config, logging }) {
         return null;
       }
       const { mode } = viteConfig;
-      let jsxRenderers = JSX_RENDERER_CACHE.get(config);
-      if (!jsxRenderers) {
-        jsxRenderers = /* @__PURE__ */ new Map();
-        const possibleRenderers = await collectJSXRenderers(config._ctx.renderers);
-        if (possibleRenderers.size === 0) {
-          throw new Error(
-            `${colors.yellow(
-              id
-            )}
-Unable to resolve a JSX renderer! Did you forget to include one? Add a JSX integration like \`@astrojs/react\` to your \`astro.config.mjs\` file.`
-          );
-        }
-        for (const [importSource2, renderer] of possibleRenderers) {
-          jsxRenderers.set(importSource2, renderer);
-        }
-        JSX_RENDERER_CACHE.set(config, jsxRenderers);
-      }
-      const astroRenderer = jsxRenderers.get("astro");
-      if ((id.includes(".mdx") || id.includes(".md")) && astroRenderer) {
-        const { code: jsxCode } = await esbuild.transform(code, {
+      if (id.includes(".mdx") || id.includes(".md")) {
+        const { code: jsxCode2 } = await esbuild.transform(code, {
           loader: getEsbuildLoader(path.extname(id)),
           jsx: "preserve",
           sourcefile: id,
           sourcemap: "inline"
         });
         return transformJSX({
-          code: jsxCode,
+          code: jsxCode2,
           id,
-          renderer: astroRenderer,
+          renderer: astroJSXRenderer,
           mode,
           ssr
         });
       }
-      const nonAstroJsxRenderers = new Map(
-        [...jsxRenderers.entries()].filter(([key]) => key !== "astro")
-      );
-      if (nonAstroJsxRenderers.size === 1) {
-        const { code: jsxCode } = await esbuild.transform(code, {
+      if (defaultJSXRendererEntry && jsxRenderersIntegrationOnly.size === 1) {
+        const { code: jsxCode2 } = await esbuild.transform(code, {
           loader: getEsbuildLoader(path.extname(id)),
           jsx: "preserve",
           sourcefile: id,
           sourcemap: "inline"
         });
         return transformJSX({
-          code: jsxCode,
+          code: jsxCode2,
           id,
-          renderer: [...nonAstroJsxRenderers.values()][0],
+          renderer: defaultJSXRendererEntry[1],
           mode,
           ssr
         });
       }
-      const { code: jsCode } = await esbuild.transform(code + PREVENT_UNUSED_IMPORTS, {
-        loader: getEsbuildLoader(path.extname(id)),
-        jsx: "transform",
-        jsxFactory: "h",
-        jsxFragment: "Fragment",
-        sourcefile: id,
-        sourcemap: "inline"
-      });
-      let imports = [];
-      if (/import/.test(jsCode)) {
-        let [i] = eslexer.parse(jsCode);
-        imports = i;
-      }
-      let importSource;
-      if (imports.length > 0) {
-        for (let { n: spec } of imports) {
-          const pkg = spec && parseNpmName(spec);
-          if (!pkg)
-            continue;
-          if (jsxRenderers.has(pkg.name)) {
-            importSource = pkg.name;
-            break;
-          }
-        }
+      let importSource = detectImportSourceFromComments(code);
+      if (!importSource && IMPORT_KEYWORD_REGEX.test(code)) {
+        importSource = await detectImportSourceFromImports(code, id, jsxRenderers);
       }
       if (!importSource) {
-        const multiline = code.match(/\/\*\*?[\S\s]*\*\//gm) || [];
-        for (const comment of multiline) {
-          const [_, lib] = comment.slice(0, -2).match(/@jsxImportSource\s*(\S+)/) || [];
-          if (lib) {
-            importSource = lib.trim();
-            break;
-          }
-        }
-      }
-      if (importSource) {
-        const jsxRenderer = jsxRenderers.get(importSource);
-        if (!jsxRenderer) {
-          error(
-            logging,
-            "renderer",
-            `${colors.yellow(
-              id
-            )} No renderer installed for ${importSource}. Try adding \`@astrojs/${importSource}\` to your project.`
-          );
-          return null;
-        }
-        const { code: jsxCode } = await esbuild.transform(code, {
-          loader: getEsbuildLoader(path.extname(id)),
-          jsx: "preserve",
-          sourcefile: id,
-          sourcemap: "inline"
-        });
-        return await transformJSX({
-          code: jsxCode,
-          id,
-          renderer: jsxRenderers.get(importSource),
-          mode,
-          ssr
-        });
-      }
-      const defaultRenderer = [...jsxRenderers.keys()][0];
-      error(
-        logging,
-        "renderer",
-        `${colors.yellow(id)}
+        const [defaultRendererName] = defaultJSXRendererEntry[0];
+        error(
+          logging,
+          "renderer",
+          `${colors.yellow(id)}
 Unable to resolve a renderer that handles this file! With more than one renderer enabled, you should include an import or use a pragma comment.
 Add ${colors.cyan(
-          IMPORT_STATEMENTS[defaultRenderer] || `import '${defaultRenderer}';`
-        )} or ${colors.cyan(`/* jsxImportSource: ${defaultRenderer} */`)} to this file.
+            IMPORT_STATEMENTS[defaultRendererName] || `import '${defaultRendererName}';`
+          )} or ${colors.cyan(`/* jsxImportSource: ${defaultRendererName} */`)} to this file.
 `
-      );
-      return null;
+        );
+        return null;
+      }
+      const selectedJsxRenderer = jsxRenderers.get(importSource);
+      if (!selectedJsxRenderer) {
+        error(
+          logging,
+          "renderer",
+          `${colors.yellow(
+            id
+          )} No renderer installed for ${importSource}. Try adding \`@astrojs/${importSource}\` to your project.`
+        );
+        return null;
+      }
+      const { code: jsxCode } = await esbuild.transform(code, {
+        loader: getEsbuildLoader(path.extname(id)),
+        jsx: "preserve",
+        sourcefile: id,
+        sourcemap: "inline"
+      });
+      return await transformJSX({
+        code: jsxCode,
+        id,
+        renderer: selectedJsxRenderer,
+        mode,
+        ssr
+      });
     }
   };
 }

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

@@ -94,6 +94,7 @@ function markdown({ config, logging }) {
 									children: contentFragment
 								})` : `contentFragment`};
 				}
+				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? "false" : "true"};
 				export default Content;
 				`);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -126,7 +126,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.5",
+    "vite": "3.0.9",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },