astro 5.14.5 → 5.14.6

package/dist/actions/consts.d.ts

@@ -1,9 +1,14 @@
-export declare const VIRTUAL_MODULE_ID = "astro:actions";
-export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const ACTIONS_TYPES_FILE = "actions.d.ts";
-export declare const ASTRO_ACTIONS_INTERNAL_MODULE_ID = "astro-internal:actions";
-export declare const RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID: string;
-export declare const NOOP_ACTIONS = "\0noop-actions";
+export declare const VIRTUAL_MODULE_ID = "astro:actions";
+/** Used to expose shared utilities, with server or client specific implementations */
+export declare const RUNTIME_VIRTUAL_MODULE_ID = "virtual:astro:actions/runtime";
+export declare const RESOLVED_RUNTIME_VIRTUAL_MODULE_ID: string;
+export declare const ENTRYPOINT_VIRTUAL_MODULE_ID = "virtual:astro:actions/entrypoint";
+export declare const RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID: string;
+/** Used to pass data from the config to the main virtual module */
+export declare const OPTIONS_VIRTUAL_MODULE_ID = "virtual:astro:actions/options";
+export declare const RESOLVED_OPTIONS_VIRTUAL_MODULE_ID: string;
+export declare const RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID = "\0virtual:astro:actions/noop-entrypoint";
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;

package/dist/actions/consts.js

