astro 4.7.1 → 4.8.0

package/dist/jsx/rehype.js

@@ -0,0 +1,197 @@
+import { visit } from "unist-util-visit";
+import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
+import { resolvePath } from "../core/util.js";
+const ClientOnlyPlaceholder = "astro-client-only";
+const rehypeAnalyzeAstroMetadata = () => {
+  return (tree, file) => {
+    const metadata = {
+      clientOnlyComponents: [],
+      hydratedComponents: [],
+      scripts: [],
+      containsHead: false,
+      propagation: "none",
+      pageOptions: {}
+    };
+    const imports = parseImports(tree.children);
+    visit(tree, (node) => {
+      if (node.type !== "mdxJsxFlowElement" && node.type !== "mdxJsxTextElement") return;
+      const tagName = node.name;
+      if (!tagName || !isComponent(tagName) || !hasClientDirective(node)) return;
+      const matchedImport = findMatchingImport(tagName, imports);
+      if (!matchedImport) {
+        throw new AstroError({
+          ...AstroErrorData.NoMatchingImport,
+          message: AstroErrorData.NoMatchingImport.message(node.name)
+        });
+      }
+      if (matchedImport.path.endsWith(".astro")) {
+        const clientAttribute = node.attributes.find(
+          (attr) => attr.type === "mdxJsxAttribute" && attr.name.startsWith("client:")
+        );
+        if (clientAttribute) {
+          console.warn(
+            `You are attempting to render <${node.name} ${clientAttribute.name} />, but ${node.name} is an Astro component. Astro components do not render in the client and should not have a hydration directive. Please use a framework component for client rendering.`
+          );
+        }
+      }
+      const resolvedPath = resolvePath(matchedImport.path, file.path);
+      if (hasClientOnlyDirective(node)) {
+        metadata.clientOnlyComponents.push({
+          exportName: matchedImport.name,
+          specifier: tagName,
+          resolvedPath
+        });
+        addClientOnlyMetadata(node, matchedImport, resolvedPath);
+      } else {
+        metadata.hydratedComponents.push({
+          exportName: "*",
+          specifier: tagName,
+          resolvedPath
+        });
+        addClientMetadata(node, matchedImport, resolvedPath);
+      }
+    });
+    file.data.__astroMetadata = metadata;
+  };
+};
+function getAstroMetadata(file) {
+  return file.data.__astroMetadata;
+}
+function parseImports(children) {
+  const imports = /* @__PURE__ */ new Map();
+  for (const child of children) {
+    if (child.type !== "mdxjsEsm") continue;
+    const body = child.data?.estree?.body;
+    if (!body) continue;
+    for (const ast of body) {
+      if (ast.type !== "ImportDeclaration") continue;
+      const source = ast.source.value;
+      const specs = ast.specifiers.map((spec) => {
+        switch (spec.type) {
+          case "ImportDefaultSpecifier":
+            return { local: spec.local.name, imported: "default" };
+          case "ImportNamespaceSpecifier":
+            return { local: spec.local.name, imported: "*" };
+          case "ImportSpecifier":
+            return { local: spec.local.name, imported: spec.imported.name };
+          default:
+            throw new Error("Unknown import declaration specifier: " + spec);
+        }
+      });
+      let specSet = imports.get(source);
+      if (!specSet) {
+        specSet = /* @__PURE__ */ new Set();
+        imports.set(source, specSet);
+      }
+      for (const spec of specs) {
+        specSet.add(spec);
+      }
+    }
+  }
+  return imports;
+}
+function isComponent(tagName) {
+  return tagName[0] && tagName[0].toLowerCase() !== tagName[0] || tagName.includes(".") || /[^a-zA-Z]/.test(tagName[0]);
+}
+function hasClientDirective(node) {
+  return node.attributes.some(
+    (attr) => attr.type === "mdxJsxAttribute" && attr.name.startsWith("client:")
+  );
+}
+function hasClientOnlyDirective(node) {
+  return node.attributes.some(
+    (attr) => attr.type === "mdxJsxAttribute" && attr.name === "client:only"
+  );
+}
+function findMatchingImport(tagName, imports) {
+  const tagSpecifier = tagName.split(".")[0];
+  for (const [source, specs] of imports) {
+    for (const { imported, local } of specs) {
+      if (local === tagSpecifier) {
+        if (tagSpecifier !== tagName) {
+          switch (imported) {
+            case "*": {
+              const accessPath = tagName.slice(tagSpecifier.length + 1);
+              return { name: accessPath, path: source };
+            }
+            case "default": {
+              const accessPath = tagName.slice(tagSpecifier.length + 1);
+              return { name: `default.${accessPath}`, path: source };
+            }
+            default: {
+              return { name: tagName, path: source };
+            }
+          }
+        }
+        return { name: imported, path: source };
+      }
+    }
+  }
+}
+function addClientMetadata(node, meta, resolvedPath) {
+  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
+  if (!attributeNames.includes("client:component-path")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-path",
+      value: resolvedPath
+    });
+  }
+  if (!attributeNames.includes("client:component-export")) {
+    if (meta.name === "*") {
+      meta.name = node.name.split(".").slice(1).join(".");
+    }
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-export",
+      value: meta.name
+    });
+  }
+  if (!attributeNames.includes("client:component-hydration")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-hydration",
+      value: null
+    });
+  }
+}
+function addClientOnlyMetadata(node, meta, resolvedPath) {
+  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
+  if (!attributeNames.includes("client:display-name")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:display-name",
+      value: node.name
+    });
+  }
+  if (!attributeNames.includes("client:component-hydpathation")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-path",
+      value: resolvedPath
+    });
+  }
+  if (!attributeNames.includes("client:component-export")) {
+    if (meta.name === "*") {
+      meta.name = node.name.split(".").slice(1).join(".");
+    }
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-export",
+      value: meta.name
+    });
+  }
+  if (!attributeNames.includes("client:component-hydration")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "client:component-hydration",
+      value: null
+    });
+  }
+  node.name = ClientOnlyPlaceholder;
+}
+export {
+  getAstroMetadata,
+  rehypeAnalyzeAstroMetadata
+};

