astro 1.0.2 → 1.0.5

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

@@ -255,10 +255,8 @@ async function parseAstroConfig(configURL) {
   return result;
 }
 const toIdent = (name) => {
-  if (name.includes("-")) {
-    return name.split("-")[0];
-  }
-  return name;
+  const ident = name.trim().replace(/[-_\.]?astro(?:js)?[-_\.]?/g, "").replace(/\.js/, "").replace(/(?:[\.\-\_\/]+)([a-zA-Z])/g, (_, w) => w.toUpperCase()).replace(/^[^a-zA-Z$_]+/, "");
+  return `${ident[0].toLowerCase()}${ident.slice(1)}`;
 };
 function createPrettyError(err) {
   err.message = `Astro could not update your astro.config.js file safely.
@@ -328,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

@@ -108,7 +108,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
     const timeEnd = performance.now();
     const timeChange = getTimeStat(timeStart, timeEnd);
     const timeIncrease = `(+${timeChange})`;
-    const filePath = getOutputFilename(opts.astroConfig, path);
+    const filePath = getOutputFilename(opts.astroConfig, path, pageData.route.type);
     const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
     info(opts.logging, null, `  ${cyan(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
   }
@@ -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.2";
+  const currentVersion = "1.0.5";
   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.2";
+  const version = "1.0.5";
   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.2"}`
+        `v${"1.0.5"}`
       )} ${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/dev/vite.js

@@ -2,6 +2,7 @@ import npath from "path";
 import { unwrapId } from "../../util.js";
 import { STYLE_EXTENSIONS } from "../util.js";
 const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".md"]);
+const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
 async function* crawlGraph(viteServer, _id, isFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);
   const importedModules = /* @__PURE__ */ new Set();
