summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/astro/src/actions/loadActions.ts16
-rw-r--r--packages/astro/src/actions/plugins.ts10
-rw-r--r--packages/astro/src/actions/runtime/virtual/shared.ts5
-rw-r--r--packages/astro/src/core/app/types.ts4
-rw-r--r--packages/astro/src/core/base-pipeline.ts12
-rw-r--r--packages/astro/src/core/build/plugins/index.ts2
-rw-r--r--packages/astro/src/core/build/plugins/plugin-actions.ts2
-rw-r--r--packages/astro/src/core/build/plugins/plugin-ssr.ts4
-rw-r--r--packages/astro/src/core/errors/errors-data.ts1
-rw-r--r--packages/astro/src/core/render-context.ts8
-rw-r--r--packages/astro/src/vite-plugin-astro-server/route.ts4
-rw-r--r--packages/astro/templates/actions.mjs2
12 files changed, 35 insertions, 35 deletions
diff --git a/packages/astro/src/actions/loadActions.ts b/packages/astro/src/actions/loadActions.ts
index 8ea18bf71..5144be7e8 100644
--- a/packages/astro/src/actions/loadActions.ts
+++ b/packages/astro/src/actions/loadActions.ts
@@ -1,8 +1,8 @@
-import type {ModuleLoader} from "../core/module-loader/index.js";
-import {ASTRO_ACTIONS_INTERNAL_MODULE_ID} from "./consts.js";
-import type {SSRActions} from "../core/app/types.js";
-import {ActionsCantBeLoaded} from "../core/errors/errors-data.js";
-import {AstroError} from "../core/errors/index.js";
+import type { SSRActions } from '../core/app/types.js';
+import { ActionsCantBeLoaded } from '../core/errors/errors-data.js';
+import { AstroError } from '../core/errors/index.js';
+import type { ModuleLoader } from '../core/module-loader/index.js';
+import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from './consts.js';
/**
* It accepts a module loader and the astro settings, and it attempts to load the middlewares defined in the configuration.
@@ -11,10 +11,8 @@ import {AstroError} from "../core/errors/index.js";
*/
export async function loadActions(moduleLoader: ModuleLoader) {
try {
- return (await moduleLoader.import(
- ASTRO_ACTIONS_INTERNAL_MODULE_ID,
- )) as SSRActions;
+ return (await moduleLoader.import(ASTRO_ACTIONS_INTERNAL_MODULE_ID)) as SSRActions;
} catch (error: any) {
- throw new AstroError(ActionsCantBeLoaded, {cause: error});
+ throw new AstroError(ActionsCantBeLoaded, { cause: error });
}
}
diff --git a/packages/astro/src/actions/plugins.ts b/packages/astro/src/actions/plugins.ts
index 7b151a860..b1a071f1c 100644
--- a/packages/astro/src/actions/plugins.ts
+++ b/packages/astro/src/actions/plugins.ts
@@ -1,19 +1,19 @@
import type fsMod from 'node:fs';
import type { Plugin as VitePlugin } from 'vite';
+import { addRollupInput } from '../core/build/add-rollup-input.js';
+import type { BuildInternals } from '../core/build/internal.js';
+import type { StaticBuildOptions } from '../core/build/types.js';
import { shouldAppendForwardSlash } from '../core/build/util.js';
+import { getOutputDirectory } from '../prerender/utils.js';
import type { AstroSettings } from '../types/astro.js';
import {
+ ASTRO_ACTIONS_INTERNAL_MODULE_ID,
NOOP_ACTIONS,
RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID,
RESOLVED_VIRTUAL_MODULE_ID,
- ASTRO_ACTIONS_INTERNAL_MODULE_ID,
VIRTUAL_MODULE_ID,
} from './consts.js';
import { isActionsFilePresent } from './utils.js';
-import { getOutputDirectory } from '../prerender/utils.js';
-import type { StaticBuildOptions } from '../core/build/types.js';
-import type { BuildInternals } from '../core/build/internal.js';
-import { addRollupInput } from '../core/build/add-rollup-input.js';
/**
* This plugin is responsible to load the known file `actions/index.js` / `actions.js`
diff --git a/packages/astro/src/actions/runtime/virtual/shared.ts b/packages/astro/src/actions/runtime/virtual/shared.ts
index 24e740681..c9df7969f 100644
--- a/packages/astro/src/actions/runtime/virtual/shared.ts
+++ b/packages/astro/src/actions/runtime/virtual/shared.ts
@@ -1,7 +1,10 @@
import { parse as devalueParse, stringify as devalueStringify } from 'devalue';
import type { z } from 'zod';
import { REDIRECT_STATUS_CODES } from '../../../core/constants.js';
-import {ActionCalledFromServerError, ActionsReturnedInvalidDataError} from '../../../core/errors/errors-data.js';
+import {
+ ActionCalledFromServerError,
+ ActionsReturnedInvalidDataError,
+} from '../../../core/errors/errors-data.js';
import { AstroError } from '../../../core/errors/errors.js';
import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from '../../consts.js';
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index 24fa0ccc6..d07163329 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -1,3 +1,5 @@
+import type { ZodType } from 'zod';
+import type { ActionAccept, ActionClient } from '../../actions/runtime/virtual/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';
@@ -9,8 +11,6 @@ import type {
SSRResult,
} from '../../types/public/internal.js';
import type { SinglePageBuiltModule } from '../build/types.js';
-import type { ActionAccept, ActionClient } from '../../actions/runtime/virtual/server.js';
-import type { ZodType } from 'zod';
export type ComponentPath = string;
diff --git a/packages/astro/src/core/base-pipeline.ts b/packages/astro/src/core/base-pipeline.ts
index 8f4a0dd87..99006910b 100644
--- a/packages/astro/src/core/base-pipeline.ts
+++ b/packages/astro/src/core/base-pipeline.ts
@@ -1,3 +1,5 @@
+import type { ZodType } from 'zod';
+import type { ActionAccept, ActionClient } from '../actions/runtime/virtual/server.js';
import { createI18nMiddleware } from '../i18n/middleware.js';
import type { ComponentInstance } from '../types/astro.js';
import type { MiddlewareHandler, RewritePayload } from '../types/public/common.js';
@@ -9,16 +11,14 @@ import type {
SSRResult,
} from '../types/public/internal.js';
import { createOriginCheckMiddleware } from './app/middlewares.js';
+import type { SSRActions } from './app/types.js';
+import { ActionNotFoundError } from './errors/errors-data.js';
+import { AstroError } from './errors/index.js';
import type { Logger } from './logger/core.js';
import { NOOP_MIDDLEWARE_FN } from './middleware/noop-middleware.js';
import { sequence } from './middleware/sequence.js';
import { RouteCache } from './render/route-cache.js';
import { createDefaultRoutes } from './routing/default.js';
-import type { SSRActions } from './app/types.js';
-import type { ActionAccept, ActionClient } from '../actions/runtime/virtual/server.js';
-import type { ZodType } from 'zod';
-import { AstroError } from './errors/index.js';
-import { ActionNotFoundError } from './errors/errors-data.js';
/**
* The `Pipeline` represents the static parts of rendering that do not change between requests.
@@ -122,7 +122,7 @@ export abstract class Pipeline {
return this.resolvedMiddleware;
}
}
-
+
setActions(actions: SSRActions) {
this.resolvedActions = actions;
}
diff --git a/packages/astro/src/core/build/plugins/index.ts b/packages/astro/src/core/build/plugins/index.ts
index a2a2f8601..d715a9de5 100644
--- a/packages/astro/src/core/build/plugins/index.ts
+++ b/packages/astro/src/core/build/plugins/index.ts
@@ -1,6 +1,7 @@
import { astroConfigBuildPlugin } from '../../../content/vite-plugin-content-assets.js';
import { astroHeadBuildPlugin } from '../../../vite-plugin-head/index.js';
import type { AstroBuildPluginContainer } from '../plugin.js';
+import { pluginActions } from './plugin-actions.js';
import { pluginAnalyzer } from './plugin-analyzer.js';
import { pluginChunks } from './plugin-chunks.js';
import { pluginComponentEntry } from './plugin-component-entry.js';
@@ -13,7 +14,6 @@ import { pluginPrerender } from './plugin-prerender.js';
import { pluginRenderers } from './plugin-renderers.js';
import { pluginScripts } from './plugin-scripts.js';
import { pluginSSR } from './plugin-ssr.js';
-import { pluginActions } from './plugin-actions.js';
export function registerAllPlugins({ internals, options, register }: AstroBuildPluginContainer) {
register(pluginComponentEntry(internals));
diff --git a/packages/astro/src/core/build/plugins/plugin-actions.ts b/packages/astro/src/core/build/plugins/plugin-actions.ts
index 4ff07bcad..0ae2b438c 100644
--- a/packages/astro/src/core/build/plugins/plugin-actions.ts
+++ b/packages/astro/src/core/build/plugins/plugin-actions.ts
@@ -1,7 +1,7 @@
import { vitePluginActionsBuild } from '../../../actions/plugins.js';
-import type { StaticBuildOptions } from '../types.js';
import type { BuildInternals } from '../internal.js';
import type { AstroBuildPlugin } from '../plugin.js';
+import type { StaticBuildOptions } from '../types.js';
export function pluginActions(
opts: StaticBuildOptions,
diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
index 18cdf15bd..56e1458c8 100644
--- a/packages/astro/src/core/build/plugins/plugin-ssr.ts
+++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -1,5 +1,7 @@
import type { Plugin as VitePlugin } from 'vite';
+import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from '../../../actions/consts.js';
import type { AstroAdapter } from '../../../types/public/integrations.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';
import { addRollupInput } from '../add-rollup-input.js';
@@ -10,8 +12,6 @@ import { SSR_MANIFEST_VIRTUAL_MODULE_ID } from './plugin-manifest.js';
import { ASTRO_PAGE_MODULE_ID } from './plugin-pages.js';
import { RENDERERS_MODULE_ID } from './plugin-renderers.js';
import { getVirtualModulePageName } from './util.js';
-import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from '../../../actions/consts.js';
-import { MIDDLEWARE_MODULE_ID } from '../../middleware/vite-plugin.js';
export const SSR_VIRTUAL_MODULE_ID = '@astrojs-ssr-virtual-entry';
export const RESOLVED_SSR_VIRTUAL_MODULE_ID = '\0' + SSR_VIRTUAL_MODULE_ID;
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index dab7af78e..e5b1943c3 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -901,7 +901,6 @@ export const MiddlewareCantBeLoaded = {
message: 'An unknown error was thrown while loading your middleware.',
} satisfies ErrorData;
-
/**
* @docs
* @description
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index 8a8944f1c..c051ead98 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -1,4 +1,5 @@
import type { ActionAPIContext } from '../actions/runtime/utils.js';
+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 {
@@ -12,6 +13,7 @@ import type { ComponentInstance } from '../types/astro.js';
import type { MiddlewareHandler, Props, RewritePayload } from '../types/public/common.js';
import type { APIContext, AstroGlobal, AstroGlobalPartial } from '../types/public/context.js';
import type { RouteData, SSRResult } from '../types/public/internal.js';
+import type { SSRActions } from './app/types.js';
import {
ASTRO_VERSION,
REROUTE_DIRECTIVE_HEADER,
@@ -32,8 +34,6 @@ import { type Pipeline, Slots, getParams, getProps } from './render/index.js';
import { isRoute404or500, isRouteExternalRedirect, isRouteServerIsland } from './routing/match.js';
import { copyRequest, getOriginPathname, setOriginPathname } from './routing/rewrite.js';
import { AstroSession } from './session.js';
-import { getActionContext } from '../actions/runtime/virtual/server.js';
-import type {SSRActions} from "./app/types.js";
export const apiContextRoutesSymbol = Symbol.for('context.routes');
@@ -83,13 +83,13 @@ export class RenderContext {
status = 200,
props,
partial = undefined,
- actions
+ actions,
}: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData' | 'clientAddress'> &
Partial<
Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props' | 'partial' | 'actions'>
>): Promise<RenderContext> {
const pipelineMiddleware = await pipeline.getMiddleware();
- const pipelineActions = actions ?? await pipeline.getActions();
+ const pipelineActions = actions ?? (await pipeline.getActions());
setOriginPathname(request, pathname);
return new RenderContext(
pipeline,
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index b35d0e29b..4129ba04c 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -1,4 +1,5 @@
import type http from 'node:http';
+import { loadActions } from '../actions/loadActions.js';
import {
DEFAULT_404_COMPONENT,
NOOP_MIDDLEWARE_HEADER,
@@ -22,7 +23,6 @@ import type { ComponentInstance, RoutesList } from '../types/astro.js';
import type { RouteData } from '../types/public/internal.js';
import type { DevPipeline } from './pipeline.js';
import { writeSSRResult, writeWebResponse } from './response.js';
-import {loadActions} from "../actions/loadActions.js";
type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
...args: any
@@ -195,7 +195,7 @@ export async function handleRoute({
request,
routeData: route,
clientAddress: incomingRequest.socket.remoteAddress,
- actions
+ actions,
});
let response;
diff --git a/packages/astro/templates/actions.mjs b/packages/astro/templates/actions.mjs
index 8443d5ca9..b39991a65 100644
--- a/packages/astro/templates/actions.mjs
+++ b/packages/astro/templates/actions.mjs
@@ -2,9 +2,9 @@ import {
ACTION_QUERY_PARAMS,
ActionError,
appendForwardSlash,
+ astroCalledServerError,
deserializeActionResult,
getActionQueryString,
- astroCalledServerError,
} from 'astro:actions';
const apiContextRoutesSymbol = Symbol.for('context.routes');
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-07 14:20:56 +0000