astro 6.4.0 → 6.4.1

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.4.0";
+  version = "6.4.1";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -197,7 +197,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.4.0") {
+    if (previousAstroVersion && previousAstroVersion !== "6.4.1") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -205,8 +205,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.4.0") {
-      this.#store.metaStore().set("astro-version", "6.4.0");
+    if ("6.4.1") {
+      this.#store.metaStore().set("astro-version", "6.4.1");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.4.0";
+const ASTRO_VERSION = "6.4.1";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -37,7 +37,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.4.0";
+  const currentVersion = "6.4.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.4.0"}`
+        `v${"6.4.1"}`
       )} ${headline}`
     );
   }

package/dist/jsx/rehype.d.ts

@@ -0,0 +1,5 @@
+import type { RehypePlugin } from '@astrojs/internal-helpers/markdown';
+import type { VFile } from 'vfile';
+import type { PluginMetadata } from '../vite-plugin-astro/types.js';
+export declare const rehypeAnalyzeAstroMetadata: RehypePlugin;
+export declare function getAstroMetadata(file: VFile): PluginMetadata["astro"] | undefined;

package/dist/jsx/rehype.js

@@ -0,0 +1,241 @@
+import { visit } from "unist-util-visit";
+import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
+import { resolvePath } from "../core/viteUtils.js";
+import { createDefaultAstroMetadata } from "../vite-plugin-astro/metadata.js";
+const ClientOnlyPlaceholder = "astro-client-only";
+const rehypeAnalyzeAstroMetadata = () => {
+  return (tree, file) => {
+    const metadata = createDefaultAstroMetadata();
+    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) || hasServerDeferDirective(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,
+          localName: "",
+          specifier: tagName,
+          resolvedPath
+        });
+        addClientOnlyMetadata(node, matchedImport, resolvedPath);
+      } else if (hasClientDirective(node)) {
+        metadata.hydratedComponents.push({
+          exportName: "*",
+          localName: "",
+          specifier: tagName,
+          resolvedPath
+        });
+        addClientMetadata(node, matchedImport, resolvedPath);
+      } else if (hasServerDeferDirective(node)) {
+        metadata.serverComponents.push({
+          exportName: matchedImport.name,
+          localName: tagName,
+          specifier: matchedImport.path,
+          resolvedPath
+        });
+        addServerDeferMetadata(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.type === "Identifier" ? spec.imported.name : String(spec.imported.value)
+            };
+          }
+          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 hasServerDeferDirective(node) {
+  return node.attributes.some(
+    (attr) => attr.type === "mdxJsxAttribute" && attr.name === "server:defer"
+  );
+}
+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) {
+            // Namespace import: "<buttons.Foo.Bar />" => name: "Foo.Bar"
+            case "*": {
+              const accessPath = tagName.slice(tagSpecifier.length + 1);
+              return { name: accessPath, path: source };
+            }
+            // Default import: "<buttons.Foo.Bar />" => name: "default.Foo.Bar"
+            case "default": {
+              const accessPath = tagName.slice(tagSpecifier.length + 1);
+              return { name: `default.${accessPath}`, path: source };
+            }
+            // Named import: "<buttons.Foo.Bar />" => name: "buttons.Foo.Bar"
+            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-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
+    });
+  }
+  node.name = ClientOnlyPlaceholder;
+}
+function addServerDeferMetadata(node, meta, resolvedPath) {
+  const attributeNames = node.attributes.map((attr) => attr.type === "mdxJsxAttribute" ? attr.name : null).filter(Boolean);
+  if (!attributeNames.includes("server:component-directive")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-directive",
+      value: "server:defer"
+    });
+  }
+  if (!attributeNames.includes("server:component-path")) {
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-path",
+      value: resolvedPath
+    });
+  }
+  if (!attributeNames.includes("server:component-export")) {
+    if (meta.name === "*") {
+      meta.name = node.name.split(".").slice(1).join(".");
+    }
+    node.attributes.push({
+      type: "mdxJsxAttribute",
+      name: "server:component-export",
+      value: meta.name
+    });
+  }
+}
+export {
+  getAstroMetadata,
+  rehypeAnalyzeAstroMetadata
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -39,6 +39,7 @@
     "./astro-jsx": "./astro-jsx.d.ts",
     "./tsconfigs/*.json": "./tsconfigs/*",
     "./tsconfigs/*": "./tsconfigs/*.json",
+    "./jsx/rehype.js": "./dist/jsx/rehype.js",
     "./jsx-runtime": {
       "types": "./jsx-runtime.d.ts",
       "default": "./dist/jsx-runtime/index.js"
@@ -188,6 +189,8 @@
     "expect-type": "^1.3.0",
     "fs-fixture": "^2.13.0",
     "hono": "^4.12.14",
+    "mdast-util-mdx": "^3.0.0",
+    "mdast-util-mdx-jsx": "^3.2.0",
     "node-mocks-http": "^1.17.2",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",