@@ -15,11 +16,11 @@ async function* crawlGraph(viteServer, _id, isFile, scanned = /* @__PURE__ */ ne
       const entryIsStyle = STYLE_EXTENSIONS.has(npath.extname(id));
       for (const importedModule of entry.importedModules) {
         if (importedModule.id) {
-          const { pathname } = new URL(`file://${importedModule.id}`);
-          if (entryIsStyle && !STYLE_EXTENSIONS.has(npath.extname(pathname))) {
+          const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");
+          if (entryIsStyle && !STYLE_EXTENSIONS.has(npath.extname(importedModulePathname))) {
             continue;
           }
-          if (fileExtensionsToSSR.has(npath.extname(pathname))) {
+          if (fileExtensionsToSSR.has(npath.extname(importedModulePathname))) {
             const mod = viteServer.moduleGraph.getModuleById(importedModule.id);
             if (!(mod == null ? void 0 : mod.ssrModule)) {
               await viteServer.ssrLoadModule(importedModule.id);

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.2";
+const ASTRO_VERSION = "1.0.5";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -18,7 +18,10 @@ function padMultilineString(source, n = 2) {
 `);
 }
 const STATUS_CODE_REGEXP = /^\/?[0-9]{3}$/;
-function getOutputFilename(astroConfig, name) {
+function getOutputFilename(astroConfig, name, type) {
+  if (type === "endpoint") {
+    return name;
+  }
   if (name === "/" || name === "") {
     return path.posix.join(name, "index.html");
   }

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/client/idle.prebuilt.js

@@ -1,14 +1,4 @@
-var idle_prebuilt_default = `(self.Astro = self.Astro || {}).idle = (getHydrateCallback) => {
-  const cb = async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  };
-  if ("requestIdleCallback" in window) {
-    window.requestIdleCallback(cb);
-  } else {
-    setTimeout(cb, 200);
-  }
-};`;
+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)};`;
 export {
   idle_prebuilt_default as default
 };

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

@@ -1,9 +1,4 @@
-var load_prebuilt_default = `(self.Astro = self.Astro || {}).load = (getHydrateCallback) => {
-  (async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  })();
-};`;
+var load_prebuilt_default = `(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};`;
 export {
   load_prebuilt_default as default
 };

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

@@ -1,17 +1,4 @@
-var media_prebuilt_default = `(self.Astro = self.Astro || {}).media = (getHydrateCallback, options) => {
-  const cb = async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  };
-  if (options.value) {
-    const mql = matchMedia(options.value);
-    if (mql.matches) {
-      cb();
-    } else {
-      mql.addEventListener("change", cb, { once: true });
-    }
-  }
-};`;
+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})}};`;
 export {
   media_prebuilt_default as default
 };

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

@@ -1,9 +1,4 @@
-var only_prebuilt_default = `(self.Astro = self.Astro || {}).only = (getHydrateCallback) => {
-  (async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  })();
-};`;
+var only_prebuilt_default = `(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};`;
 export {
   only_prebuilt_default as default
 };

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

@@ -1,22 +1,4 @@
-var visible_prebuilt_default = `(self.Astro = self.Astro || {}).visible = (getHydrateCallback, _opts, root) => {
-  const cb = async () => {
-    let hydrate = await getHydrateCallback();
-    await hydrate();
-  };
-  let io = new IntersectionObserver((entries) => {
-    for (const entry of entries) {
-      if (!entry.isIntersecting)
-        continue;
-      io.disconnect();
-      cb();
-      break;
-    }
-  });
-  for (let i = 0; i < root.children.length; i++) {
-    const child = root.children[i];
-    io.observe(child);
-  }
-};`;
+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)}};`;
 export {
   visible_prebuilt_default as default
 };

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

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.0.2";
+const ASTRO_VERSION = "1.0.5";
 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,92 +1,4 @@
-var astro_island_prebuilt_default = `var _a;
-{
-  const propTypes = {
-    0: (value) => value,
-    1: (value) => JSON.parse(value, reviver),
-    2: (value) => new RegExp(value),
-    3: (value) => new Date(value),
-    4: (value) => new Map(JSON.parse(value, reviver)),
-    5: (value) => new Set(JSON.parse(value, reviver)),
-    6: (value) => BigInt(value),
-    7: (value) => new URL(value)
-  };
-  const reviver = (propKey, raw) => {
-    if (propKey === "" || !Array.isArray(raw))
-      return raw;
-    const [type, value] = raw;
-    return type in propTypes ? propTypes[type](value) : void 0;
-  };
-  if (!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 slotted = this.querySelectorAll("astro-slot");
-            const slots = {};
-            const templates = this.querySelectorAll("template[data-astro-template]");
-            for (const template of templates) {
-              if (!template.closest(this.tagName)?.isSameNode(this))
-                continue;
-              slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
-              template.remove();
-            }
-            for (const slot of slotted) {
-              if (!slot.closest(this.tagName)?.isSameNode(this))
-                continue;
-              slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
-            }
-            const props = this.hasAttribute("props") ? JSON.parse(this.getAttribute("props"), reviver) : {};
-            this.hydrator(this)(this.Component, props, slots, {
-              client: this.getAttribute("client")
-            });
-            this.removeAttribute("ssr");
-            window.removeEventListener("astro:hydrate", this.hydrate);
-            window.dispatchEvent(new CustomEvent("astro:hydrate"));
-          };
-        }
-        connectedCallback() {
-          if (!this.hasAttribute("await-children") || 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"));
-          Astro[this.getAttribute("client")](
-            async () => {
-              const rendererUrl = this.getAttribute("renderer-url");
-              const [componentModule, { default: hydrator }] = await Promise.all([
-                import(this.getAttribute("component-url")),
-                rendererUrl ? import(rendererUrl) : () => () => {
-                }
-              ]);
-              this.Component = componentModule[this.getAttribute("component-export") || "default"];
-              this.hydrator = hydrator;
-              return this.hydrate;
-            },
-            opts,
-            this
-          );
-        }
-        attributeChangedCallback() {
-          if (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/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,25 @@ 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 interface MDXLayoutProps<T> extends Omit<MarkdownLayoutProps<T>, 'rawContent' | 'compiledContent'> {
+}
 export declare type GetHydrateCallback = () => Promise<() => void | Promise<void>>;
 /**
  * getStaticPaths() options

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

@@ -1,5 +1,5 @@
 import type { ErrorPayload, ViteDevServer } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { AstroConfig, RouteType } from '../@types/astro';
 export declare const ASTRO_VERSION: string;
 /** Returns true if argument is an object of any prototype/class (but not null). */
 export declare function isObject(value: unknown): value is Record<string, any>;
@@ -11,7 +11,7 @@ export declare function padMultilineString(source: string, n?: number): string;
  * Handles both "/foo" and "foo" `name` formats.
  * Handles `/404` and `/` correctly.
  */
-export declare function getOutputFilename(astroConfig: AstroConfig, name: string): string;
+export declare function getOutputFilename(astroConfig: AstroConfig, name: string, type: RouteType): string;
 /** is a specifier an npm package? */
 export declare function parseNpmName(spec: string): {
     scope?: string;

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 = (getHydrateCallback) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  if (\"requestIdleCallback\" in window) {\n    window.requestIdleCallback(cb);\n  } else {\n    setTimeout(cb, 200);\n  }\n};";
+declare const _default: "(self.Astro=self.Astro||{}).idle=a=>{const e=async()=>{await(await a())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)};";
 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 = (getHydrateCallback) => {\n  (async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  })();\n};";
+declare const _default: "(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};";
 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 = (getHydrateCallback, options) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  if (options.value) {\n    const mql = matchMedia(options.value);\n    if (mql.matches) {\n      cb();\n    } else {\n      mql.addEventListener(\"change\", cb, { once: true });\n    }\n  }\n};";
+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})}};";
 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 = (getHydrateCallback) => {\n  (async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  })();\n};";
+declare const _default: "(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};";
 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 = (getHydrateCallback, _opts, root) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  let io = new IntersectionObserver((entries) => {\n    for (const entry of entries) {\n      if (!entry.isIntersecting)\n        continue;\n      io.disconnect();\n      cb();\n      break;\n    }\n  });\n  for (let i = 0; i < root.children.length; i++) {\n    const child = root.children[i];\n    io.observe(child);\n  }\n};";
+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)}};";
 export default _default;

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;\n{\n  const propTypes = {\n    0: (value) => value,\n    1: (value) => JSON.parse(value, reviver),\n    2: (value) => new RegExp(value),\n    3: (value) => new Date(value),\n    4: (value) => new Map(JSON.parse(value, reviver)),\n    5: (value) => new Set(JSON.parse(value, reviver)),\n    6: (value) => BigInt(value),\n    7: (value) => new URL(value)\n  };\n  const reviver = (propKey, raw) => {\n    if (propKey === \"\" || !Array.isArray(raw))\n      return raw;\n    const [type, value] = raw;\n    return type in propTypes ? propTypes[type](value) : void 0;\n  };\n  if (!customElements.get(\"astro-island\")) {\n    customElements.define(\n      \"astro-island\",\n      (_a = class extends HTMLElement {\n        constructor() {\n          super(...arguments);\n          this.hydrate = () => {\n            if (!this.hydrator || this.parentElement?.closest(\"astro-island[ssr]\")) {\n              return;\n            }\n            const slotted = this.querySelectorAll(\"astro-slot\");\n            const slots = {};\n            const templates = this.querySelectorAll(\"template[data-astro-template]\");\n            for (const template of templates) {\n              if (!template.closest(this.tagName)?.isSameNode(this))\n                continue;\n              slots[template.getAttribute(\"data-astro-template\") || \"default\"] = template.innerHTML;\n              template.remove();\n            }\n            for (const slot of slotted) {\n              if (!slot.closest(this.tagName)?.isSameNode(this))\n                continue;\n              slots[slot.getAttribute(\"name\") || \"default\"] = slot.innerHTML;\n            }\n            const props = this.hasAttribute(\"props\") ? JSON.parse(this.getAttribute(\"props\"), reviver) : {};\n            this.hydrator(this)(this.Component, props, slots, {\n              client: this.getAttribute(\"client\")\n            });\n            this.removeAttribute(\"ssr\");\n            window.removeEventListener(\"astro:hydrate\", this.hydrate);\n            window.dispatchEvent(new CustomEvent(\"astro:hydrate\"));\n          };\n        }\n        connectedCallback() {\n          if (!this.hasAttribute(\"await-children\") || this.firstChild) {\n            this.childrenConnectedCallback();\n          } else {\n            new MutationObserver((_, mo) => {\n              mo.disconnect();\n              this.childrenConnectedCallback();\n            }).observe(this, { childList: true });\n          }\n        }\n        async childrenConnectedCallback() {\n          window.addEventListener(\"astro:hydrate\", this.hydrate);\n          await import(this.getAttribute(\"before-hydration-url\"));\n          const opts = JSON.parse(this.getAttribute(\"opts\"));\n          Astro[this.getAttribute(\"client\")](\n            async () => {\n              const rendererUrl = this.getAttribute(\"renderer-url\");\n              const [componentModule, { default: hydrator }] = await Promise.all([\n                import(this.getAttribute(\"component-url\")),\n                rendererUrl ? import(rendererUrl) : () => () => {\n                }\n              ]);\n              this.Component = componentModule[this.getAttribute(\"component-export\") || \"default\"];\n              this.hydrator = hydrator;\n              return this.hydrate;\n            },\n            opts,\n            this\n          );\n        }\n        attributeChangedCallback() {\n          if (this.hydrator)\n            this.hydrate();\n        }\n      }, _a.observedAttributes = [\"props\"], _a)\n    );\n  }\n}";
+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/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() {

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.2",
+  "version": "1.0.5",
   "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",