package/dist/jsx/server.js

@@ -3,8 +3,7 @@ import { AstroJSX, jsx } from "../jsx-runtime/index.js";
 import { renderJSX } from "../runtime/server/jsx.js";
 const slotName = (str) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());
 async function check(Component, props, { default: children = null, ...slotted } = {}) {
-  if (typeof Component !== "function")
-    return false;
+  if (typeof Component !== "function") return false;
   const slots = {};
   for (const [key, value] of Object.entries(slotted)) {
     const name = slotName(key);
@@ -14,16 +13,7 @@ async function check(Component, props, { default: children = null, ...slotted }
     const result = await Component({ ...props, ...slots, children });
     return result[AstroJSX];
   } catch (e) {
-    const error = e;
-    if (Component[Symbol.for("mdx-component")]) {
-      throw new AstroError({
-        message: error.message,
-        title: error.name,
-        hint: `This issue often occurs when your MDX component encounters runtime errors.`,
-        name: error.name,
-        stack: error.stack
-      });
-    }
+    throwEnhancedErrorIfMdxComponent(e, Component);
   }
   return false;
 }
@@ -34,8 +24,24 @@ async function renderToStaticMarkup(Component, props = {}, { default: children =
     slots[name] = value;
   }
   const { result } = this;
-  const html = await renderJSX(result, jsx(Component, { ...props, ...slots, children }));
-  return { html };
+  try {
+    const html = await renderJSX(result, jsx(Component, { ...props, ...slots, children }));
+    return { html };
+  } catch (e) {
+    throwEnhancedErrorIfMdxComponent(e, Component);
+    throw e;
+  }
+}
+function throwEnhancedErrorIfMdxComponent(error, Component) {
+  if (Component[Symbol.for("mdx-component")]) {
+    throw new AstroError({
+      message: error.message,
+      title: error.name,
+      hint: `This issue often occurs when your MDX component encounters runtime errors.`,
+      name: error.name,
+      stack: error.stack
+    });
+  }
 }
 var server_default = {
   check,

package/dist/jsx/transform-options.d.ts

@@ -1,2 +1,5 @@
 import type { JSXTransformConfig } from '../@types/astro.js';
+/**
+ * @deprecated This function is no longer used. Remove in Astro 5.0
+ */
 export declare function jsxTransformOptions(): Promise<JSXTransformConfig>;

package/dist/jsx-runtime/index.js

@@ -6,15 +6,12 @@ function isVNode(vnode) {
   return vnode && typeof vnode === "object" && vnode[AstroJSX];
 }
 function transformSlots(vnode) {
-  if (typeof vnode.type === "string")
-    return vnode;
+  if (typeof vnode.type === "string") return vnode;
   const slots = {};
   if (isVNode(vnode.props.children)) {
     const child = vnode.props.children;
-    if (!isVNode(child))
-      return;
-    if (!("slot" in child.props))
-      return;
+    if (!isVNode(child)) return;
+    if (!("slot" in child.props)) return;
     const name = toSlotName(child.props.slot);
     slots[name] = [child];
     slots[name]["$$slot"] = true;
@@ -23,10 +20,8 @@ function transformSlots(vnode) {
   }
   if (Array.isArray(vnode.props.children)) {
     vnode.props.children = vnode.props.children.map((child) => {
-      if (!isVNode(child))
-        return child;
-      if (!("slot" in child.props))
-        return child;
+      if (!isVNode(child)) return child;
+      if (!("slot" in child.props)) return child;
       const name = toSlotName(child.props.slot);
       if (Array.isArray(slots[name])) {
         slots[name].push(child);
@@ -41,15 +36,12 @@ function transformSlots(vnode) {
   Object.assign(vnode.props, slots);
 }
 function markRawChildren(child) {
-  if (typeof child === "string")
-    return markHTMLString(child);
-  if (Array.isArray(child))
-    return child.map((c) => markRawChildren(c));
+  if (typeof child === "string") return markHTMLString(child);
+  if (Array.isArray(child)) return child.map((c) => markRawChildren(c));
   return child;
 }
 function transformSetDirectives(vnode) {
-  if (!("set:html" in vnode.props || "set:text" in vnode.props))
-    return;
+  if (!("set:html" in vnode.props || "set:text" in vnode.props)) return;
   if ("set:html" in vnode.props) {
     const children = markRawChildren(vnode.props["set:html"]);
     delete vnode.props["set:html"];

package/dist/preferences/index.js

@@ -16,10 +16,8 @@ function coerce(key, value) {
     case "number":
       return Number(value);
     case "boolean": {
-      if (value === "true" || value === 1)
-        return true;
-      if (value === "false" || value === 0)
-        return false;
+      if (value === "true" || value === 1) return true;
+      if (value === "false" || value === 0) return false;
       break;
     }
     default:
@@ -33,8 +31,7 @@ function createPreferences(config) {
   const stores = { global, project };
   return {
     async get(key, { location } = {}) {
-      if (!location)
-        return project.get(key) ?? global.get(key) ?? dget(DEFAULT_PREFERENCES, key);
+      if (!location) return project.get(key) ?? global.get(key) ?? dget(DEFAULT_PREFERENCES, key);
       return stores[location].get(key);
     },
     async set(key, value, { location = "project", reloadServer = true } = {}) {

package/dist/preferences/store.js

@@ -10,8 +10,7 @@ class PreferenceStore {
   file;
   _store;
   get store() {
-    if (this._store)
-      return this._store;
+    if (this._store) return this._store;
     if (fs.existsSync(this.file)) {
       try {
         this._store = JSON.parse(fs.readFileSync(this.file).toString());
@@ -29,8 +28,7 @@ class PreferenceStore {
     this.write();
   }
   write() {
-    if (!this._store || Object.keys(this._store).length === 0)
-      return;
+    if (!this._store || Object.keys(this._store).length === 0) return;
     fs.mkdirSync(this.dir, { recursive: true });
     fs.writeFileSync(this.file, JSON.stringify(this.store, null, "	"));
   }
@@ -50,8 +48,7 @@ class PreferenceStore {
     return typeof this.get(key) !== "undefined";
   }
   set(key, value) {
-    if (this.get(key) === value)
-      return;
+    if (this.get(key) === value) return;
     dset(this.store, key, value);
     this.write();
   }

package/dist/prefetch/index.js

@@ -7,10 +7,8 @@ let defaultStrategy = __PREFETCH_DEFAULT_STRATEGY__;
 let clientPrerender = __EXPERIMENTAL_CLIENT_PRERENDER__;
 let inited = false;
 function init(defaultOpts) {
-  if (!inBrowser)
-    return;
-  if (inited)
-    return;
+  if (!inBrowser) return;
+  if (inited) return;
   inited = true;
   debug?.(`[astro] Initializing prefetch script`);
   prefetchAll ??= defaultOpts?.prefetchAll ?? false;
@@ -47,8 +45,7 @@ function initHoverStrategy() {
   document.body.addEventListener("focusout", handleHoverOut, { passive: true });
   onPageLoad(() => {
     for (const anchor of document.getElementsByTagName("a")) {
-      if (listenedAnchors.has(anchor))
-        continue;
+      if (listenedAnchors.has(anchor)) continue;
       if (elMatchesStrategy(anchor, "hover")) {
         listenedAnchors.add(anchor);
         anchor.addEventListener("mouseenter", handleHoverIn, { passive: true });
@@ -76,8 +73,7 @@ function initViewportStrategy() {
   let observer;
   onPageLoad(() => {
     for (const anchor of document.getElementsByTagName("a")) {
-      if (listenedAnchors.has(anchor))
-        continue;
+      if (listenedAnchors.has(anchor)) continue;
       if (elMatchesStrategy(anchor, "viewport")) {
         listenedAnchors.add(anchor);
         observer ??= createViewportIntersectionObserver();
@@ -124,8 +120,7 @@ function initLoadStrategy() {
 }
 function prefetch(url, opts) {
   const ignoreSlowConnection = opts?.ignoreSlowConnection ?? false;
-  if (!canPrefetchUrl(url, ignoreSlowConnection))
-    return;
+  if (!canPrefetchUrl(url, ignoreSlowConnection)) return;
   prefetchedUrls.add(url);
   const priority = opts?.with ?? "link";
   debug?.(`[astro] Prefetching ${url} with ${priority}`);
@@ -144,10 +139,8 @@ function prefetch(url, opts) {
   }
 }
 function canPrefetchUrl(url, ignoreSlowConnection) {
-  if (!navigator.onLine)
-    return false;
-  if (!ignoreSlowConnection && isSlowConnection())
-    return false;
+  if (!navigator.onLine) return false;
+  if (!ignoreSlowConnection && isSlowConnection()) return false;
   try {
     const urlObj = new URL(url, location.href);
     return location.origin === urlObj.origin && (location.pathname !== urlObj.pathname || location.search !== urlObj.search) && !prefetchedUrls.has(url);
@@ -156,8 +149,7 @@ function canPrefetchUrl(url, ignoreSlowConnection) {
   return false;
 }
 function elMatchesStrategy(el, strategy) {
-  if (el?.tagName !== "A")
-    return false;
+  if (el?.tagName !== "A") return false;
   const attrValue = el.dataset.astroPrefetch;
   if (attrValue === "false") {
     return false;

package/dist/prefetch/vite-plugin-prefetch.js

@@ -18,15 +18,13 @@ function astroPrefetch({ settings }) {
     name: "astro:prefetch",
     async resolveId(id) {
       if (id === virtualModuleId) {
-        if (!prefetch)
-          throwPrefetchNotEnabledError();
+        if (!prefetch) throwPrefetchNotEnabledError();
         return resolvedVirtualModuleId;
       }
     },
     load(id) {
       if (id === resolvedVirtualModuleId) {
-        if (!prefetch)
-          throwPrefetchNotEnabledError();
+        if (!prefetch) throwPrefetchNotEnabledError();
         return `export { prefetch } from "astro/virtual-modules/prefetch.js";`;
       }
     },

package/dist/prerender/metadata.js

@@ -5,8 +5,7 @@ function getPrerenderStatus({
 }) {
   const fileID = viteID(filePath);
   const moduleInfo = loader.getModuleInfo(fileID);
-  if (!moduleInfo)
-    return;
+  if (!moduleInfo) return;
   const prerenderStatus = getPrerenderMetadata(moduleInfo);
   return prerenderStatus;
 }

package/dist/prerender/routing.js

@@ -28,7 +28,7 @@ async function preloadAndSetPrerenderStatus({
       });
       continue;
     }
-    const preloadedComponent = await pipeline.preload(filePath);
+    const preloadedComponent = await pipeline.preload(route, filePath);
     const prerenderStatus = getPrerenderStatus({
       filePath,
       loader: pipeline.loader

package/dist/prerender/utils.d.ts

@@ -1,5 +1,4 @@
 import type { AstroConfig } from '../@types/astro.js';
-export declare function isServerLikeOutput(config: AstroConfig): boolean;
 export declare function getPrerenderDefault(config: AstroConfig): boolean;
 /**
  * Returns the correct output directory of the SSR build based on the configuration

package/dist/prerender/utils.js

@@ -1,7 +1,5 @@
 import { getOutDirWithinCwd } from "../core/build/common.js";
-function isServerLikeOutput(config) {
-  return config.output === "server" || config.output === "hybrid";
-}
+import { isServerLikeOutput } from "../core/util.js";
 function getPrerenderDefault(config) {
   return config.output !== "server";
 }
@@ -15,6 +13,5 @@ function getOutputDirectory(config) {
 }
 export {
   getOutputDirectory,
-  getPrerenderDefault,
-  isServerLikeOutput
+  getPrerenderDefault
 };

package/dist/runtime/client/dev-toolbar/apps/astro.js

@@ -16,11 +16,9 @@ var astro_default = {
     document.addEventListener("astro:after-swap", createCanvas);
     eventTarget.addEventListener("app-toggled", async (event) => {
       resetDebugButton();
-      if (!(event instanceof CustomEvent))
-        return;
+      if (!(event instanceof CustomEvent)) return;
       if (event.detail.state === true) {
-        if (!integrationData)
-          fetchIntegrationData();
+        if (!integrationData) fetchIntegrationData();
       }
     });
     closeOnOutsideClick(eventTarget);
@@ -341,19 +339,16 @@ var astro_default = {
         }, 3500);
       });
       canvas.append(windowComponent);
-      if (integrationData)
-        refreshIntegrationList();
+      if (integrationData) refreshIntegrationList();
     }
     function resetDebugButton() {
       const copyDebugButton = canvas.querySelector("#copy-debug-button");
-      if (!copyDebugButton)
-        return;
+      if (!copyDebugButton) return;
       copyDebugButton.innerHTML = 'Copy debug info <astro-dev-toolbar-icon icon="copy" />';
     }
     function refreshIntegrationList() {
       const integrationList = canvas.querySelector("#integration-list");
-      if (!integrationList)
-        return;
+      if (!integrationList) return;
       integrationList.innerHTML = "";
       const fragment = document.createDocumentFragment();
       for (const integration of integrationData.data) {

package/dist/runtime/client/dev-toolbar/apps/audit/index.js

@@ -35,8 +35,7 @@ var audit_default = {
           window.requestIdleCallback(
             async () => {
               lint().then(() => {
-                if (showState)
-                  createAuditsUI();
+                if (showState) createAuditsUI();
               });
             },
             { timeout: 300 }
@@ -44,8 +43,7 @@ var audit_default = {
         } else {
           setTimeout(async () => {
             lint().then(() => {
-              if (showState)
-                createAuditsUI();
+              if (showState) createAuditsUI();
             });
           }, 150);
         }
@@ -83,8 +81,7 @@ var audit_default = {
       return false;
     });
     async function createAuditsUI() {
-      if (hasCreatedUI)
-        return;
+      if (hasCreatedUI) return;
       const fragment = document.createDocumentFragment();
       for (const audit of audits) {
         const { card, highlight } = createAuditUI(audit, audits);
@@ -124,8 +121,7 @@ var audit_default = {
             }
           }
           for (const element of matches) {
-            if (audits.some((audit) => audit.auditedElement === element))
-              continue;
+            if (audits.some((audit) => audit.auditedElement === element)) continue;
             await createAuditProblem(rule, element);
           }
         }
@@ -157,8 +153,7 @@ var audit_default = {
     function refreshLintPositions() {
       audits.forEach(({ highlight, auditedElement }) => {
         const rect = auditedElement.getBoundingClientRect();
-        if (highlight)
-          positionHighlight(highlight, rect);
+        if (highlight) positionHighlight(highlight, rect);
       });
     }
     ["scroll", "resize"].forEach((event) => {