astro 7.0.4 → 7.0.5

package/dist/cli/dev/background.js

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, openSync } from "node:fs";
-import { resolve } from "node:path";
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import {
   checkExistingServer,
@@ -11,6 +12,7 @@ import {
   GRACEFUL_SHUTDOWN_TIMEOUT
 } from "../../core/dev/lockfile.js";
 import { resolveRoot } from "../../core/config/config.js";
+const require2 = createRequire(import.meta.url);
 function formatBackgroundOutput(result) {
   return JSON.stringify(result);
 }
@@ -76,7 +78,7 @@ async function background({
   }
   const logFd = openSync(logFilePath, "w");
   const rootPath = fileURLToPath(root);
-  const astroBin = resolve(rootPath, "node_modules", "astro", "bin", "astro.mjs");
+  const astroBin = resolve(dirname(require2.resolve("astro/package.json")), "bin", "astro.mjs");
   const child = spawn(process.execPath, [astroBin, ...args], {
     detached: true,
     stdio: ["ignore", logFd, logFd],

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

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.0.4";
+  version = "7.0.5";
 }
 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 !== "7.0.4") {
+    if (previousAstroVersion && previousAstroVersion !== "7.0.5") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -205,8 +205,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("7.0.4") {
-      this.#store.metaStore().set("astro-version", "7.0.4");
+    if ("7.0.5") {
+      this.#store.metaStore().set("astro-version", "7.0.5");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/build/plugins/index.js

@@ -3,6 +3,7 @@ import { astroHeadBuildPlugin } from "../../../vite-plugin-head/index.js";
 import { pluginAnalyzer } from "./plugin-analyzer.js";
 import { pluginComponentEntry } from "./plugin-component-entry.js";
 import { pluginCSS } from "./plugin-css.js";
+import { pluginCssTargetLowering } from "./plugin-css-target-lowering.js";
 import { pluginInternals } from "./plugin-internals.js";
 import { pluginMiddleware } from "./plugin-middleware.js";
 import { pluginPrerender } from "./plugin-prerender.js";
@@ -18,6 +19,7 @@ function getAllBuildPlugins(internals, options) {
     pluginInternals(options, internals),
     pluginMiddleware(options, internals),
     vitePluginActionsBuild(options, internals),
+    pluginCssTargetLowering(),
     ...pluginCSS(options, internals),
     astroHeadBuildPlugin(internals),
     pluginPrerender(options, internals),

package/dist/core/build/plugins/plugin-css-target-lowering.d.ts

@@ -0,0 +1,14 @@
+import type { Plugin as VitePlugin } from 'vite';
+/**
+ * Vite plugin that applies CSS target lowering without minification.
+ *
+ * Vite's `finalizeCss` only applies CSS target lowering (via lightningcss) when
+ * `config.build.cssMinify` is truthy, because target lowering and minification
+ * are coupled in `minifyCSS`. When users set `minify: false`, Astro forces
+ * `cssMinify: false`, which disables target lowering for all CSS.
+ *
+ * This plugin fills that gap: when `cssMinify` is falsy and a CSS target is
+ * configured, it runs lightningcss with `minify: false` on all CSS assets in
+ * `generateBundle`, applying target lowering without minification.
+ */
+export declare function pluginCssTargetLowering(): VitePlugin;

package/dist/core/build/plugins/plugin-css-target-lowering.js

@@ -0,0 +1,82 @@
+import { createRequire } from "node:module";
+const BROWSER_MAP = {
+  chrome: "chrome",
+  edge: "edge",
+  firefox: "firefox",
+  hermes: false,
+  ie: "ie",
+  ios: "ios_saf",
+  node: false,
+  opera: "opera",
+  rhino: false,
+  safari: "safari"
+};
+const VERSION_RE = /\d/;
+function convertTargets(esbuildTarget) {
+  if (!esbuildTarget) return {};
+  const targets = {};
+  const entries = Array.isArray(esbuildTarget) ? esbuildTarget : [esbuildTarget];
+  for (const entry of entries) {
+    if (entry === "esnext") continue;
+    const index = entry.search(VERSION_RE);
+    if (index >= 0) {
+      const browserName = entry.slice(0, index);
+      const browser = BROWSER_MAP[browserName];
+      if (browser === false) continue;
+      if (browser) {
+        const [major, minor = 0] = entry.slice(index).split(".").map((v) => Number.parseInt(v, 10));
+        if (!isNaN(major) && !isNaN(minor)) {
+          const version = major << 16 | minor << 8;
+          if (!targets[browser] || version < targets[browser]) {
+            targets[browser] = version;
+          }
+        }
+      }
+    }
+  }
+  return targets;
+}
+function pluginCssTargetLowering() {
+  let resolvedConfig;
+  return {
+    name: "astro:css-target-lowering",
+    enforce: "post",
+    configResolved(config) {
+      resolvedConfig = config;
+    },
+    async generateBundle(_outputOptions, bundle) {
+      if (resolvedConfig.build.cssMinify) return;
+      const cssTarget = resolvedConfig.build.cssTarget;
+      if (!cssTarget) return;
+      const targets = convertTargets(cssTarget);
+      if (Object.keys(targets).length === 0) return;
+      let lcssTransform;
+      try {
+        const requireFromVite = createRequire(import.meta.resolve("vite"));
+        lcssTransform = requireFromVite("lightningcss").transform;
+      } catch {
+        return;
+      }
+      for (const [, asset] of Object.entries(bundle)) {
+        if (asset.type !== "asset") continue;
+        if (!asset.fileName.endsWith(".css")) continue;
+        if (typeof asset.source !== "string") continue;
+        try {
+          const result = lcssTransform({
+            ...resolvedConfig.css?.lightningcss,
+            targets,
+            cssModules: void 0,
+            filename: asset.fileName,
+            code: Buffer.from(asset.source),
+            minify: false
+          });
+          asset.source = new TextDecoder().decode(result.code);
+        } catch {
+        }
+      }
+    }
+  };
+}
+export {
+  pluginCssTargetLowering
+};

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.4";
+const ASTRO_VERSION = "7.0.5";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/create-vite.js

@@ -201,6 +201,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       }
     },
     resolve: {
+      // Vite's native tsconfig path resolution; see configAliasVitePlugin for the deprecated fallback.
+      tsconfigPaths: true,
       alias: [
         {
           // This is needed for Deno compatibility, as the non-browser version

package/dist/core/dev/dev.js

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

package/dist/core/fetch/fetch-state.js

@@ -297,6 +297,8 @@ class FetchState {
         extraStyleHashes,
         extraScriptHashes,
         propagators: /* @__PURE__ */ new Set(),
+        routeHasPropagation: false,
+        pendingSlotEvaluations: [],
         templateDepth: 0
       },
       cspDestination: manifest.csp?.cspDestination ?? (routeData.prerender ? "meta" : "header"),

package/dist/core/head-propagation/buffer.d.ts

@@ -3,10 +3,21 @@ export interface HeadPropagator {
     init(result: SSRResult): unknown | Promise<unknown>;
 }
 /**
- * Runs all registered propagators and collects emitted head HTML strings.
+ * Runs all registered propagators and collects the head HTML they emit.
  *
- * This iterates the live `Set`, so propagators discovered during iteration
- * are also processed in the same pass.
+ * Components with head content are discovered as we go. Initializing one
+ * propagator can register more of them: a component marked `in-tree` renders
+ * its children, and one of those children may be a `self` component that emits
+ * styles. Slots add a second way to find them — a slot whose markup contains an
+ * `await` only reaches the components after that `await` once it resolves, so
+ * we also wait for those pending slot pre-renders. We keep initializing
+ * propagators and waiting on slots until no new ones appear.
+ *
+ * Propagators are tracked in a `seen` set rather than read through a single
+ * live `Set` iterator. A propagator can be registered after we have already
+ * iterated to the end of the set (e.g. once a slot's `await` resolves), and a
+ * `Set` iterator that has reported `done` would never report those late
+ * additions.
  *
  * @example
  * If a layout initializes and discovers a nested component that also emits

package/dist/core/head-propagation/buffer.js

@@ -1,15 +1,25 @@
 async function collectPropagatedHeadParts(input) {
   const collectedHeadParts = [];
-  const iterator = input.propagators.values();
+  const seen = /* @__PURE__ */ new Set();
+  const pendingSlotEvaluations = input.result._metadata?.pendingSlotEvaluations ?? [];
   while (true) {
-    const { value, done } = iterator.next();
-    if (done) {
-      break;
+    if (pendingSlotEvaluations.length > 0) {
+      const batch = pendingSlotEvaluations.splice(0, pendingSlotEvaluations.length);
+      await Promise.all(batch);
+      continue;
     }
-    const returnValue = await value.init(input.result);
-    if (input.isHeadAndContent(returnValue) && returnValue.head) {
-      collectedHeadParts.push(returnValue.head);
+    let progressed = false;
+    for (const propagator of input.propagators) {
+      if (seen.has(propagator)) continue;
+      seen.add(propagator);
+      progressed = true;
+      const returnValue = await propagator.init(input.result);
+      if (input.isHeadAndContent(returnValue) && returnValue.head) {
+        collectedHeadParts.push(returnValue.head);
+      }
+      break;
     }
+    if (!progressed) break;
   }
   return collectedHeadParts;
 }

package/dist/core/messages/runtime.js

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

package/dist/prefetch/index.js

@@ -191,6 +191,16 @@ function onPageLoad(cb) {
     }
     cb();
   });
+  new MutationObserver((mutations) => {
+    for (const mutation of mutations) {
+      for (const node of mutation.addedNodes) {
+        if (node instanceof Element && (node.tagName === "A" || node.querySelector?.("a"))) {
+          cb();
+          return;
+        }
+      }
+    }
+  }).observe(document.body, { childList: true, subtree: true });
 }
 function appendSpeculationRules(url, eagerness) {
   const script = document.createElement("script");

package/dist/runtime/server/render/astro/instance.js

@@ -18,6 +18,9 @@ class AstroComponentInstance {
     for (const name in slots) {
       let didRender = false;
       let value = slots[name](result);
+      if (result._metadata.routeHasPropagation && isPromise(value)) {
+        result._metadata.pendingSlotEvaluations.push(value);
+      }
       this.slotValues[name] = () => {
         if (!didRender) {
           didRender = true;

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

@@ -1,4 +1,5 @@
 import { isRoute404, isRoute500 } from "../../../core/routing/internal/route-errors.js";
+import { isPropagatingHint } from "../../../core/head-propagation/resolver.js";
 import { renderToAsyncIterable, renderToReadableStream, renderToString } from "./astro/render.js";
 import { encoder } from "./common.js";
 import { renderComponentToString } from "./component.js";
@@ -7,7 +8,9 @@ import { isDeno, isNode } from "./util.js";
 import { isAstroComponentFactory } from "./astro/factory.js";
 async function renderPage(result, componentFactory, props, children, streaming, route) {
   if (!isAstroComponentFactory(componentFactory)) {
-    result._metadata.headInTree = result.componentMetadata.get(componentFactory.moduleId)?.containsHead ?? false;
+    const nonAstroMeta = result.componentMetadata.get(componentFactory.moduleId);
+    result._metadata.headInTree = nonAstroMeta?.containsHead ?? false;
+    result._metadata.routeHasPropagation = isPropagatingHint(nonAstroMeta?.propagation ?? "none");
     const pageProps = { ...props ?? {}, "server:root": true };
     const str = await renderComponentToString(
       result,
@@ -31,7 +34,9 @@ async function renderPage(result, componentFactory, props, children, streaming,
       status: result.response.status
     });
   }
-  result._metadata.headInTree = result.componentMetadata.get(componentFactory.moduleId)?.containsHead ?? false;
+  const pageMeta = result.componentMetadata.get(componentFactory.moduleId);
+  result._metadata.headInTree = pageMeta?.containsHead ?? false;
+  result._metadata.routeHasPropagation = isPropagatingHint(pageMeta?.propagation ?? "none");
   let body;
   if (streaming) {
     if (isNode && !isDeno) {

package/dist/runtime/server/render/server-islands-shared.d.ts

@@ -0,0 +1 @@
+export declare const SERVER_ISLAND_START = "[if astro]>server-island-start<![endif]";

package/dist/runtime/server/render/server-islands-shared.js

@@ -0,0 +1,4 @@
+const SERVER_ISLAND_START = "[if astro]>server-island-start<![endif]";
+export {
+  SERVER_ISLAND_START
+};

package/dist/runtime/server/render/server-islands.js

@@ -3,6 +3,7 @@ import { markHTMLString, stringifyForScript } from "../escape.js";
 import { renderChild } from "./any.js";
 import { createThinHead } from "./astro/head-and-content.js";
 import { createRenderInstruction } from "./instruction.js";
+import { SERVER_ISLAND_START } from "./server-islands-shared.js";
 import { renderSlotToString } from "./slot.js";
 const internalProps = /* @__PURE__ */ new Set([
   "server:component-path",
@@ -56,7 +57,7 @@ class ServerIslandComponent {
     const hostId = await this.getHostId();
     const islandContent = await this.getIslandContent();
     destination.write(createRenderInstruction({ type: "server-island-runtime" }));
-    destination.write("<!--[if astro]>server-island-start<![endif]-->");
+    destination.write(`<!--${SERVER_ISLAND_START}-->`);
     for (const name in this.slots) {
       if (name === "fallback") {
         await renderChild(destination, this.slots.fallback(this.result));
@@ -186,7 +187,7 @@ const SERVER_ISLAND_REPLACER = markHTMLString(
 	// Load the HTML before modifying the DOM in case of errors
 	let html = await r.text();
 	// Remove any placeholder content before the island script
-	while (s.previousSibling && s.previousSibling.nodeType !== 8 && s.previousSibling.data !== '[if astro]>server-island-start<![endif]')
+	while (s.previousSibling && s.previousSibling.nodeType !== 8 && s.previousSibling.data !== '${SERVER_ISLAND_START}')
 		s.previousSibling.remove();
 	s.previousSibling?.remove();
 	// Insert the new HTML

package/dist/template/4xx.js

@@ -10,7 +10,7 @@ function template({
   return `<!doctype html>
 <html lang="en">
 	<head>
-		<meta charset="UTF-8">
+		<meta charset="utf-8">
 		<title>${tabTitle}</title>
 		<style>
 			:root {

package/dist/transitions/swap-functions.js

@@ -1,3 +1,4 @@
+import { SERVER_ISLAND_START } from "../runtime/server/render/server-islands-shared.js";
 const PERSIST_ATTR = "data-astro-transition-persist";
 const NON_OVERRIDABLE_ASTRO_ATTRS = ["data-astro-transition", "data-astro-transition-fallback"];
 const knownVueScopedStyles = /* @__PURE__ */ new Map();
@@ -29,6 +30,11 @@ function swapRootAttributes(newDoc) {
   );
 }
 function swapHeadElements(doc) {
+  const relevantNodes = (parent, what = "both") => [
+    ...[...parent.childNodes].filter(
+      (child) => child.nodeType === 8 && child.textContent === SERVER_ISLAND_START || what === "both" && child.nodeType === 1
+    )
+  ];
   for (const el of Array.from(document.head.children)) {
     const newEl = persistedHeadElement(el, doc);
     if (newEl) {
@@ -41,12 +47,13 @@ function swapHeadElements(doc) {
       el.remove();
     }
   }
+  relevantNodes(document.head, "commentsOnly").forEach((node) => node.remove());
   if (import.meta.env.DEV) {
-    [...doc.head.children].forEach((child) => {
+    relevantNodes(doc.head).forEach((child) => {
       document.head.append(knownVueScopedStyles.get(child.dataset?.viteDevId) || child);
     });
   } else {
-    document.head.append(...doc.head.children);
+    document.head.append(...relevantNodes(doc.head));
   }
 }
 function swapBodyElement(newElement, oldElement) {

package/dist/types/public/internal.d.ts

@@ -280,6 +280,20 @@ export interface SSRMetadata {
     extraStyleHashes: string[];
     extraScriptHashes: string[];
     propagators: Set<AstroComponentInstance | ServerIslandComponent>;
+    /**
+     * `true` when the page being rendered is on a head-propagation path (its
+     * component metadata hint is `in-tree`/`self`). Only then do we await async
+     * slot pre-renders before collecting head content, so that propagating
+     * components hidden behind an `await` in slot markup are discovered in time.
+     * Pages with no propagation keep streaming without paying that cost.
+     */
+    routeHasPropagation: boolean;
+    /**
+     * Promises from async slot pre-renders that may still need to register
+     * propagating components. Drained by `collectPropagatedHeadParts` before
+     * head content is flushed. Only populated when `routeHasPropagation` is true.
+     */
+    pendingSlotEvaluations: Promise<unknown>[];
     /**
      * Tracks nesting depth of HTML `<template>` elements during rendering.
      * Scripts rendered inside `<template>` tags should not be deduplicated,

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

@@ -55,7 +55,9 @@ function astro({ settings, logger }) {
             viteConfig.resolve.conditions = [...defaultServerConditions];
           }
         }
-        viteConfig.resolve.conditions.push("astro");
+        if (!viteConfig.resolve.conditions.includes("astro")) {
+          viteConfig.resolve.conditions.push("astro");
+        }
       },
       async configResolved(viteConfig) {
         const toolbarEnabled = await settings.preferences.get("devToolbar.enabled");

package/dist/vite-plugin-config-alias/index.d.ts

@@ -1,6 +1,24 @@
 import { type Plugin as VitePlugin } from 'vite';
 import type { AstroSettings } from '../types/astro.js';
-/** Returns Vite plugins used to alias paths from tsconfig.json and jsconfig.json. */
+/**
+ * Fallback for tsconfig path aliases that Vite's `resolve.tsconfigPaths` does
+ * not currently handle in Astro's pipeline.
+ *
+ * This plugin is intentionally limited to the syntax Astro already supported
+ * before enabling `resolve.tsconfigPaths`:
+ * - CSS: `@import "..."`
+ * - CSS: `@import url("...")`
+ * - CSS: quoted `url("...")` references
+ * - Modules: JS, TS, and Astro import specifiers handled by `resolveId`
+ *
+ * Do not expand this fallback to new CSS at-rules or preprocessor syntax. It
+ * does not support `@use`, `@forward`, `@reference`, `@config`, unquoted
+ * `url(...)`, or every place a CSS tool might accept a file path. Those should
+ * be handled by Vite's native resolver instead.
+ *
+ * @deprecated This fallback will be removed in a future Astro version once Vite
+ * handles these remaining alias paths.
+ */
 export default function configAliasVitePlugin({ settings, }: {
     settings: AstroSettings;
 }): VitePlugin[] | null;

package/dist/vite-plugin-config-alias/index.js

@@ -51,10 +51,10 @@ function configAliasVitePlugin({
   const configAlias = getConfigAlias(settings);
   if (!configAlias) return null;
   return [
-    // Pre-plugin: rewrite CSS @import aliases to absolute paths before Vite's CSS plugin.
-    // Vite's internal CSS @import resolver (postcss-import) uses a mini plugin container
-    // that doesn't include user resolveId hooks, so we must rewrite aliases in a transform
-    // hook that runs before Vite's CSS processing.
+    // Deprecated CSS fallback for Vite's transform pipeline. Only supports
+    // `@import "..."`, `@import url("...")`, and quoted `url("...")`.
+    // Do not add support here for `@use`, `@forward`, `@reference`, `@config`,
+    // or other CSS/preprocessor file-reference syntax.
     {
       name: "astro:tsconfig-alias-css",
       enforce: "pre",
@@ -88,7 +88,8 @@ function configAliasVitePlugin({
         }
       }
     },
-    // Post-plugin: resolve JS/TS imports using tsconfig path aliases via resolveId.
+    // Deprecated module fallback for JS, TS, and Astro import specifiers that
+    // Vite's native tsconfig path resolution does not currently resolve.
     {
       name: "astro:tsconfig-alias",
       // use post to only resolve ids that all other plugins before it can't

package/dist/vite-plugin-html/transform/index.js

@@ -1,13 +1,15 @@
 import MagicString from "magic-string";
-import { rehype } from "rehype";
-import { VFile } from "vfile";
-import escape from "./escape.js";
-import slots, { SLOT_PREFIX } from "./slots.js";
+import { collectSlots, SLOT_PREFIX } from "./slots.js";
+import { escapeTemplateLiteralCharacters, needsEscape } from "./utils.js";
 async function transform(code, id) {
   const s = new MagicString(code, { filename: id });
-  const parser = rehype().data("settings", { fragment: true }).use(escape, { s }).use(slots, { s });
-  const vfile = new VFile({ value: code, path: id });
-  await parser.process(vfile);
+  let cursor = 0;
+  for (const slot of collectSlots(code)) {
+    escapeRange(s, code, cursor, slot.start);
+    s.overwrite(slot.start, slot.end, slot.value);
+    cursor = slot.end;
+  }
+  escapeRange(s, code, cursor, code.length);
   s.prepend(`function render({ slots: ${SLOT_PREFIX} }) {
 		return \``);
   s.append('`\n	}\nrender["astro:html"] = true;\nexport default render;');
@@ -16,6 +18,13 @@ async function transform(code, id) {
     map: s.generateMap({ hires: "boundary" })
   };
 }
+function escapeRange(s, code, start, end) {
+  if (start >= end) return;
+  const segment = code.slice(start, end);
+  if (needsEscape(segment)) {
+    s.overwrite(start, end, escapeTemplateLiteralCharacters(segment));
+  }
+}
 export {
   transform
 };

package/dist/vite-plugin-html/transform/slots.d.ts

@@ -1,8 +1,11 @@
-import type { Root } from 'hast';
-import type MagicString from 'magic-string';
-import type { Plugin } from 'unified';
-declare const rehypeSlots: Plugin<[{
-    s: MagicString;
-}], Root>;
-export default rehypeSlots;
 export declare const SLOT_PREFIX = "___SLOTS___";
+export interface SlotReplacement {
+    start: number;
+    end: number;
+    value: string;
+}
+/**
+ * Find every `<slot>` (excluding `is:inline` ones) and describe how to replace it
+ * with a `${___SLOTS___[name] ?? `fallback`}` template literal expression.
+ */
+export declare function collectSlots(code: string): SlotReplacement[];

package/dist/vite-plugin-html/transform/slots.js

@@ -1,31 +1,24 @@
-import { visit } from "unist-util-visit";
+import { ELEMENT_NODE, parse, walkSync } from "ultrahtml";
 import { escapeTemplateLiteralCharacters } from "./utils.js";
-const rehypeSlots = ({ s }) => {
-  return (tree, file) => {
-    visit(tree, (node) => {
-      if (node.type === "element" && node.tagName === "slot") {
-        if (typeof node.properties?.["is:inline"] !== "undefined") return;
-        const name = node.properties?.["name"] ?? "default";
-        const start = node.position?.start.offset ?? 0;
-        const end = node.position?.end.offset ?? 0;
-        const first = node.children.at(0) ?? node;
-        const last = node.children.at(-1) ?? node;
-        const text = file.value.slice(
-          first.position?.start.offset ?? 0,
-          last.position?.end.offset ?? 0
-        ).toString();
-        s.overwrite(
-          start,
-          end,
-          `\${${SLOT_PREFIX}["${name}"] ?? \`${escapeTemplateLiteralCharacters(text).trim()}\`}`
-        );
-      }
-    });
-  };
-};
-var slots_default = rehypeSlots;
 const SLOT_PREFIX = `___SLOTS___`;
+function collectSlots(code) {
+  const slots = [];
+  walkSync(parse(code), (node) => {
+    if (node.type !== ELEMENT_NODE || node.name !== "slot") return;
+    if ("is:inline" in node.attributes) return;
+    const [open, close] = node.loc;
+    if (!close) return;
+    const name = node.attributes.name ?? "default";
+    const fallback = open.end < close.start ? code.slice(open.end, close.start) : code.slice(open.start, close.end);
+    slots.push({
+      start: open.start,
+      end: close.end,
+      value: `\${${SLOT_PREFIX}["${name}"] ?? \`${escapeTemplateLiteralCharacters(fallback).trim()}\`}`
+    });
+  });
+  return slots;
+}
 export {
   SLOT_PREFIX,
-  slots_default as default
+  collectSlots
 };

package/dist/vite-plugin-html/transform/utils.d.ts

@@ -1,5 +1,2 @@
-import type { Element } from 'hast';
-import type MagicString from 'magic-string';
-export declare function replaceAttribute(s: MagicString, node: Element, key: string, newValue: string): MagicString | undefined;
 export declare function needsEscape(value: any): value is string;
 export declare function escapeTemplateLiteralCharacters(value: string): string;

package/dist/vite-plugin-html/transform/utils.js

@@ -1,21 +1,3 @@
-const splitAttrsTokenizer = /([${}@\w:\-]*)\s*=\s*?(['"]?)(.*?)\2\s+/g;
-function replaceAttribute(s, node, key, newValue) {
-  splitAttrsTokenizer.lastIndex = 0;
-  const text = s.original.slice(node.position?.start.offset ?? 0, node.position?.end.offset ?? 0).toString();
-  const offset = text.indexOf(key);
-  if (offset === -1) return;
-  const start = node.position.start.offset + offset;
-  const tokens = text.slice(offset).split(splitAttrsTokenizer);
-  const token = tokens[0].replace(/([^>])>[\s\S]*$/gm, "$1");
-  if (token.trim() === key) {
-    const end = start + key.length;
-    return s.overwrite(start, end, newValue, { contentOnly: true });
-  } else {
-    const length = token.length;
-    const end = start + length;
-    return s.overwrite(start, end, newValue, { contentOnly: true });
-  }
-}
 const NEEDS_ESCAPE_RE = /[`\\]|\$\{/g;
 function needsEscape(value) {
   NEEDS_ESCAPE_RE.lastIndex = 0;
@@ -42,6 +24,5 @@ function escapeTemplateLiteralCharacters(value) {
 }
 export {
   escapeTemplateLiteralCharacters,
-  needsEscape,
-  replaceAttribute
+  needsEscape
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -131,7 +131,6 @@
     "package-manager-detector": "^1.6.0",
     "piccolore": "^0.1.3",
     "picomatch": "^4.0.4",
-    "rehype": "^13.0.2",
     "semver": "^7.7.4",
     "shiki": "^4.0.2",
     "smol-toml": "^1.6.0",
@@ -141,9 +140,7 @@
     "tinyglobby": "^0.2.15",
     "ultrahtml": "^1.6.0",
     "unifont": "~0.7.4",
-    "unist-util-visit": "^5.1.0",
     "unstorage": "^1.17.5",
-    "vfile": "^6.0.3",
     "vite": "^8.0.13",
     "vitefu": "^1.1.2",
     "xxhash-wasm": "^1.1.0",
@@ -167,7 +164,6 @@
   "devDependencies": {
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
-    "@types/hast": "^3.0.4",
     "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.2.0",
     "@types/js-yaml": "^4.0.9",
@@ -189,7 +185,6 @@
     "sass": "^1.98.0",
     "typescript": "^6.0.3",
     "undici": "^7.22.0",
-    "unified": "^11.0.5",
     "vitest": "^4.1.0",
     "@astrojs/check": "0.9.9",
     "@astrojs/markdown-remark": "7.2.0",

package/dist/vite-plugin-html/transform/escape.d.ts

@@ -1,7 +0,0 @@
-import type { Root } from 'hast';
-import type MagicString from 'magic-string';
-import type { Plugin } from 'unified';
-declare const rehypeEscape: Plugin<[{
-    s: MagicString;
-}], Root>;
-export default rehypeEscape;

package/dist/vite-plugin-html/transform/escape.js

@@ -1,30 +0,0 @@
-import { visit } from "unist-util-visit";
-import { escapeTemplateLiteralCharacters, needsEscape, replaceAttribute } from "./utils.js";
-const rehypeEscape = ({ s }) => {
-  return (tree) => {
-    visit(tree, (node) => {
-      if (node.type === "text" || node.type === "comment") {
-        if (needsEscape(node.value)) {
-          s.overwrite(
-            node.position.start.offset,
-            node.position.end.offset,
-            escapeTemplateLiteralCharacters(node.value)
-          );
-        }
-      } else if (node.type === "element") {
-        if (!node.properties) return;
-        for (let [key, value] of Object.entries(node.properties)) {
-          key = key.replace(/([A-Z])/g, "-$1").toLowerCase();
-          const newKey = needsEscape(key) ? escapeTemplateLiteralCharacters(key) : key;
-          const newValue = needsEscape(value) ? escapeTemplateLiteralCharacters(value) : value;
-          if (newKey === key && newValue === value) continue;
-          replaceAttribute(s, node, key, value === "" ? newKey : `${newKey}="${newValue}"`);
-        }
-      }
-    });
-  };
-};
-var escape_default = rehypeEscape;
-export {
-  escape_default as default
-};