astro 5.4.1 → 5.4.3

package/dist/core/render-context.js

@@ -1,3 +1,4 @@
+import { getActionContext } from "../actions/runtime/virtual/server.js";
 import { deserializeActionResult } from "../actions/runtime/virtual/shared.js";
 import { createCallAction, createGetActionResult, hasActionPayload } from "../actions/utils.js";
 import {
@@ -29,10 +30,11 @@ import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rew
 import { AstroSession } from "./session.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
-  constructor(pipeline, locals, middleware, pathname, request, routeData, status, clientAddress, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url), props = {}, partial = void 0, session = pipeline.manifest.sessionConfig ? new AstroSession(cookies, pipeline.manifest.sessionConfig) : void 0) {
+  constructor(pipeline, locals, middleware, actions, pathname, request, routeData, status, clientAddress, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = new URL(request.url), props = {}, partial = void 0, session = pipeline.manifest.sessionConfig ? new AstroSession(cookies, pipeline.manifest.sessionConfig) : void 0) {
     this.pipeline = pipeline;
     this.locals = locals;
     this.middleware = middleware;
+    this.actions = actions;
     this.pathname = pathname;
     this.request = request;
     this.routeData = routeData;
@@ -63,14 +65,17 @@ class RenderContext {
     clientAddress,
     status = 200,
     props,
-    partial = void 0
+    partial = void 0,
+    actions
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
+    const pipelineActions = actions ?? await pipeline.getActions();
     setOriginPathname(request, pathname);
     return new RenderContext(
       pipeline,
       locals,
       sequence(...pipeline.internalMiddleware, middleware ?? pipelineMiddleware),
+      pipelineActions,
       pathname,
       request,
       routeData,
@@ -106,7 +111,8 @@ class RenderContext {
       serverLike,
       base: manifest.base
     });
-    const apiContext = this.createAPIContext(props);
+    const actionApiContext = this.createActionAPIContext();
+    const apiContext = this.createAPIContext(props, actionApiContext);
     this.counter++;
     if (this.counter === 4) {
       return new Response("Loop Detected", {
@@ -153,6 +159,13 @@ class RenderContext {
         this.status = 200;
       }
       let response2;
+      if (!ctx.isPrerendered) {
+        const { action, setActionResult, serializeActionResult } = getActionContext(ctx);
+        if (action?.calledFrom === "form") {
+          const actionResult = await action.handler();
+          setActionResult(action.name, serializeActionResult(actionResult));
+        }
+      }
       switch (this.routeData.type) {
         case "endpoint": {
           response2 = await renderEndpoint(
@@ -166,7 +179,7 @@ class RenderContext {
         case "redirect":
           return renderRedirect(this);
         case "page": {
-          const result = await this.createResult(componentInstance);
+          const result = await this.createResult(componentInstance, actionApiContext);
           try {
             response2 = await renderPage(
               result,
@@ -209,8 +222,7 @@ class RenderContext {
     attachCookiesToResponse(response, cookies);
     return response;
   }
-  createAPIContext(props) {
-    const context = this.createActionAPIContext();
+  createAPIContext(props, context) {
     const redirect = (path, status = 302) => new Response(null, { status, headers: { Location: path } });
     Reflect.set(context, apiContextRoutesSymbol, this.pipeline);
     return Object.assign(context, {
@@ -295,7 +307,7 @@ class RenderContext {
       session
     };
   }
-  async createResult(mod) {
+  async createResult(mod, ctx) {
     const { cookies, pathname, pipeline, routeData, status } = this;
     const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } = pipeline;
     const { links, scripts, styles } = await pipeline.headElements(routeData);
@@ -324,7 +336,7 @@ class RenderContext {
       compressHTML,
       cookies,
       /** This function returns the `Astro` faux-global */
-      createAstro: (astroGlobal, props, slots) => this.createAstro(result, astroGlobal, props, slots),
+      createAstro: (astroGlobal, props, slots) => this.createAstro(result, astroGlobal, props, slots, ctx),
       links,
       params: this.params,
       partial,
@@ -361,17 +373,19 @@ class RenderContext {
    *
    * The page level partial is used as the prototype of the user-visible `Astro` global object, which is instantiated once per use of a component.
    */
-  createAstro(result, astroStaticPartial, props, slotValues) {
+  createAstro(result, astroStaticPartial, props, slotValues, apiContext) {
     let astroPagePartial;
     if (this.isRewriting) {
       astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(
         result,
-        astroStaticPartial
+        astroStaticPartial,
+        apiContext
       );
     } else {
       astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(
         result,
-        astroStaticPartial
+        astroStaticPartial,
+        apiContext
       );
     }
     const astroComponentPartial = { props, self: null };
@@ -394,7 +408,7 @@ class RenderContext {
     });
     return Astro;
   }
-  createAstroPagePartial(result, astroStaticPartial) {
+  createAstroPagePartial(result, astroStaticPartial, apiContext) {
     const renderContext = this;
     const { cookies, locals, params, pipeline, url, session } = this;
     const { response } = result;
@@ -409,6 +423,7 @@ class RenderContext {
     const rewrite = async (reroutePayload) => {
       return await this.#executeRewrite(reroutePayload);
     };
+    const callAction = createCallAction(apiContext);
     return {
       generator: astroStaticPartial.generator,
       glob: astroStaticPartial.glob,
@@ -437,7 +452,7 @@ class RenderContext {
       site: pipeline.site,
       getActionResult: createGetActionResult(locals),
       get callAction() {
-        return createCallAction(this);
+        return callAction;
       },
       url,
       get originPathname() {

package/dist/transitions/router.js

@@ -1,4 +1,5 @@
 import { TRANSITION_AFTER_SWAP, doPreparation, doSwap } from "./events.js";
+import { detectScriptExecuted } from "./swap-functions.js";
 const inBrowser = import.meta.env.SSR === false;
 const pushState = inBrowser && history.pushState.bind(history);
 const replaceState = inBrowser && history.replaceState.bind(history);
@@ -326,7 +327,9 @@ async function transition(direction, from, to, options, historyState) {
       skipTransition: () => {
         currentTransition.transitionSkipped = true;
         document.documentElement.removeAttribute(OLD_NEW_ATTR);
-      }
+      },
+      types: /* @__PURE__ */ new Set()
+      // empty by default
     };
   }
   currentTransition.viewTransition?.updateCallbackDone.finally(async () => {
@@ -417,7 +420,7 @@ if (inBrowser) {
     }
   }
   for (const script of document.getElementsByTagName("script")) {
-    script.dataset.astroExec = "";
+    detectScriptExecuted(script);
   }
 }
 async function prepareForClientOnlyComponents(newDocument, toLocation, signal) {

package/dist/transitions/swap-functions.d.ts

@@ -3,6 +3,7 @@ export type SavedFocus = {
     start?: number | null;
     end?: number | null;
 };
+export declare function detectScriptExecuted(script: HTMLScriptElement): boolean;
 export declare function deselectScripts(doc: Document): void;
 export declare function swapRootAttributes(doc: Document): void;
 export declare function swapHeadElements(doc: Document): void;

package/dist/transitions/swap-functions.js

@@ -1,16 +1,19 @@
 const PERSIST_ATTR = "data-astro-transition-persist";
+const scriptsAlreadyRan = /* @__PURE__ */ new Set();
+function detectScriptExecuted(script) {
+  const key = script.src ? new URL(script.src, location.href).href : script.textContent;
+  if (scriptsAlreadyRan.has(key)) return true;
+  scriptsAlreadyRan.add(key);
+  return false;
+}
 function deselectScripts(doc) {
-  for (const s1 of document.scripts) {
-    for (const s2 of doc.scripts) {
-      if (
-        // Check if the script should be rerun regardless of it being the same
-        !s2.hasAttribute("data-astro-rerun") && // Inline
-        (!s1.src && s1.textContent === s2.textContent || // External
-        s1.src && s1.type === s2.type && s1.src === s2.src)
-      ) {
-        s2.dataset.astroExec = "";
-        break;
-      }
+  for (const s2 of doc.scripts) {
+    if (
+      // Check if the script should be rerun regardless of it being the same
+      !s2.hasAttribute("data-astro-rerun") && // Check if the script has already been executed
+      detectScriptExecuted(s2)
+    ) {
+      s2.dataset.astroExec = "";
     }
   }
 }
@@ -106,6 +109,7 @@ const swap = (doc) => {
 };
 export {
   deselectScripts,
+  detectScriptExecuted,
   restoreFocus,
   saveFocus,
   swap,

package/dist/vite-plugin-astro/index.d.ts

@@ -1,9 +1,9 @@
 import type * as vite from 'vite';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
-import type { PluginCssMetadata as AstroPluginCssMetadata, PluginMetadata as AstroPluginMetadata } from './types.js';
+import type { PluginMetadata as AstroPluginMetadata } from './types.js';
 export { getAstroMetadata } from './metadata.js';
-export type { AstroPluginMetadata, AstroPluginCssMetadata };
+export type { AstroPluginMetadata };
 interface AstroPluginOptions {
     settings: AstroSettings;
     logger: Logger;

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

@@ -89,15 +89,9 @@ function astro({ settings, logger }) {
           result.dependencies?.forEach((dep) => this.addWatchFile(dep));
           return {
             code: result.code,
-            // This metadata is used by `cssScopeToPlugin` to remove this module from the bundle
-            // if the `filename` default export (the Astro component) is unused.
-            meta: result.isGlobal ? void 0 : {
-              astroCss: {
-                cssScopeTo: {
-                  [filename]: ["default"]
-                }
-              }
-            }
+            // `vite.cssScopeTo` is a Vite feature that allows this CSS to be treeshaken
+            // if the Astro component's default export is not used
+            meta: result.isGlobal ? void 0 : { vite: { cssScopeTo: [filename, "default"] } }
           };
         }
         case "script": {

package/dist/vite-plugin-astro/types.d.ts

@@ -15,26 +15,6 @@ export interface PluginMetadata {
         pageOptions: PageOptions;
     };
 }
-export interface PluginCssMetadata {
-    astroCss: {
-        /**
-         * For Astro CSS virtual modules, it can scope to the main Astro module's default export
-         * so that if those exports are treeshaken away, the CSS module will also be treeshaken.
-         *
-         * Example config if the CSS id is `/src/Foo.astro?astro&type=style&lang.css`:
-         * ```js
-         * cssScopeTo: {
-         *   '/src/Foo.astro': ['default']
-         * }
-         * ```
-         *
-         * The above is the only config we use today, but we're exposing as a `Record` to follow the
-         * upstream Vite implementation: https://github.com/vitejs/vite/pull/16058. When/If that lands,
-         * we can also remove our custom implementation.
-         */
-        cssScopeTo: Record<string, string[]>;
-    };
-}
 export interface CompileMetadata {
     /** Used for HMR to compare code changes */
     originalCode: string;

package/dist/vite-plugin-astro-server/pipeline.d.ts

@@ -29,5 +29,4 @@ export declare class DevPipeline extends Pipeline {
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
     tryRewrite(payload: RewritePayload, request: Request): Promise<TryRewriteResult>;
     setManifestData(manifestData: RoutesList): void;
-    rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/vite-plugin-astro-server/pipeline.js

@@ -154,16 +154,6 @@ class DevPipeline extends Pipeline {
   setManifestData(manifestData) {
     this.routesList = manifestData;
   }
-  rewriteKnownRoute(route, sourceRoute) {
-    if (this.serverLike && sourceRoute.prerender) {
-      for (let def of this.defaultRoutes) {
-        if (route === def.route) {
-          return def.instance;
-        }
-      }
-    }
-    throw new Error("Unknown route");
-  }
 }
 export {
   DevPipeline

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

@@ -29,7 +29,7 @@ function createVitePluginAstroServer({
 }) {
   return {
     name: "astro:server",
-    configureServer(viteServer) {
+    async configureServer(viteServer) {
       const loader = createViteLoader(viteServer);
       const pipeline = DevPipeline.create(routesList, {
         loader,

package/dist/vite-plugin-astro-server/route.js

@@ -1,3 +1,4 @@
+import { loadActions } from "../actions/loadActions.js";
 import {
   DEFAULT_404_COMPONENT,
   NOOP_MIDDLEWARE_HEADER,
@@ -104,6 +105,8 @@ async function handleRoute({
   let renderContext;
   let mod = void 0;
   let route;
+  const actions = await loadActions(loader);
+  pipeline.setActions(actions);
   const middleware = (await loadMiddleware(loader)).onRequest;
   const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
   const { preloadedComponent } = matchedRoute;
@@ -128,7 +131,8 @@ async function handleRoute({
     middleware: isDefaultPrerendered404(matchedRoute.route) ? void 0 : middleware,
     request,
     routeData: route,
-    clientAddress: incomingRequest.socket.remoteAddress
+    clientAddress: incomingRequest.socket.remoteAddress,
+    actions
   });
   let response;
   let statusCode = 200;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.4.1",
+  "version": "5.4.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -133,35 +133,34 @@
     "kleur": "^4.1.5",
     "magic-string": "^0.30.17",
     "magicast": "^0.3.5",
-    "mrmime": "^2.0.0",
+    "mrmime": "^2.0.1",
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.0",
+    "package-manager-detector": "^1.0.0",
     "picomatch": "^4.0.2",
-    "preferred-pm": "^4.1.1",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.7.1",
     "shiki": "^1.29.2",
     "tinyexec": "^0.3.2",
     "tinyglobby": "^0.2.12",
-    "tsconfck": "^3.1.4",
+    "tsconfck": "^3.1.5",
     "ultrahtml": "^1.5.3",
     "unist-util-visit": "^5.0.0",
-    "unstorage": "^1.14.4",
+    "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
     "vite": "^6.2.0",
-    "vitefu": "^1.0.5",
-    "which-pm": "^3.0.1",
+    "vitefu": "^1.0.6",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
-    "yocto-spinner": "^0.2.0",
-    "zod": "^3.24.1",
-    "zod-to-json-schema": "^3.24.1",
+    "yocto-spinner": "^0.2.1",
+    "zod": "^3.24.2",
+    "zod-to-json-schema": "^3.24.3",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.6.0",
-    "@astrojs/telemetry": "3.2.0",
-    "@astrojs/markdown-remark": "6.2.0"
+    "@astrojs/internal-helpers": "0.6.1",
+    "@astrojs/markdown-remark": "6.2.1",
+    "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -186,8 +185,8 @@
     "cheerio": "1.0.0",
     "eol": "^0.10.0",
     "execa": "^8.0.1",
-    "expect-type": "^1.1.0",
-    "fs-fixture": "^2.7.0",
+    "expect-type": "^1.2.0",
+    "fs-fixture": "^2.7.1",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.2.0",
     "node-mocks-http": "^1.16.2",
@@ -196,11 +195,11 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.34.2",
-    "sass": "^1.83.4",
-    "undici": "^7.3.0",
+    "rollup": "^4.34.9",
+    "sass": "^1.85.1",
+    "undici": "^7.4.0",
     "unified": "^11.0.5",
-    "vitest": "^3.0.5",
+    "vitest": "^3.0.7",
     "astro-scripts": "0.0.14"
   },
   "engines": {

package/templates/actions.mjs

@@ -2,10 +2,12 @@ import {
 	ACTION_QUERY_PARAMS,
 	ActionError,
 	appendForwardSlash,
+	astroCalledServerError,
 	deserializeActionResult,
 	getActionQueryString,
 } from 'astro:actions';
 
+const apiContextRoutesSymbol = Symbol.for('context.routes');
 const ENCODED_DOT = '%2E';
 
 function toActionProxy(actionCallback = {}, aggregatedPath = '') {
@@ -73,11 +75,13 @@ export function getActionPath(action) {
  */
 async function handleAction(param, path, context) {
 	// When running server-side, import the action and call it.
-	if (import.meta.env.SSR) {
-		const { getAction } = await import('astro/actions/runtime/virtual/get-action.js');
-		const action = await getAction(path);
+	if (import.meta.env.SSR && context) {
+		const pipeline = Reflect.get(context, apiContextRoutesSymbol);
+		if (!pipeline) {
+			throw astroCalledServerError();
+		}
+		const action = await pipeline.getAction(path);
 		if (!action) throw new Error(`Action not found: ${path}`);
-
 		return action.bind(context)(param);
 	}
 

package/dist/actions/runtime/middleware.d.ts

@@ -1 +0,0 @@
-export declare const onRequest: import("../../types/public/common.js").MiddlewareHandler;

package/dist/actions/runtime/middleware.js

@@ -1,14 +0,0 @@
-import { defineMiddleware } from "../../virtual-modules/middleware.js";
-import { getActionContext } from "./virtual/server.js";
-const onRequest = defineMiddleware(async (context, next) => {
-  if (context.isPrerendered) return next();
-  const { action, setActionResult, serializeActionResult } = getActionContext(context);
-  if (action?.calledFrom === "form") {
-    const actionResult = await action.handler();
-    setActionResult(action.name, serializeActionResult(actionResult));
-  }
-  return next();
-});
-export {
-  onRequest
-};

package/dist/actions/runtime/virtual/get-action.d.ts

@@ -1,8 +0,0 @@
-import type { ZodType } from 'zod';
-import type { ActionAccept, ActionClient } from './server.js';
-/**
- * Get server-side action based on the route path.
- * Imports from the virtual module `astro:internal-actions`, which maps to
- * the user's `src/actions/index.ts` file at build-time.
- */
-export declare function getAction(path: string): Promise<ActionClient<unknown, ActionAccept, ZodType>>;

package/dist/actions/runtime/virtual/get-action.js

@@ -1,29 +0,0 @@
-import { ActionNotFoundError } from "../../../core/errors/errors-data.js";
-import { AstroError } from "../../../core/errors/errors.js";
-async function getAction(path) {
-  const pathKeys = path.split(".").map((key) => decodeURIComponent(key));
-  let { server: actionLookup } = await import("astro:internal-actions");
-  if (actionLookup == null || !(typeof actionLookup === "object")) {
-    throw new TypeError(
-      `Expected \`server\` export in actions file to be an object. Received ${typeof actionLookup}.`
-    );
-  }
-  for (const key of pathKeys) {
-    if (!(key in actionLookup)) {
-      throw new AstroError({
-        ...ActionNotFoundError,
-        message: ActionNotFoundError.message(pathKeys.join("."))
-      });
-    }
-    actionLookup = actionLookup[key];
-  }
-  if (typeof actionLookup !== "function") {
-    throw new TypeError(
-      `Expected handler for action ${pathKeys.join(".")} to be a function. Received ${typeof actionLookup}.`
-    );
-  }
-  return actionLookup;
-}
-export {
-  getAction
-};