astro 1.0.3 → 1.0.6

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/add/index.js

@@ -326,6 +326,24 @@ async function setAdapter(ast, adapter, exportName) {
       const configObject = path2.node.declaration.arguments[0];
       if (!t.isObjectExpression(configObject))
         return;
+      let outputProp = configObject.properties.find((prop) => {
+        if (prop.type !== "ObjectProperty")
+          return false;
+        if (prop.key.type === "Identifier") {
+          if (prop.key.name === "output")
+            return true;
+        }
+        if (prop.key.type === "StringLiteral") {
+          if (prop.key.value === "output")
+            return true;
+        }
+        return false;
+      });
+      if (!outputProp) {
+        configObject.properties.push(
+          t.objectProperty(t.identifier("output"), t.stringLiteral("server"))
+        );
+      }
       let adapterProp = configObject.properties.find((prop) => {
         if (prop.type !== "ObjectProperty")
           return false;

package/dist/core/build/generate.js

@@ -157,7 +157,7 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
   return paths;
 }
 function addPageName(pathname, opts) {
-  opts.pageNames.push(pathname.replace(/\/?$/, "/").replace(/^\//, ""));
+  opts.pageNames.push(pathname.replace(/^\//, ""));
 }
 async function generatePath(pathname, opts, gopts) {
   var _a;

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.3";
+  const currentVersion = "1.0.6";
   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.3";
+  const version = "1.0.6";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -226,7 +226,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.0.3"}`
+        `v${"1.0.6"}`
       )} ${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/routing/manifest/generator.js

@@ -6,7 +6,10 @@ function getRouteGenerator(segments, addTrailingSlash) {
         return part.dynamic ? `:${part.content}` : part.content.normalize().replace(/\?/g, "%3F").replace(/#/g, "%23").replace(/%5B/g, "[").replace(/%5D/g, "]").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     }).join("");
   }).join("");
-  const trailing = addTrailingSlash !== "never" && segments.length ? "/" : "";
+  let trailing = "";
+  if (addTrailingSlash === "always" && segments.length) {
+    trailing = "/";
+  }
   const toPath = compile(template + trailing);
   return toPath;
 }

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.3";
+const ASTRO_VERSION = "1.0.6";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/jsx/babel.js

@@ -52,7 +52,7 @@ function addClientMetadata(node, meta) {
   }
   if (!existingAttributes.find((attr) => attr === "client:component-export")) {
     if (meta.name === "*") {
-      meta.name = getTagName(node).split(".").at(1);
+      meta.name = getTagName(node).split(".").slice(1).join(".");
     }
     const componentExport = t.jsxAttribute(
       t.jsxNamespacedName(t.jsxIdentifier("client"), t.jsxIdentifier("component-export")),
@@ -157,6 +157,74 @@ function astroJSX() {
         }
         state.set("imports", imports);
       },
+      JSXMemberExpression(path, state) {
+        var _a;
+        const node = path.node;
+        if (((_a = state.filename) == null ? void 0 : _a.endsWith(".mdx")) && t.isJSXIdentifier(node.object) && node.object.name === "_components") {
+          return;
+        }
+        const parent = path.findParent((n) => t.isJSXElement(n));
+        const parentNode = parent.node;
+        const tagName = getTagName(parentNode);
+        if (!isComponent(tagName))
+          return;
+        if (!hasClientDirective(parentNode))
+          return;
+        const isClientOnly = isClientOnlyComponent(parentNode);
+        if (tagName === ClientOnlyPlaceholder)
+          return;
+        const imports = state.get("imports") ?? /* @__PURE__ */ new Map();
+        const namespace = tagName.split(".");
+        for (const [source, specs] of imports) {
+          for (const { imported, local } of specs) {
+            const reference = path.referencesImport(source, imported);
+            if (reference) {
+              path.setData("import", { name: imported, path: source });
+              break;
+            }
+            if (namespace.at(0) === local) {
+              path.setData("import", { name: imported, path: source });
+              break;
+            }
+          }
+        }
+        const meta = path.getData("import");
+        if (meta) {
+          let resolvedPath;
+          if (meta.path.startsWith(".")) {
+            const fileURL = pathToFileURL(state.filename);
+            resolvedPath = `/@fs${new URL(meta.path, fileURL).pathname}`;
+            if (resolvedPath.endsWith(".jsx")) {
+              resolvedPath = resolvedPath.slice(0, -4);
+            }
+          } else {
+            resolvedPath = meta.path;
+          }
+          if (isClientOnly) {
+            state.file.metadata.astro.clientOnlyComponents.push({
+              exportName: meta.name,
+              specifier: tagName,
+              resolvedPath
+            });
+            meta.resolvedPath = resolvedPath;
+            addClientOnlyMetadata(parentNode, meta);
+          } else {
+            state.file.metadata.astro.hydratedComponents.push({
+              exportName: "*",
+              specifier: tagName,
+              resolvedPath
+            });
+            meta.resolvedPath = resolvedPath;
+            addClientMetadata(parentNode, meta);
+          }
+        } else {
+          throw new Error(
+            `Unable to match <${getTagName(
+              parentNode
+            )}> with client:* directive to an import statement!`
+          );
+        }
+      },
       JSXIdentifier(path, state) {
         const isAttr = path.findParent((n) => t.isJSXAttribute(n));
         if (isAttr)

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

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

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

@@ -72,7 +72,15 @@ var _a;
                 rendererUrl ? import(rendererUrl) : () => () => {
                 }
               ]);
-              this.Component = componentModule[this.getAttribute("component-export") || "default"];
+              const componentExport = this.getAttribute("component-export") || "default";
+              if (!componentExport.includes(".")) {
+                this.Component = componentModule[componentExport];
+              } else {
+                this.Component = componentModule;
+                for (const part of componentExport.split(".")) {
+                  this.Component = this.Component[part];
+                }
+              }
               this.hydrator = hydrator;
               return this.hydrate;
             },

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[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.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"));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))}`;
+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))}`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/hydration.js

@@ -69,9 +69,9 @@ function extractDirectives(inputProps) {
 async function generateHydrateScript(scriptOptions, metadata) {
   const { renderer, result, astroId, props, attrs } = scriptOptions;
   const { hydrate, componentUrl, componentExport } = metadata;
-  if (!componentExport) {
+  if (!componentExport.value) {
     throw new Error(
-      `Unable to resolve a componentExport for "${metadata.displayName}"! Please open an issue.`
+      `Unable to resolve a valid export for "${metadata.displayName}"! Please open an issue at https://astro.build/issues!`
     );
   }
   const island = {

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()]
       ])
     });
   }

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