@@ -1,9 +1,12 @@
-const VIRTUAL_MODULE_ID = "astro:actions";
-const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const ACTIONS_TYPES_FILE = "actions.d.ts";
-const ASTRO_ACTIONS_INTERNAL_MODULE_ID = "astro-internal:actions";
-const RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID = "\0" + ASTRO_ACTIONS_INTERNAL_MODULE_ID;
-const NOOP_ACTIONS = "\0noop-actions";
+const VIRTUAL_MODULE_ID = "astro:actions";
+const RUNTIME_VIRTUAL_MODULE_ID = "virtual:astro:actions/runtime";
+const RESOLVED_RUNTIME_VIRTUAL_MODULE_ID = "\0" + RUNTIME_VIRTUAL_MODULE_ID;
+const ENTRYPOINT_VIRTUAL_MODULE_ID = "virtual:astro:actions/entrypoint";
+const RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID = "\0" + ENTRYPOINT_VIRTUAL_MODULE_ID;
+const OPTIONS_VIRTUAL_MODULE_ID = "virtual:astro:actions/options";
+const RESOLVED_OPTIONS_VIRTUAL_MODULE_ID = "\0" + OPTIONS_VIRTUAL_MODULE_ID;
+const RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID = "\0virtual:astro:actions/noop-entrypoint";
 const ACTION_QUERY_PARAMS = {
   actionName: "_action",
   actionPayload: "_astroActionPayload"
@@ -13,9 +16,12 @@ export {
   ACTIONS_TYPES_FILE,
   ACTION_QUERY_PARAMS,
   ACTION_RPC_ROUTE_PATTERN,
-  ASTRO_ACTIONS_INTERNAL_MODULE_ID,
-  NOOP_ACTIONS,
-  RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID,
-  RESOLVED_VIRTUAL_MODULE_ID,
+  ENTRYPOINT_VIRTUAL_MODULE_ID,
+  OPTIONS_VIRTUAL_MODULE_ID,
+  RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID,
+  RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID,
+  RESOLVED_OPTIONS_VIRTUAL_MODULE_ID,
+  RESOLVED_RUNTIME_VIRTUAL_MODULE_ID,
+  RUNTIME_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 };

package/dist/actions/loadActions.js

@@ -1,9 +1,9 @@
 import { ActionsCantBeLoaded } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
-import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from "./consts.js";
+import { ENTRYPOINT_VIRTUAL_MODULE_ID } from "./consts.js";
 async function loadActions(moduleLoader) {
   try {
-    return await moduleLoader.import(ASTRO_ACTIONS_INTERNAL_MODULE_ID);
+    return await moduleLoader.import(ENTRYPOINT_VIRTUAL_MODULE_ID);
   } catch (error) {
     throw new AstroError(ActionsCantBeLoaded, { cause: error });
   }

package/dist/actions/runtime/route.js

@@ -1,4 +1,4 @@
-import { getActionContext } from "./virtual/server.js";
+import { getActionContext } from "./server.js";
 const POST = async (context) => {
   const { action, serializeActionResult } = getActionContext(context);
   if (action?.calledFrom !== "rpc") {

package/dist/actions/runtime/{virtual/server.d.ts → server.d.ts}

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import type { APIContext } from '../../../types/public/index.js';
-import { type ActionAPIContext, type ErrorInferenceObject, type MaybePromise } from '../utils.js';
+import type { APIContext } from '../../types/public/index.js';
 import { deserializeActionResult, type SafeResult, type SerializedActionResult, serializeActionResult } from './shared.js';
+import { type ActionAPIContext, type ErrorInferenceObject, type MaybePromise } from './utils.js';
 export * from './shared.js';
 export type ActionAccept = 'form' | 'json';
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;

package/dist/actions/runtime/{virtual/server.js → server.js}

@@ -1,16 +1,10 @@
 import { z } from "zod";
-import { shouldAppendForwardSlash } from "../../../core/build/util.js";
-import { AstroError } from "../../../core/errors/errors.js";
-import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
-import { removeTrailingForwardSlash } from "../../../core/path.js";
-import { apiContextRoutesSymbol } from "../../../core/render-context.js";
-import { ACTION_RPC_ROUTE_PATTERN } from "../../consts.js";
-import {
-  ACTION_API_CONTEXT_SYMBOL,
-  formContentTypes,
-  hasContentType,
-  isActionAPIContext
-} from "../utils.js";
+import { shouldAppendForwardSlash } from "../../core/build/util.js";
+import { AstroError } from "../../core/errors/errors.js";
+import { ActionCalledFromServerError } from "../../core/errors/errors-data.js";
+import { removeTrailingForwardSlash } from "../../core/path.js";
+import { apiContextRoutesSymbol } from "../../core/render-context.js";
+import { ACTION_RPC_ROUTE_PATTERN } from "../consts.js";
 import {
   ACTION_QUERY_PARAMS,
   ActionError,
@@ -19,6 +13,12 @@ import {
   deserializeActionResult,
   serializeActionResult
 } from "./shared.js";
+import {
+  ACTION_API_CONTEXT_SYMBOL,
+  formContentTypes,
+  hasContentType,
+  isActionAPIContext
+} from "./utils.js";
 export * from "./shared.js";
 function defineAction({
   accept,

package/dist/actions/runtime/{virtual/shared.d.ts → shared.d.ts}

@@ -1,7 +1,7 @@
 import type { z } from 'zod';
-import { AstroError } from '../../../core/errors/errors.js';
-import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
-import type { ActionAPIContext as _ActionAPIContext, ErrorInferenceObject, MaybePromise } from '../utils.js';
+import { AstroError } from '../../core/errors/errors.js';
+import { appendForwardSlash as _appendForwardSlash } from '../../core/path.js';
+import type { ActionAPIContext as _ActionAPIContext, ErrorInferenceObject, MaybePromise } from './utils.js';
 export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;

package/dist/actions/runtime/{virtual/shared.js → shared.js}

@@ -1,12 +1,12 @@
 import { parse as devalueParse, stringify as devalueStringify } from "devalue";
-import { REDIRECT_STATUS_CODES } from "../../../core/constants.js";
-import { AstroError } from "../../../core/errors/errors.js";
+import { REDIRECT_STATUS_CODES } from "../../core/constants.js";
+import { AstroError } from "../../core/errors/errors.js";
 import {
   ActionCalledFromServerError,
   ActionsReturnedInvalidDataError
-} from "../../../core/errors/errors-data.js";
-import { appendForwardSlash as _appendForwardSlash } from "../../../core/path.js";
-import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../../consts.js";
+} from "../../core/errors/errors-data.js";
+import { appendForwardSlash as _appendForwardSlash } from "../../core/path.js";
+import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../consts.js";
 const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;
 const appendForwardSlash = _appendForwardSlash;
 const ACTION_ERROR_CODES = [

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

@@ -1,5 +1,5 @@
 import type { APIContext, AstroSharedContext } from '../../types/public/context.js';
-import type { SerializedActionResult } from './virtual/shared.js';
+import type { SerializedActionResult } from './shared.js';
 export type ActionPayload = {
     actionResult: SerializedActionResult;
     actionName: string;

package/dist/actions/utils.js

@@ -1,6 +1,6 @@
 import * as eslexer from "es-module-lexer";
+import { deserializeActionResult, getActionQueryString } from "./runtime/shared.js";
 import { ACTION_API_CONTEXT_SYMBOL } from "./runtime/utils.js";
-import { deserializeActionResult, getActionQueryString } from "./runtime/virtual/shared.js";
 function hasActionPayload(locals) {
   return "_actionPayload" in locals;
 }

package/dist/actions/{plugins.d.ts → vite-plugin-actions.d.ts}

@@ -3,14 +3,6 @@ import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../core/build/internal.js';
 import type { StaticBuildOptions } from '../core/build/types.js';
 import type { AstroSettings } from '../types/astro.js';
-/**
- * This plugin is responsible to load the known file `actions/index.js` / `actions.js`
- * If the file doesn't exist, it returns an empty object.
- * @param settings
- */
-export declare function vitePluginUserActions({ settings }: {
-    settings: AstroSettings;
-}): VitePlugin;
 /**
  * This plugin is used to retrieve the final entry point of the bundled actions.ts file
  * @param opts

package/dist/actions/{plugins.js → vite-plugin-actions.js}

@@ -2,50 +2,25 @@ import { addRollupInput } from "../core/build/add-rollup-input.js";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { getServerOutputDirectory } from "../prerender/utils.js";
 import {
-  ASTRO_ACTIONS_INTERNAL_MODULE_ID,
-  NOOP_ACTIONS,
-  RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID,
-  RESOLVED_VIRTUAL_MODULE_ID,
+  ENTRYPOINT_VIRTUAL_MODULE_ID,
+  OPTIONS_VIRTUAL_MODULE_ID,
+  RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID,
+  RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID,
+  RESOLVED_OPTIONS_VIRTUAL_MODULE_ID,
+  RESOLVED_RUNTIME_VIRTUAL_MODULE_ID,
+  RUNTIME_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
 import { isActionsFilePresent } from "./utils.js";
-function vitePluginUserActions({ settings }) {
-  let resolvedActionsId;
-  return {
-    name: "@astro/plugin-actions",
-    async resolveId(id) {
-      if (id === NOOP_ACTIONS) {
-        return NOOP_ACTIONS;
-      }
-      if (id === ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
-        const resolvedModule = await this.resolve(
-          `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
-        );
-        if (!resolvedModule) {
-          return NOOP_ACTIONS;
-        }
-        resolvedActionsId = resolvedModule.id;
-        return RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID;
-      }
-    },
-    load(id) {
-      if (id === NOOP_ACTIONS) {
-        return "export const server = {}";
-      } else if (id === RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
-        return `export { server } from '${resolvedActionsId}';`;
-      }
-    }
-  };
-}
 function vitePluginActionsBuild(opts, internals) {
   return {
     name: "@astro/plugin-actions-build",
     options(options) {
-      return addRollupInput(options, [ASTRO_ACTIONS_INTERNAL_MODULE_ID]);
+      return addRollupInput(options, [ENTRYPOINT_VIRTUAL_MODULE_ID]);
     },
     writeBundle(_, bundle) {
       for (const [chunkName, chunk] of Object.entries(bundle)) {
-        if (chunk.type !== "asset" && chunk.facadeModuleId === RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
+        if (chunk.type !== "asset" && chunk.facadeModuleId === RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID) {
           const outputDirectory = getServerOutputDirectory(opts.settings);
           internals.astroActionsEntryPoint = new URL(chunkName, outputDirectory);
         }
@@ -57,12 +32,29 @@ function vitePluginActions({
   fs,
   settings
 }) {
+  let resolvedActionsId;
   return {
     name: VIRTUAL_MODULE_ID,
     enforce: "pre",
-    resolveId(id) {
+    async resolveId(id) {
       if (id === VIRTUAL_MODULE_ID) {
-        return RESOLVED_VIRTUAL_MODULE_ID;
+        return this.resolve("astro/virtual-modules/actions.js");
+      }
+      if (id === RUNTIME_VIRTUAL_MODULE_ID) {
+        return RESOLVED_RUNTIME_VIRTUAL_MODULE_ID;
+      }
+      if (id === OPTIONS_VIRTUAL_MODULE_ID) {
+        return RESOLVED_OPTIONS_VIRTUAL_MODULE_ID;
+      }
+      if (id === ENTRYPOINT_VIRTUAL_MODULE_ID) {
+        const resolvedModule = await this.resolve(
+          `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
+        );
+        if (!resolvedModule) {
+          return RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID;
+        }
+        resolvedActionsId = resolvedModule.id;
+        return RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID;
       }
     },
     async configureServer(server) {
@@ -77,30 +69,30 @@ function vitePluginActions({
       server.watcher.on("change", watcherCallback);
     },
     async load(id, opts) {
-      if (id !== RESOLVED_VIRTUAL_MODULE_ID) return;
-      let code = await fs.promises.readFile(
-        new URL("../../templates/actions.mjs", import.meta.url),
-        "utf-8"
-      );
-      if (opts?.ssr) {
-        code += `
-export * from 'astro/actions/runtime/virtual/server.js';`;
-      } else {
-        code += `
-export * from 'astro/actions/runtime/virtual/client.js';`;
+      if (id === RESOLVED_NOOP_ENTRYPOINT_VIRTUAL_MODULE_ID) {
+        return { code: "export const server = {}" };
+      }
+      if (id === RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID) {
+        return { code: `export { server } from ${JSON.stringify(resolvedActionsId)};` };
+      }
+      if (id === RESOLVED_RUNTIME_VIRTUAL_MODULE_ID) {
+        return {
+          code: `export * from 'astro/actions/runtime/${opts?.ssr ? "server" : "client"}.js';`
+        };
+      }
+      if (id === RESOLVED_OPTIONS_VIRTUAL_MODULE_ID) {
+        return {
+          code: `
+						export const shouldAppendTrailingSlash = ${JSON.stringify(
+            shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
+          )};
+					`
+        };
       }
-      code = code.replace(
-        "'/** @TRAILING_SLASH@ **/'",
-        JSON.stringify(
-          shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
-        )
-      );
-      return { code };
     }
   };
 }
 export {
   vitePluginActions,
-  vitePluginActionsBuild,
-  vitePluginUserActions
+  vitePluginActionsBuild
 };

package/dist/assets/fonts/constants.d.ts

@@ -1,6 +1,7 @@
 import type { Defaults, FontType } from './types.js';
 export declare const LOCAL_PROVIDER_NAME = "local";
 export declare const DEFAULTS: Defaults;
+/** Used to serialize data, to be used by public APIs */
 export declare const VIRTUAL_MODULE_ID = "virtual:astro:assets/fonts/internal";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const ASSETS_DIR = "fonts";

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -41,7 +41,6 @@ function createCollectionToGlobResultMap({
 }
 const cacheHintSchema = z.object({
   tags: z.array(z.string()).optional(),
-  maxAge: z.number().optional(),
   lastModified: z.date().optional()
 });
 async function parseLiveEntry(entry, schema, collection) {
@@ -381,18 +380,12 @@ function createGetLiveCollection({
       }
       if (processedEntries.length > 0) {
         const entryTags = /* @__PURE__ */ new Set();
-        let minMaxAge;
         let latestModified;
         for (const entry of processedEntries) {
           if (entry.cacheHint) {
             if (entry.cacheHint.tags) {
               entry.cacheHint.tags.forEach((tag) => entryTags.add(tag));
             }
-            if (typeof entry.cacheHint.maxAge === "number") {
-              if (minMaxAge === void 0 || entry.cacheHint.maxAge < minMaxAge) {
-                minMaxAge = entry.cacheHint.maxAge;
-              }
-            }
             if (entry.cacheHint.lastModified instanceof Date) {
               if (latestModified === void 0 || entry.cacheHint.lastModified > latestModified) {
                 latestModified = entry.cacheHint.lastModified;
@@ -400,14 +393,11 @@ function createGetLiveCollection({
             }
           }
         }
-        if (entryTags.size > 0 || minMaxAge !== void 0 || latestModified || cacheHint) {
+        if (entryTags.size > 0 || latestModified || cacheHint) {
           const mergedCacheHint = {};
           if (cacheHint?.tags || entryTags.size > 0) {
             mergedCacheHint.tags = [.../* @__PURE__ */ new Set([...cacheHint?.tags || [], ...entryTags])];
           }
-          if (cacheHint?.maxAge !== void 0 || minMaxAge !== void 0) {
-            mergedCacheHint.maxAge = cacheHint?.maxAge !== void 0 && minMaxAge !== void 0 ? Math.min(cacheHint.maxAge, minMaxAge) : cacheHint?.maxAge ?? minMaxAge;
-          }
           if (cacheHint?.lastModified && latestModified) {
             mergedCacheHint.lastModified = cacheHint.lastModified > latestModified ? cacheHint.lastModified : latestModified;
           } else if (cacheHint?.lastModified || latestModified) {

package/dist/core/app/types.d.ts

@@ -1,5 +1,5 @@
 import type { ZodType } from 'zod';
-import type { ActionAccept, ActionClient } from '../../actions/runtime/virtual/server.js';
+import type { ActionAccept, ActionClient } from '../../actions/runtime/server.js';
 import type { RoutingStrategies } from '../../i18n/utils.js';
 import type { ComponentInstance, SerializedRouteData } from '../../types/astro.js';
 import type { AstroMiddlewareInstance } from '../../types/public/common.js';

package/dist/core/base-pipeline.d.ts

@@ -1,5 +1,5 @@
 import type { ZodType } from 'zod';
-import type { ActionAccept, ActionClient } from '../actions/runtime/virtual/server.js';
+import type { ActionAccept, ActionClient } from '../actions/runtime/server.js';
 import type { ComponentInstance } from '../types/astro.js';
 import type { MiddlewareHandler, RewritePayload } from '../types/public/common.js';
 import type { RuntimeMode } from '../types/public/config.js';

package/dist/core/build/plugins/plugin-actions.js

@@ -1,4 +1,4 @@
-import { vitePluginActionsBuild } from "../../../actions/plugins.js";
+import { vitePluginActionsBuild } from "../../../actions/vite-plugin-actions.js";
 function pluginActions(opts, internals) {
   return {
     targets: ["server"],

package/dist/core/build/plugins/plugin-ssr.js

@@ -1,4 +1,4 @@
-import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from "../../../actions/consts.js";
+import { ENTRYPOINT_VIRTUAL_MODULE_ID } from "../../../actions/consts.js";
 import { MIDDLEWARE_MODULE_ID } from "../../middleware/vite-plugin.js";
 import { routeIsRedirect } from "../../redirects/index.js";
 import { VIRTUAL_ISLAND_MAP_ID } from "../../server-islands/vite-plugin-server-islands.js";
@@ -149,7 +149,7 @@ function generateSSRCode(adapter, middlewareId) {
     `    pageMap,`,
     `    serverIslandMap,`,
     `    renderers,`,
-    `    actions: () => import("${ASTRO_ACTIONS_INTERNAL_MODULE_ID}"),`,
+    `    actions: () => import("${ENTRYPOINT_VIRTUAL_MODULE_ID}"),`,
     `    middleware: ${edgeMiddleware ? "undefined" : `() => import("${middlewareId}")`}`,
     `});`,
     `const _args = ${adapter.args ? JSON.stringify(adapter.args, null, 4) : "undefined"};`,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.14.5";
+const ASTRO_VERSION = "5.14.6";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/create-vite.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 import { convertPathToPattern } from "tinyglobby";
 import * as vite from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
-import { vitePluginActions, vitePluginUserActions } from "../actions/plugins.js";
+import { vitePluginActions } from "../actions/vite-plugin-actions.js";
 import { getAssetsPrefix } from "../assets/utils/getAssetsPrefix.js";
 import astroAssetsPlugin from "../assets/vite-plugin-assets.js";
 import astroContainer from "../container/vite-plugin-container.js";
@@ -136,7 +136,6 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       vitePluginFileURL(),
       astroInternationalization({ settings }),
       vitePluginActions({ fs, settings }),
-      vitePluginUserActions({ settings }),
       vitePluginServerIslands({ settings, logger }),
       astroContainer(),
       astroHmrReloadPlugin()

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.14.5";
+  const version = "5.14.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.14.5"}`
+        `v${"5.14.6"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -1,6 +1,6 @@
 import { green } from "kleur/colors";
-import { getActionContext } from "../actions/runtime/virtual/server.js";
-import { deserializeActionResult } from "../actions/runtime/virtual/shared.js";
+import { getActionContext } from "../actions/runtime/server.js";
+import { deserializeActionResult } from "../actions/runtime/shared.js";
 import { createCallAction, createGetActionResult, hasActionPayload } from "../actions/utils.js";
 import {
   computeCurrentLocale,

package/dist/env/constants.d.ts

@@ -1,8 +1,9 @@
-export declare const VIRTUAL_MODULES_IDS: {
-    client: string;
-    server: string;
-    internal: string;
-};
-export declare const VIRTUAL_MODULES_IDS_VALUES: Set<string>;
+export declare const CLIENT_VIRTUAL_MODULE_ID = "astro:env/client";
+export declare const RESOLVED_CLIENT_VIRTUAL_MODULE_ID: string;
+export declare const SERVER_VIRTUAL_MODULE_ID = "astro:env/server";
+export declare const RESOLVED_SERVER_VIRTUAL_MODULE_ID: string;
+/** Used to serialize the schema */
+export declare const INTERNAL_VIRTUAL_MODULE_ID = "virtual:astro:env/internal";
+export declare const RESOLVED_INTERNAL_VIRTUAL_MODULE_ID: string;
 export declare const ENV_TYPES_FILE = "env.d.ts";
 export declare const MODULE_TEMPLATE_URL: URL;

package/dist/env/constants.js

@@ -1,15 +1,19 @@
-const VIRTUAL_MODULES_IDS = {
-  client: "astro:env/client",
-  server: "astro:env/server",
-  internal: "virtual:astro:env/internal"
-};
-const VIRTUAL_MODULES_IDS_VALUES = new Set(Object.values(VIRTUAL_MODULES_IDS));
+const CLIENT_VIRTUAL_MODULE_ID = "astro:env/client";
+const RESOLVED_CLIENT_VIRTUAL_MODULE_ID = "\0" + CLIENT_VIRTUAL_MODULE_ID;
+const SERVER_VIRTUAL_MODULE_ID = "astro:env/server";
+const RESOLVED_SERVER_VIRTUAL_MODULE_ID = "\0" + SERVER_VIRTUAL_MODULE_ID;
+const INTERNAL_VIRTUAL_MODULE_ID = "virtual:astro:env/internal";
+const RESOLVED_INTERNAL_VIRTUAL_MODULE_ID = "\0" + INTERNAL_VIRTUAL_MODULE_ID;
 const ENV_TYPES_FILE = "env.d.ts";
 const PKG_BASE = new URL("../../", import.meta.url);
 const MODULE_TEMPLATE_URL = new URL("templates/env.mjs", PKG_BASE);
 export {
+  CLIENT_VIRTUAL_MODULE_ID,
   ENV_TYPES_FILE,
+  INTERNAL_VIRTUAL_MODULE_ID,
   MODULE_TEMPLATE_URL,
-  VIRTUAL_MODULES_IDS,
-  VIRTUAL_MODULES_IDS_VALUES
+  RESOLVED_CLIENT_VIRTUAL_MODULE_ID,
+  RESOLVED_INTERNAL_VIRTUAL_MODULE_ID,
+  RESOLVED_SERVER_VIRTUAL_MODULE_ID,
+  SERVER_VIRTUAL_MODULE_ID
 };

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

@@ -1,9 +1,13 @@
 import { readFileSync } from "node:fs";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import {
+  CLIENT_VIRTUAL_MODULE_ID,
+  INTERNAL_VIRTUAL_MODULE_ID,
   MODULE_TEMPLATE_URL,
-  VIRTUAL_MODULES_IDS,
-  VIRTUAL_MODULES_IDS_VALUES
+  RESOLVED_CLIENT_VIRTUAL_MODULE_ID,
+  RESOLVED_INTERNAL_VIRTUAL_MODULE_ID,
+  RESOLVED_SERVER_VIRTUAL_MODULE_ID,
+  SERVER_VIRTUAL_MODULE_ID
 } from "./constants.js";
 import { invalidVariablesToError } from "./errors.js";
 import { getEnvFieldType, validateEnvVariable } from "./validators.js";
@@ -47,35 +51,38 @@ function astroEnv({ settings, sync, envLoader }) {
       templates = null;
     },
     resolveId(id) {
-      if (VIRTUAL_MODULES_IDS_VALUES.has(id)) {
-        return resolveVirtualModuleId(id);
+      if (id === CLIENT_VIRTUAL_MODULE_ID) {
+        return RESOLVED_CLIENT_VIRTUAL_MODULE_ID;
+      }
+      if (id === SERVER_VIRTUAL_MODULE_ID) {
+        return RESOLVED_SERVER_VIRTUAL_MODULE_ID;
+      }
+      if (id === INTERNAL_VIRTUAL_MODULE_ID) {
+        return RESOLVED_INTERNAL_VIRTUAL_MODULE_ID;
       }
     },
     load(id, options) {
-      if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.client)) {
+      if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID) {
         ensureTemplateAreLoaded();
         return { code: templates.client };
       }
-      if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.server)) {
+      if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
         if (options?.ssr) {
           ensureTemplateAreLoaded();
           return { code: templates.server };
         }
         throw new AstroError({
           ...AstroErrorData.ServerOnlyModule,
-          message: AstroErrorData.ServerOnlyModule.message(VIRTUAL_MODULES_IDS.server)
+          message: AstroErrorData.ServerOnlyModule.message(SERVER_VIRTUAL_MODULE_ID)
         });
       }
-      if (id === resolveVirtualModuleId(VIRTUAL_MODULES_IDS.internal)) {
+      if (id === RESOLVED_INTERNAL_VIRTUAL_MODULE_ID) {
         ensureTemplateAreLoaded();
         return { code: templates.internal };
       }
     }
   };
 }
-function resolveVirtualModuleId(id) {
-  return `\0${id}`;
-}
 function validatePublicVariables({
   schema,
   loadedEnv,

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

@@ -2,7 +2,7 @@ import { clsx } from "clsx";
 import { HTMLString, markHTMLString } from "../escape.js";
 import { isPromise } from "../util.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
-const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
+const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|muted|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);

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

@@ -112,8 +112,6 @@ export type GetDataEntryInfoReturnType = {
 export interface CacheHint {
     /** Cache tags */
     tags?: Array<string>;
-    /** Maximum age of the response in seconds */
-    maxAge?: number;
     /** Last modified time of the content */
     lastModified?: Date;
 }
@@ -122,6 +120,10 @@ export interface LiveDataEntry<TData extends Record<string, any> = Record<string
     id: string;
     /** The parsed entry data */
     data: TData;
+    /** Optional rendered content */
+    rendered?: {
+        html: string;
+    };
     /** A hint for how to cache this entry */
     cacheHint?: CacheHint;
 }

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

@@ -1,5 +1,5 @@
 import type { z } from 'zod';
-import type { ActionAccept, ActionClient, ActionReturnType } from '../../actions/runtime/virtual/server.js';
+import type { ActionAccept, ActionClient, ActionReturnType } from '../../actions/runtime/server.js';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from '../../core/constants.js';
 import type { AstroCookies } from '../../core/cookies/cookies.js';
 import type { CspDirective, CspHash } from '../../core/csp/config.js';

package/dist/virtual-modules/actions.d.ts

@@ -0,0 +1,4 @@
+import type { ActionClient } from '../actions/runtime/server.js';
+export * from 'virtual:astro:actions/runtime';
+export declare function getActionPath(action: ActionClient<any, any, any>): string;
+export declare const actions: Record<string | symbol, any>;

package/dist/virtual-modules/actions.js

@@ -0,0 +1,123 @@
+import { shouldAppendTrailingSlash } from "virtual:astro:actions/options";
+import {
+  ACTION_QUERY_PARAMS,
+  ActionError,
+  appendForwardSlash,
+  astroCalledServerError,
+  deserializeActionResult,
+  getActionQueryString
+} from "../actions/runtime/shared.js";
+export * from "virtual:astro:actions/runtime";
+const apiContextRoutesSymbol = Symbol.for("context.routes");
+const ENCODED_DOT = "%2E";
+function toActionProxy(actionCallback = {}, aggregatedPath = "") {
+  return new Proxy(actionCallback, {
+    get(target, objKey) {
+      if (target.hasOwnProperty(objKey) || typeof objKey === "symbol") {
+        return target[objKey];
+      }
+      const path = aggregatedPath + encodeURIComponent(objKey.toString()).replaceAll(".", ENCODED_DOT);
+      function action(param) {
+        return handleAction(param, path, this);
+      }
+      Object.assign(action, {
+        queryString: getActionQueryString(path),
+        toString: () => action.queryString,
+        // redefine prototype methods as the object's own property, not the prototype's
+        bind: action.bind,
+        valueOf: () => action.valueOf,
+        // Progressive enhancement info for React.
+        $$FORM_ACTION: function() {
+          const searchParams = new URLSearchParams(action.toString());
+          return {
+            method: "POST",
+            // `name` creates a hidden input.
+            // It's unused by Astro, but we can't turn this off.
+            // At least use a name that won't conflict with a user's formData.
+            name: "_astroAction",
+            action: "?" + searchParams.toString()
+          };
+        },
+        // Note: `orThrow` does not have progressive enhancement info.
+        // If you want to throw exceptions,
+        //  you must handle those exceptions with client JS.
+        async orThrow(param) {
+          const { data, error } = await handleAction(param, path, this);
+          if (error) throw error;
+          return data;
+        }
+      });
+      return toActionProxy(action, path + ".");
+    }
+  });
+}
+function _getActionPath(toString) {
+  let path = `${import.meta.env.BASE_URL.replace(/\/$/, "")}/_actions/${new URLSearchParams(toString()).get(ACTION_QUERY_PARAMS.actionName)}`;
+  if (shouldAppendTrailingSlash) {
+    path = appendForwardSlash(path);
+  }
+  return path;
+}
+function getActionPath(action) {
+  return _getActionPath(action.toString);
+}
+async function handleAction(param, path, context) {
+  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);
+  }
+  const headers = new Headers();
+  headers.set("Accept", "application/json");
+  let body = param;
+  if (!(body instanceof FormData)) {
+    try {
+      body = JSON.stringify(param);
+    } catch (e) {
+      throw new ActionError({
+        code: "BAD_REQUEST",
+        message: `Failed to serialize request body to JSON. Full error: ${e.message}`
+      });
+    }
+    if (body) {
+      headers.set("Content-Type", "application/json");
+    } else {
+      headers.set("Content-Length", "0");
+    }
+  }
+  const rawResult = await fetch(
+    _getActionPath(() => getActionQueryString(path)),
+    {
+      method: "POST",
+      body,
+      headers
+    }
+  );
+  if (rawResult.status === 204) {
+    return deserializeActionResult({ type: "empty", status: 204 });
+  }
+  const bodyText = await rawResult.text();
+  if (rawResult.ok) {
+    return deserializeActionResult({
+      type: "data",
+      body: bodyText,
+      status: 200,
+      contentType: "application/json+devalue"
+    });
+  }
+  return deserializeActionResult({
+    type: "error",
+    body: bodyText,
+    status: rawResult.status,
+    contentType: "application/json"
+  });
+}
+const actions = toActionProxy();
+export {
+  actions,
+  getActionPath
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.14.5",
+  "version": "5.14.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -149,9 +149,9 @@
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.24.6",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.7.4",
     "@astrojs/markdown-remark": "6.3.8",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/internal-helpers": "0.7.4"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"

package/types/actions.d.ts

@@ -1,7 +1,7 @@
 declare module 'astro:actions' {
-	export * from 'astro/actions/runtime/virtual/server.js';
+	export * from 'astro/actions/runtime/server.js';
 
 	export function getActionPath(
-		action: import('astro/actions/runtime/virtual/server.js').ActionClient<any, any, any>,
+		action: import('astro/actions/runtime/server.js').ActionClient<any, any, any>,
 	): string;
 }

package/templates/actions.mjs

@@ -1,133 +0,0 @@
-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 = '') {
-	return new Proxy(actionCallback, {
-		get(target, objKey) {
-			if (target.hasOwnProperty(objKey) || typeof objKey === 'symbol') {
-				return target[objKey];
-			}
-			// Add the key, encoding dots so they're not interpreted as nested properties.
-			const path =
-				aggregatedPath + encodeURIComponent(objKey.toString()).replaceAll('.', ENCODED_DOT);
-			function action(param) {
-				return handleAction(param, path, this);
-			}
-
-			Object.assign(action, {
-				queryString: getActionQueryString(path),
-				toString: () => action.queryString,
-				// redefine prototype methods as the object's own property, not the prototype's
-				bind: action.bind,
-				valueOf: () => action.valueOf,
-				// Progressive enhancement info for React.
-				$$FORM_ACTION: function () {
-					const searchParams = new URLSearchParams(action.toString());
-					return {
-						method: 'POST',
-						// `name` creates a hidden input.
-						// It's unused by Astro, but we can't turn this off.
-						// At least use a name that won't conflict with a user's formData.
-						name: '_astroAction',
-						action: '?' + searchParams.toString(),
-					};
-				},
-				// Note: `orThrow` does not have progressive enhancement info.
-				// If you want to throw exceptions,
-				//  you must handle those exceptions with client JS.
-				async orThrow(param) {
-					const { data, error } = await handleAction(param, path, this);
-					if (error) throw error;
-					return data;
-				},
-			});
-
-			// recurse to construct queries for nested object paths
-			// ex. actions.user.admins.auth()
-			return toActionProxy(action, path + '.');
-		},
-	});
-}
-
-const SHOULD_APPEND_TRAILING_SLASH = '/** @TRAILING_SLASH@ **/';
-
-/** @param {import('astro:actions').ActionClient<any, any, any>} */
-export function getActionPath(action) {
-	let path = `${import.meta.env.BASE_URL.replace(/\/$/, '')}/_actions/${new URLSearchParams(action.toString()).get(ACTION_QUERY_PARAMS.actionName)}`;
-	if (SHOULD_APPEND_TRAILING_SLASH) {
-		path = appendForwardSlash(path);
-	}
-	return path;
-}
-
-/**
- * @param {*} param argument passed to the action when called server or client-side.
- * @param {string} path Built path to call action by path name.
- * @param {import('../dist/types/public/context.js').APIContext | undefined} context Injected API context when calling actions from the server.
- * Usage: `actions.[name](param)`.
- * @returns {Promise<import('../dist/actions/runtime/virtual/shared.js').SafeResult<any, any>>}
- */
-async function handleAction(param, path, context) {
-	// When running server-side, import the action and call it.
-	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);
-	}
-
-	// When running client-side, make a fetch request to the action path.
-	const headers = new Headers();
-	headers.set('Accept', 'application/json');
-	let body = param;
-	if (!(body instanceof FormData)) {
-		try {
-			body = JSON.stringify(param);
-		} catch (e) {
-			throw new ActionError({
-				code: 'BAD_REQUEST',
-				message: `Failed to serialize request body to JSON. Full error: ${e.message}`,
-			});
-		}
-		if (body) {
-			headers.set('Content-Type', 'application/json');
-		} else {
-			headers.set('Content-Length', '0');
-		}
-	}
-	const rawResult = await fetch(
-		getActionPath({
-			toString() {
-				return getActionQueryString(path);
-			},
-		}),
-		{
-			method: 'POST',
-			body,
-			headers,
-		},
-	);
-
-	if (rawResult.status === 204) {
-		return deserializeActionResult({ type: 'empty', status: 204 });
-	}
-
-	return deserializeActionResult({
-		type: rawResult.ok ? 'data' : 'error',
-		body: await rawResult.text(),
-	});
-}
-
-export const actions = toActionProxy();