astro 1.0.1 → 1.0.4

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;
@@ -610,7 +626,7 @@ function parseIntegrationName(spec) {
   return { scope, name, tag };
 }
 async function askToContinue({ flags }) {
-  if (flags.yes)
+  if (flags.yes || flags.y)
     return true;
   const response = await prompts({
     type: "confirm",

package/dist/core/app/index.js

@@ -87,6 +87,9 @@ class App {
         });
       }
     }
+    if (routeData.route === "/404") {
+      defaultStatus = 404;
+    }
     let mod = __privateGet(this, _manifest).pageMap.get(routeData.component);
     if (routeData.type === "page") {
       let response = await __privateMethod(this, _renderPage, renderPage_fn).call(this, request, routeData, mod, defaultStatus);

package/dist/core/app/node.js

@@ -19,10 +19,10 @@ function createRequestFromNodeRequest(req, body) {
   return request;
 }
 class NodeApp extends App {
-  match(req) {
-    return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req));
+  match(req, opts = {}) {
+    return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts);
   }
-  render(req) {
+  render(req, routeData) {
     if ("on" in req) {
       let body = Buffer.from([]);
       let reqBodyComplete = new Promise((resolve, reject) => {
@@ -37,10 +37,16 @@ class NodeApp extends App {
         });
       });
       return reqBodyComplete.then(() => {
-        return super.render(req instanceof Request ? req : createRequestFromNodeRequest(req, body));
+        return super.render(
+          req instanceof Request ? req : createRequestFromNodeRequest(req, body),
+          routeData
+        );
       });
     }
-    return super.render(req instanceof Request ? req : createRequestFromNodeRequest(req));
+    return super.render(
+      req instanceof Request ? req : createRequestFromNodeRequest(req),
+      routeData
+    );
   }
 }
 async function loadManifest(rootFolder) {

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

@@ -1,7 +1,6 @@
 import fs from "fs";
 import * as colors from "kleur/colors";
 import { performance } from "perf_hooks";
-import * as vite from "vite";
 import {
   runHookBuildDone,
   runHookBuildStart,
@@ -14,7 +13,6 @@ import { debug, info, levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { RouteCache } from "../render/route-cache.js";
 import { createRouteManifest } from "../routing/index.js";
-import { createSafeError } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild } from "./static-build.js";
 import { getTimeStat } from "./util.js";
@@ -40,7 +38,6 @@ class AstroBuilder {
     debug("build", "Initial setup...");
     const { logging } = this;
     this.timer.init = performance.now();
-    this.timer.viteStart = performance.now();
     this.config = await runHookConfigSetup({ config: this.config, command: "build" });
     this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite(
@@ -55,15 +52,9 @@ class AstroBuilder {
       { astroConfig: this.config, logging, mode: "build" }
     );
     await runHookConfigDone({ config: this.config });
-    const viteServer = await vite.createServer(viteConfig);
-    debug("build", timerMessage("Vite started", this.timer.viteStart));
-    return { viteConfig, viteServer };
+    return { viteConfig };
   }
-  async build({
-    viteConfig,
-    viteServer
-  }) {
-    const { origin } = this;
+  async build({ viteConfig }) {
     const buildConfig = {
       client: new URL("./client/", this.config.outDir),
       server: new URL("./server/", this.config.outDir),
@@ -79,11 +70,7 @@ class AstroBuilder {
     const { assets, allPages } = await collectPagesData({
       astroConfig: this.config,
       logging: this.logging,
-      manifest: this.manifest,
-      origin,
-      routeCache: this.routeCache,
-      viteServer,
-      ssr: this.config.output === "server"
+      manifest: this.manifest
     });
     debug("build", timerMessage("All pages loaded", this.timer.loadStart));
     const pageNames = [];
@@ -93,23 +80,18 @@ class AstroBuilder {
       "build",
       colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`)
     );
-    try {
-      await staticBuild({
-        allPages,
-        astroConfig: this.config,
-        logging: this.logging,
-        manifest: this.manifest,
-        mode: this.mode,
-        origin: this.origin,
-        pageNames,
-        routeCache: this.routeCache,
-        viteConfig,
-        buildConfig
-      });
-    } catch (err) {
-      await viteServer.close();
-      throw err;
-    }
+    await staticBuild({
+      allPages,
+      astroConfig: this.config,
+      logging: this.logging,
+      manifest: this.manifest,
+      mode: this.mode,
+      origin: this.origin,
+      pageNames,
+      routeCache: this.routeCache,
+      viteConfig,
+      buildConfig
+    });
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k])
@@ -120,7 +102,6 @@ class AstroBuilder {
       delete assets[k];
     });
     debug("build", timerMessage("Additional assets copied", this.timer.assetsStart));
-    await viteServer.close();
     await runHookBuildDone({
       config: this.config,
       buildConfig,
@@ -141,7 +122,7 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer);
+      throw fixViteErrorMessage(_err);
     }
   }
   async printStats({

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

package/dist/core/errors.js

@@ -17,7 +17,7 @@ function cleanErrorStack(stack) {
 function fixViteErrorMessage(_err, server, filePath) {
   var _a, _b;
   const err = createSafeError(_err);
-  server.ssrFixStacktrace(err);
+  server == null ? void 0 : server.ssrFixStacktrace(err);
   if (err.message === "import.meta.glob() can only accept string literals.") {
     err.message = "Astro.glob() and import.meta.glob() can only accept string literals.";
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.1";
+  const version = "1.0.4";
   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.1"}`
+        `v${"1.0.4"}`
       )} ${headline}`
     );
   }

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

@@ -1,7 +1,6 @@
 import { fileURLToPath } from "url";
-import { prependForwardSlash } from "../../../core/path.js";
 import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
-import { isPage } from "../../util.js";
+import { isPage, resolveIdToUrl } from "../../util.js";
 import { render as coreRender } from "../core.js";
 import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
@@ -54,7 +53,7 @@ async function render(renderers, mod, ssrOpts) {
     scripts.add({
       props: {
         type: "module",
-        src: "/@id/astro/runtime/client/hmr.js"
+        src: await resolveIdToUrl(viteServer, "astro/runtime/client/hmr.js")
       },
       children: ""
     });
@@ -115,7 +114,7 @@ async function render(renderers, mod, ssrOpts) {
       if (s.startsWith("/@fs")) {
         return resolveClientDevPath(s);
       }
-      return "/@id" + prependForwardSlash(s);
+      return await resolveIdToUrl(viteServer, s);
     },
     renderers,
     request,

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/render/result.js

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

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

@@ -4,8 +4,8 @@ import path from "path";
 import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
-import { removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.0.1";
+import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
+const ASTRO_VERSION = "1.0.4";
 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");
   }
@@ -157,6 +160,16 @@ function getLocalAddress(serverAddress, host) {
     return serverAddress;
   }
 }
+async function resolveIdToUrl(viteServer, id) {
+  const result = await viteServer.pluginContainer.resolveId(id);
+  if (!result) {
+    return VALID_ID_PREFIX + id;
+  }
+  if (path.isAbsolute(result.id)) {
+    return "/@fs" + prependForwardSlash(result.id);
+  }
+  return VALID_ID_PREFIX + result.id;
+}
 export {
   ASTRO_VERSION,
   VALID_ID_PREFIX,
@@ -175,6 +188,7 @@ export {
   relativeToSrcDir,
   removeDir,
   resolveDependency,
+  resolveIdToUrl,
   resolvePages,
   unwrapId,
   viteID

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.1";
+const ASTRO_VERSION = "1.0.4";
 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

@@ -67,11 +67,11 @@ function extractDirectives(inputProps) {
   return extracted;
 }
 async function generateHydrateScript(scriptOptions, metadata) {
-  const { renderer, result, astroId, props } = scriptOptions;
+  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 = {
@@ -80,6 +80,11 @@ async function generateHydrateScript(scriptOptions, metadata) {
       uid: astroId
     }
   };
+  if (attrs) {
+    for (const [key, value] of Object.entries(attrs)) {
+      island.props[key] = value;
+    }
+  }
   island.props["component-url"] = await result.resolve(componentUrl);
   if (renderer.clientEntrypoint) {
     island.props["component-export"] = componentExport.value;

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

@@ -1,6 +1,5 @@
 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) {
@@ -28,7 +27,7 @@ async function renderSlot(result, slotted, fallback) {
     let content = "";
     for await (const chunk of iterator) {
       if (chunk.type === "directive") {
-        content += stringifyChunk(result, chunk);
+        result._metadata.pendingInstructions.add(chunk);
       } else {
         content += chunk;
       }

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

@@ -77,6 +77,7 @@ Did you forget to import the component or is it possible there is a typo?`
   const metadata = { displayName };
   const { hydration, isPage, props } = extractDirectives(_props);
   let html = "";
+  let attrs = void 0;
   if (hydration) {
     metadata.hydrate = hydration.directive;
     metadata.hydrateArgs = hydration.value;
@@ -164,7 +165,7 @@ but ${plural ? "none were" : "it was not"} able to server-side render ${metadata
 Did you mean to enable ${formatList(probableRendererNames.map((r) => "`" + r + "`"))}?`);
       } else if (matchingRenderers.length === 1) {
         renderer = matchingRenderers[0];
-        ({ html } = await renderer.ssr.renderToStaticMarkup.call(
+        ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
           { result },
           Component,
           props,
@@ -189,7 +190,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     if (metadata.hydrate === "only") {
       html = await renderSlot(result, slots == null ? void 0 : slots.fallback);
     } else {
-      ({ html } = await renderer.ssr.renderToStaticMarkup.call(
+      ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
         { result },
         Component,
         props,
@@ -229,7 +230,7 @@ ${serializeProps(
     )}`
   );
   const island = await generateHydrateScript(
-    { renderer, result, astroId, props },
+    { renderer, result, astroId, props, attrs },
     metadata
   );
   let unrenderedSlots = [];

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

@@ -36,13 +36,24 @@ 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 iterable) {
+              for await (const chunk of eachChunk()) {
                 let html = stringifyChunk(result, chunk);
                 if (i === 0) {
                   if (!/<!doctype html/i.test(html)) {
@@ -63,7 +74,7 @@ async function renderPage(result, componentFactory, props, children, streaming)
     } else {
       body = "";
       let i = 0;
-      for await (const chunk of iterable) {
+      for await (const chunk of eachChunk()) {
         let html = stringifyChunk(result, chunk);
         if (i === 0) {
           if (!/<!doctype html/i.test(html)) {

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
@@ -917,6 +936,7 @@ export interface SSRLoadedRenderer extends AstroRenderer {
         check: AsyncRendererComponentFn<boolean>;
         renderToStaticMarkup: AsyncRendererComponentFn<{
             html: string;
+            attrs?: Record<string, string>;
         }>;
     };
 }
@@ -996,11 +1016,25 @@ 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/core/app/node.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="node" />
+import type { RouteData } from '../../@types/astro';
 import type { SSRManifest } from './types';
 import { IncomingMessage } from 'http';
-import { App } from './index.js';
+import { App, MatchOptions } from './index.js';
 export declare class NodeApp extends App {
-    match(req: IncomingMessage | Request): import("../../@types/astro").RouteData | undefined;
-    render(req: IncomingMessage | Request): Promise<Response>;
+    match(req: IncomingMessage | Request, opts?: MatchOptions): RouteData | undefined;
+    render(req: IncomingMessage | Request, routeData?: RouteData): Promise<Response>;
 }
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;

package/dist/types/core/build/page-data.d.ts

@@ -1,16 +1,10 @@
-import type { ViteDevServer } from 'vite';
 import type { AstroConfig, ManifestData } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { AllPagesData } from './types';
-import { RouteCache } from '../render/route-cache.js';
 export interface CollectPagesDataOptions {
     astroConfig: AstroConfig;
     logging: LogOptions;
     manifest: ManifestData;
-    origin: string;
-    routeCache: RouteCache;
-    viteServer: ViteDevServer;
-    ssr: boolean;
 }
 export interface CollectPagesDataResult {
     assets: Record<string, string>;

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

@@ -22,8 +22,11 @@ export interface ErrorWithMetadata {
     };
 }
 export declare function cleanErrorStack(stack: string): string;
-/** Update the error message to correct any vite-isms that we don't want to expose to the user. */
-export declare function fixViteErrorMessage(_err: unknown, server: ViteDevServer, filePath?: URL): Error;
+/**
+ * Update the error message to correct any vite-isms that we don't want to expose to the user.
+ * The `server` is required if the error may come from `server.ssrLoadModule()`.
+ */
+export declare function fixViteErrorMessage(_err: unknown, server?: ViteDevServer, filePath?: URL): Error;
 export declare function createCustomViteLogger(logLevel: LogLevel): Logger;
 /**
  * Takes any error-like object and returns a standardized Error + metadata object.

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

@@ -1,5 +1,5 @@
-import type { ErrorPayload } from 'vite';
-import type { AstroConfig } from '../@types/astro';
+import type { ErrorPayload, ViteDevServer } from 'vite';
+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;
@@ -41,3 +41,8 @@ export declare function isModeServerWithNoAdapter(config: AstroConfig): boolean;
 export declare function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string): string;
 export declare function emoji(char: string, fallback: string): string;
 export declare function getLocalAddress(serverAddress: string, host: string | boolean): string;
+/**
+ * Simulate Vite's resolve and import analysis so we can import the id as an URL
+ * through a script tag or a dynamic import as-is.
+ */
+export declare function resolveIdToUrl(viteServer: ViteDevServer, id: string): Promise<string>;

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/hydration.d.ts

@@ -1,13 +1,6 @@
-import type { AstroComponentMetadata, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { AstroComponentMetadata, HydrationMetadata, SSRElement, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
 export declare const HydrationDirectiveProps: Set<string>;
-export interface HydrationMetadata {
-    directive: string;
-    value: string;
-    componentUrl: string;
-    componentExport: {
-        value: string;
-    };
-}
+export { HydrationMetadata };
 interface ExtractedProps {
     isPage: boolean;
     hydration: HydrationMetadata | null;
@@ -19,7 +12,7 @@ interface HydrateScriptOptions {
     result: SSRResult;
     astroId: string;
     props: Record<string | number, any>;
+    attrs: Record<string, string> | undefined;
 }
 /** 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, RenderInstruction } from './render/index.js';
+export type { AstroComponentFactory } 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,2 +1,3 @@
+import { SSRResult } from '../../../@types/astro';
 export declare function renderChild(child: any): AsyncIterable<any>;
-export declare function renderSlot(result: any, slotted: string, fallback?: any): Promise<string>;
+export declare function renderSlot(result: SSRResult, slotted: string, fallback?: any): Promise<string>;

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

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

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

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

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

@@ -1,3 +1,2 @@
-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>>;
+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>>;

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

@@ -6,7 +6,6 @@ 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/vite-plugin-astro/query.d.ts

@@ -11,3 +11,4 @@ export interface ParsedRequestResult {
     query: AstroQuery;
 }
 export declare function parseAstroRequest(id: string): ParsedRequestResult;
+export declare function isAstroScript(id: string): boolean;

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

@@ -2,6 +2,7 @@ import { fileURLToPath } from "node:url";
 import { info } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
 import { invalidateCompilation, isCached } from "./compile.js";
+import { isAstroScript } from "./query.js";
 async function trackCSSDependencies(opts) {
   const { viteDevServer, filename, deps, id } = opts;
   if (viteDevServer) {
@@ -29,7 +30,6 @@ const isPkgFile = (id) => {
   return (id == null ? void 0 : id.startsWith(fileURLToPath(PKG_PREFIX))) || (id == null ? void 0 : id.startsWith(PKG_PREFIX.pathname));
 };
 async function handleHotUpdate(ctx, { config, logging, compile }) {
-  var _a;
   let isStyleOnlyChange = false;
   if (ctx.file.endsWith(".astro")) {
     const oldResult = await compile();
@@ -81,17 +81,25 @@ async function handleHotUpdate(ctx, { config, logging, compile }) {
   if (isStyleOnlyChange) {
     info(logging, "astro", msg.hmr({ file, style: true }));
     return mods.filter((mod) => {
-      var _a2;
-      return mod.id !== ctx.file && !((_a2 = mod.id) == null ? void 0 : _a2.endsWith(".ts"));
+      var _a;
+      return mod.id !== ctx.file && !((_a = mod.id) == null ? void 0 : _a.endsWith(".ts"));
     });
   }
   for (const mod of mods) {
     for (const imp of mod.importedModules) {
-      if ((_a = imp.id) == null ? void 0 : _a.includes("?astro&type=script")) {
+      if (imp.id && isAstroScript(imp.id)) {
         mods.push(imp);
       }
     }
   }
+  for (const mod of filtered) {
+    if (mod.id && isAstroScript(mod.id) && mod.file) {
+      const astroMod = ctx.server.moduleGraph.getModuleById(mod.file);
+      if (astroMod) {
+        mods.unshift(astroMod);
+      }
+    }
+  }
   const isSelfAccepting = mods.every((m) => m.isSelfAccepting || m.url.endsWith(".svelte"));
   if (isSelfAccepting) {
     info(logging, "astro", msg.hmr({ file }));

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

@@ -294,7 +294,11 @@ ${source}
         pluginContext: this
       };
       const compile = () => cachedCompilation(compileProps);
-      return handleHotUpdate.call(this, context, { config, logging, compile });
+      return handleHotUpdate.call(this, context, {
+        config,
+        logging,
+        compile
+      });
     }
   };
 }

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

@@ -18,6 +18,11 @@ function parseAstroRequest(id) {
     query
   };
 }
+function isAstroScript(id) {
+  const parsed = parseAstroRequest(id);
+  return parsed.query.type === "script";
+}
 export {
+  isAstroScript,
   parseAstroRequest
 };

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.1",
+  "version": "1.0.4",
   "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",
@@ -126,7 +126,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.4",
+    "vite": "3.0.5",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },

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

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