@@ -216,7 +216,7 @@ export interface AstroGlobalPartial {
      */
     glob(globStr: `${any}.astro`): Promise<AstroInstance[]>;
     glob<T extends Record<string, any>>(globStr: `${any}.md`): Promise<MarkdownInstance<T>[]>;
-    glob<T extends Record<string, any>>(globStr: `${any}.mdx`): Promise<MarkdownInstance<T>[]>;
+    glob<T extends Record<string, any>>(globStr: `${any}.mdx`): Promise<MDXInstance<T>[]>;
     glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
     /**
      * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
@@ -782,6 +782,24 @@ export interface MarkdownInstance<T extends Record<string, any>> {
         default: AstroComponentFactory;
     }>;
 }
+export interface MDXInstance<T> extends Omit<MarkdownInstance<T>, 'rawContent' | 'compiledContent' | 'Content' | 'default'> {
+    /** MDX does not support rawContent! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
+    rawContent: never;
+    /** MDX does not support compiledContent! If you need to read the HTML contents to calculate values (ex. reading time), we suggest injecting frontmatter via rehype plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */
+    compiledContent: never;
+    default: AstroComponentFactory;
+    Content: AstroComponentFactory;
+}
+export interface MarkdownLayoutProps<T extends Record<string, any>> {
+    frontmatter: {
+        file: MarkdownInstance<T>['file'];
+        url: MarkdownInstance<T>['url'];
+    } & T;
+    headings: MarkdownHeading[];
+    rawContent: MarkdownInstance<T>['rawContent'];
+    compiledContent: MarkdownInstance<T>['compiledContent'];
+}
+export declare type MDXLayoutProps<T> = Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'>;
 export declare type GetHydrateCallback = () => Promise<() => void | Promise<void>>;
 /**
  * getStaticPaths() options

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[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.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\"));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))}";
+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))}";
 export default _default;

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

@@ -9,6 +9,7 @@ export declare class AstroComponent {
     [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
 }
 export declare function isAstroComponent(obj: any): obj is AstroComponent;
+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 | RenderInstruction>>;

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/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 });

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

@@ -35,7 +35,10 @@ async function transformJSX({
 }) {
   const { jsxTransformOptions } = renderer;
   const options = await jsxTransformOptions({ mode, ssr });
-  const plugins = [...options.plugins || [], tagExportsPlugin({ rendererName: renderer.name })];
+  const plugins = [...options.plugins || []];
+  if (ssr) {
+    plugins.push(tagExportsPlugin({ rendererName: renderer.name }));
+  }
   const result = await babel.transformAsync(code, {
     presets: options.presets,
     plugins,

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

@@ -31,9 +31,7 @@ function markdown({ config, logging }) {
         const { frontmatter: injectedFrontmatter } = safelyGetAstroData(renderResult.vfile.data);
         const frontmatter = {
           ...injectedFrontmatter,
-          ...raw.data,
-          url: fileUrl,
-          file: fileId
+          ...raw.data
         };
         const { layout } = frontmatter;
         if (frontmatter.setup) {
@@ -67,6 +65,8 @@ function markdown({ config, logging }) {
 				};
 				export async function Content() {
 					const { layout, ...content } = frontmatter;
+					content.file = file;
+					content.url = url;
 					content.astro = {};
 					Object.defineProperty(content.astro, 'headings', {
 						get() {
@@ -94,6 +94,7 @@ function markdown({ config, logging }) {
 									children: contentFragment
 								})` : `contentFragment`};
 				}
+				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? "false" : "true"};
 				export default Content;
 				`);
         return {

package/env.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="./client.d.ts" />
 
-type Astro = import('astro').AstroGlobal;
+type Astro = import('./dist/types/@types/astro').AstroGlobal;
 
 // We duplicate the description here because editors won't show the JSDoc comment from the imported type (but will for its properties, ex: Astro.request will show the AstroGlobal.request description)
 /**
@@ -13,7 +13,7 @@ declare const Astro: Readonly<Astro>;
 declare const Fragment: any;
 
 declare module '*.md' {
-	type MD = import('astro').MarkdownInstance<Record<string, any>>;
+	type MD = import('./dist/types/@types/astro').MarkdownInstance<Record<string, any>>;
 
 	export const frontmatter: MD['frontmatter'];
 	export const file: MD['file'];
@@ -29,6 +29,21 @@ declare module '*.md' {
 	export default load;
 }
 
+declare module '*.mdx' {
+	type MDX = import('astro').MDXInstance<Record<string, any>>;
+
+	export const frontmatter: MDX['frontmatter'];
+	export const file: MDX['file'];
+	export const url: MDX['url'];
+	export const getHeadings: MDX['getHeadings'];
+	export const Content: MDX['Content'];
+	export const rawContent: MDX['rawContent'];
+	export const compiledContent: MDX['compiledContent'];
+
+	const load: MDX['default'];
+	export default load;
+}
+
 declare module '*.html' {
 	const Component: { render(opts: { slots: Record<string, string> }): string };
 	export default Component;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -74,7 +74,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.23.1",
+    "@astrojs/compiler": "^0.23.3",
     "@astrojs/language-server": "^0.20.0",
     "@astrojs/markdown-remark": "^1.0.0",
     "@astrojs/telemetry": "^1.0.0",