astro 7.0.0-alpha.2 → 7.0.0-beta.4

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

@@ -11,9 +11,6 @@ function getRoutesForEnvironment(routes, isPrerender) {
     if (route.prerender === isPrerender) {
       result.add(route);
     }
-    if (route.redirectRoute) {
-      result.add(route.redirectRoute);
-    }
   }
   return result;
 }
@@ -75,5 +72,6 @@ export { pageMap };`;
 }
 export {
   VIRTUAL_PAGES_MODULE_ID,
+  getRoutesForEnvironment,
   pluginPages
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-beta.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -39,7 +39,6 @@
     "./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"
@@ -167,12 +166,20 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/markdown-remark": "7.2.0",
-    "@astrojs/telemetry": "3.3.2"
+    "@astrojs/telemetry": "3.3.2",
+    "@astrojs/markdown-satteri": "0.3.1-beta.1"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
   },
+  "peerDependencies": {
+    "@astrojs/markdown-remark": "7.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@astrojs/markdown-remark": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
@@ -189,8 +196,6 @@
     "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",
@@ -203,7 +208,8 @@
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
     "@astrojs/check": "0.9.9",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/markdown-remark": "7.2.0"
   },
   "engines": {
     "node": ">=22.12.0",

package/dist/cli/db/index.d.ts

@@ -1,4 +0,0 @@
-import type { Arguments } from 'yargs-parser';
-export declare function db({ flags }: {
-    flags: Arguments;
-}): Promise<void>;

package/dist/cli/db/index.js

@@ -1,25 +0,0 @@
-import { resolveConfig } from "../../core/config/config.js";
-import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
-import { getPackage } from "../install-package.js";
-async function db({ flags }) {
-  const logger = createLoggerFromFlags(flags);
-  const getPackageOpts = {
-    skipAsk: !!flags.yes || !!flags.y,
-    cwd: flags.root
-  };
-  const dbPackage = await getPackage("@astrojs/db", logger, getPackageOpts, []);
-  if (!dbPackage) {
-    logger.error(
-      "check",
-      "The `@astrojs/db` package is required for this command to work. Please manually install it in your project and try again."
-    );
-    return;
-  }
-  const { cli } = dbPackage;
-  const inlineConfig = flagsToAstroInlineConfig(flags);
-  const { astroConfig } = await resolveConfig(inlineConfig, "build");
-  await cli({ flags, config: astroConfig });
-}
-export {
-  db
-};

package/dist/jsx/rehype.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,241 +0,0 @@
-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/dist/runtime/server/html-string-cache.d.ts

@@ -1,48 +0,0 @@
-import { HTMLString } from './escape.js';
-/**
- * LRU (Least Recently Used) cache for HTMLString objects.
- *
- * This cache reduces memory allocations by reusing identical HTMLString objects
- * across both recursive rendering (.astro files) and queue rendering (MDX files).
- *
- * When the cache reaches maxSize, the least recently used item is evicted.
- * This keeps memory usage bounded while maintaining good cache hit rates.
- *
- * Example:
- * - 10,000 identical `<li class="foo">` tags → single cached HTMLString object
- * - Memory savings: ~30KB (10,000 objects) → ~3 bytes (1 object + Map overhead)
- */
-export declare class HTMLStringCache {
-    private cache;
-    private readonly maxSize;
-    constructor(maxSize?: number);
-    /**
-     * Get or create an HTMLString for the given content.
-     * If cached, the existing object is returned and moved to end (most recently used).
-     * If not cached, a new HTMLString is created, cached, and returned.
-     *
-     * @param content - The HTML string content
-     * @returns HTMLString object (cached or newly created)
-     */
-    getOrCreate(content: string): HTMLString;
-    /**
-     * Get current cache size
-     */
-    size(): number;
-    /**
-     * Pre-warms the cache with common HTML patterns.
-     * This ensures first-render cache hits for frequently used tags.
-     *
-     * @param patterns - Array of HTML strings to pre-cache
-     */
-    warm(patterns: string[]): void;
-    /**
-     * Clear the entire cache
-     */
-    clear(): void;
-}
-/**
- * Common HTML patterns that appear frequently in Astro pages.
- * Pre-warming the cache with these patterns ensures first-render cache hits.
- */
-export declare const COMMON_HTML_PATTERNS: string[];

package/dist/runtime/server/html-string-cache.js

@@ -1,119 +0,0 @@
-import { HTMLString } from "./escape.js";
-class HTMLStringCache {
-  cache = /* @__PURE__ */ new Map();
-  maxSize;
-  constructor(maxSize = 1e3) {
-    this.maxSize = maxSize;
-    this.warm(COMMON_HTML_PATTERNS);
-  }
-  /**
-   * Get or create an HTMLString for the given content.
-   * If cached, the existing object is returned and moved to end (most recently used).
-   * If not cached, a new HTMLString is created, cached, and returned.
-   *
-   * @param content - The HTML string content
-   * @returns HTMLString object (cached or newly created)
-   */
-  getOrCreate(content) {
-    const cached = this.cache.get(content);
-    if (cached) {
-      this.cache.delete(content);
-      this.cache.set(content, cached);
-      return cached;
-    }
-    const htmlString = new HTMLString(content);
-    this.cache.set(content, htmlString);
-    if (this.cache.size > this.maxSize) {
-      const firstKey = this.cache.keys().next().value;
-      if (firstKey !== void 0) {
-        this.cache.delete(firstKey);
-      }
-    }
-    return htmlString;
-  }
-  /**
-   * Get current cache size
-   */
-  size() {
-    return this.cache.size;
-  }
-  /**
-   * Pre-warms the cache with common HTML patterns.
-   * This ensures first-render cache hits for frequently used tags.
-   *
-   * @param patterns - Array of HTML strings to pre-cache
-   */
-  warm(patterns) {
-    for (const pattern of patterns) {
-      if (!this.cache.has(pattern)) {
-        this.cache.set(pattern, new HTMLString(pattern));
-      }
-    }
-  }
-  /**
-   * Clear the entire cache
-   */
-  clear() {
-    this.cache.clear();
-  }
-}
-const COMMON_HTML_PATTERNS = [
-  // Structural elements
-  "<div>",
-  "</div>",
-  "<span>",
-  "</span>",
-  "<p>",
-  "</p>",
-  "<section>",
-  "</section>",
-  "<article>",
-  "</article>",
-  "<header>",
-  "</header>",
-  "<footer>",
-  "</footer>",
-  "<nav>",
-  "</nav>",
-  "<main>",
-  "</main>",
-  "<aside>",
-  "</aside>",
-  // List elements
-  "<ul>",
-  "</ul>",
-  "<ol>",
-  "</ol>",
-  "<li>",
-  "</li>",
-  // Void/self-closing elements
-  "<br>",
-  "<hr>",
-  "<br/>",
-  "<hr/>",
-  // Heading elements
-  "<h1>",
-  "</h1>",
-  "<h2>",
-  "</h2>",
-  "<h3>",
-  "</h3>",
-  "<h4>",
-  "</h4>",
-  // Inline elements
-  "<a>",
-  "</a>",
-  "<strong>",
-  "</strong>",
-  "<em>",
-  "</em>",
-  "<code>",
-  "</code>",
-  // Common whitespace
-  " ",
-  "\n"
-];
-export {
-  COMMON_HTML_PATTERNS,
-  HTMLStringCache
-};

package/dist/runtime/server/render/queue/builder.d.ts

@@ -1,14 +0,0 @@
-import type { SSRResult } from '../../../../types/public/internal.js';
-import type { RenderQueue } from './types.js';
-import type { NodePool } from './pool.js';
-/**
- * Builds a render queue from a component tree.
- * This function traverses the tree depth-first and creates a flat queue
- * of nodes to be rendered, with parent tracking.
- *
- * @param root - The root component/value to render
- * @param result - SSR result context
- * @param pool
- * @returns A render queue ready for rendering
- */
-export declare function buildRenderQueue(root: any, result: SSRResult, pool: NodePool): Promise<RenderQueue>;