diff options
| -rw-r--r-- | packages/astro/src/actions/runtime/middleware.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/render-context.ts | 4 | ||||
| -rw-r--r-- | packages/astro/src/core/routing/rewrite.ts | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/astro/src/actions/runtime/middleware.ts b/packages/astro/src/actions/runtime/middleware.ts index fcd42b799..e5dd794b9 100644 --- a/packages/astro/src/actions/runtime/middleware.ts +++ b/packages/astro/src/actions/runtime/middleware.ts @@ -2,6 +2,7 @@ import { yellow } from 'kleur/colors'; import type { APIContext, MiddlewareNext } from '../../@types/astro.js'; import { ASTRO_ORIGIN_HEADER } from '../../core/constants.js'; import { defineMiddleware } from '../../core/middleware/index.js'; +import { getOriginHeader } from '../../core/routing/rewrite.js'; import { ACTION_QUERY_PARAMS } from '../consts.js'; import { formContentTypes, hasContentType } from './utils.js'; import { getAction } from './virtual/get-action.js'; @@ -10,7 +11,6 @@ import { type SerializedActionResult, serializeActionResult, } from './virtual/shared.js'; -import {getOriginHeader} from "../../core/routing/rewrite.js"; export type ActionPayload = { actionResult: SerializedActionResult; diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts index a79c01922..9f416c7bc 100644 --- a/packages/astro/src/core/render-context.ts +++ b/packages/astro/src/core/render-context.ts @@ -37,7 +37,7 @@ import { callMiddleware } from './middleware/callMiddleware.js'; import { sequence } from './middleware/index.js'; import { renderRedirect } from './redirects/render.js'; import { type Pipeline, Slots, getParams, getProps } from './render/index.js'; -import {copyRequest, setOriginHeader} from './routing/rewrite.js'; +import { copyRequest, setOriginHeader } from './routing/rewrite.js'; export const apiContextRoutesSymbol = Symbol.for('context.routes'); @@ -83,7 +83,7 @@ export class RenderContext { Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props'> >): Promise<RenderContext> { const pipelineMiddleware = await pipeline.getMiddleware(); - setOriginHeader(request, pathname) + setOriginHeader(request, pathname); return new RenderContext( pipeline, locals, diff --git a/packages/astro/src/core/routing/rewrite.ts b/packages/astro/src/core/routing/rewrite.ts index 29d84ce74..493f25043 100644 --- a/packages/astro/src/core/routing/rewrite.ts +++ b/packages/astro/src/core/routing/rewrite.ts @@ -1,9 +1,9 @@ import type { AstroConfig, RewritePayload, RouteData } from '../../@types/astro.js'; import { shouldAppendForwardSlash } from '../build/util.js'; +import { ASTRO_ORIGIN_HEADER } from '../constants.js'; import { AstroError, AstroErrorData } from '../errors/index.js'; import { appendForwardSlash, removeTrailingForwardSlash } from '../path.js'; import { DEFAULT_404_ROUTE } from './astro-designed-error-pages.js'; -import {ASTRO_ORIGIN_HEADER} from "../constants.js"; export type FindRouteToRewrite = { payload: RewritePayload; @@ -109,7 +109,7 @@ export function setOriginHeader(request: Request, pathname: string): void { export function getOriginHeader(request: Request): string | undefined { const origin = request.headers.get(ASTRO_ORIGIN_HEADER); if (origin) { - return decodeURIComponent(origin) + return decodeURIComponent(origin); } - return undefined + return undefined; } |