diff options
26 files changed, 33 insertions, 35 deletions
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 2172633f1..5c2c0a13e 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -47,11 +47,11 @@ "web-vitals": "^3.5.2" }, "peerDependencies": { - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" }, "devDependencies": { "@astrojs/test-utils": "workspace:*", - "astro": "^5.0.0-alpha.6", + "astro": "^5.0.0-alpha.8", "astro-scripts": "workspace:*", "cheerio": "1.0.0" }, diff --git a/packages/integrations/vercel/src/lib/redirects.ts b/packages/integrations/vercel/src/lib/redirects.ts index 39cbfa0fe..1d7d4eca5 100644 --- a/packages/integrations/vercel/src/lib/redirects.ts +++ b/packages/integrations/vercel/src/lib/redirects.ts @@ -1,6 +1,6 @@ import nodePath from 'node:path'; import { appendForwardSlash, removeLeadingForwardSlash } from '@astrojs/internal-helpers/path'; -import type { AstroConfig, RouteData, RoutePart } from 'astro'; +import type { AstroConfig, IntegrationRouteData, RoutePart } from 'astro'; const pathJoin = nodePath.posix.join; @@ -85,7 +85,7 @@ function getReplacePattern(segments: RoutePart[][]) { return result; } -function getRedirectLocation(route: RouteData, config: AstroConfig): string { +function getRedirectLocation(route: IntegrationRouteData, config: AstroConfig): string { if (route.redirectRoute) { const pattern = getReplacePattern(route.redirectRoute.segments); const path = config.trailingSlash === 'always' ? appendForwardSlash(pattern) : pattern; @@ -99,7 +99,7 @@ function getRedirectLocation(route: RouteData, config: AstroConfig): string { } } -function getRedirectStatus(route: RouteData): number { +function getRedirectStatus(route: IntegrationRouteData): number { if (typeof route.redirect === 'object') { return route.redirect.status; } @@ -116,7 +116,7 @@ export function escapeRegex(content: string) { return `^/${getMatchPattern(segments)}$`; } -export function getRedirects(routes: RouteData[], config: AstroConfig): VercelRoute[] { +export function getRedirects(routes: IntegrationRouteData[], config: AstroConfig): VercelRoute[] { // biome-ignore lint/style/useConst: <explanation> let redirects: VercelRoute[] = []; diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index 9ae0a87b7..3803cdf41 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -7,7 +7,7 @@ import type { AstroConfig, AstroIntegration, AstroIntegrationLogger, - RouteData, + IntegrationRouteData, } from 'astro'; import { AstroError } from 'astro/errors'; import glob from 'fast-glob'; @@ -193,7 +193,7 @@ export default function vercelServerless({ let _config: AstroConfig; let _buildTempFolder: URL; let _serverEntry: string; - let _entryPoints: Map<RouteData, URL>; + let _entryPoints: Map<IntegrationRouteData, URL>; let _middlewareEntryPoint: URL | undefined; // Extra files to be merged with `includeFiles` during build const extraFilesToInclude: URL[] = []; @@ -314,7 +314,8 @@ export default function vercelServerless({ // Multiple entrypoint support if (_entryPoints.size) { - const getRouteFuncName = (route: RouteData) => route.component.replace('src/pages/', ''); + const getRouteFuncName = (route: IntegrationRouteData) => + route.component.replace('src/pages/', ''); const getFallbackFuncName = (entryFile: URL) => basename(entryFile.toString()) diff --git a/packages/integrations/vercel/src/serverless/middleware.ts b/packages/integrations/vercel/src/serverless/middleware.ts index ca84bff33..973df238f 100644 --- a/packages/integrations/vercel/src/serverless/middleware.ts +++ b/packages/integrations/vercel/src/serverless/middleware.ts @@ -98,7 +98,7 @@ export default async function middleware(request, context) { request, params: {} }); - ctx.locals = { vercel: { edge: context }, ...${handlerTemplateCall} }; + Object.assign(ctx.locals, { vercel: { edge: context }, ...${handlerTemplateCall} }); const { origin } = new URL(request.url); const next = async () => { const { vercel, ...locals } = ctx.locals; diff --git a/packages/integrations/vercel/test/fixtures/basic/package.json b/packages/integrations/vercel/test/fixtures/basic/package.json index d87829b80..859459d0c 100644 --- a/packages/integrations/vercel/test/fixtures/basic/package.json +++ b/packages/integrations/vercel/test/fixtures/basic/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/image/package.json b/packages/integrations/vercel/test/fixtures/image/package.json index 1c6d91e28..28b7bccd2 100644 --- a/packages/integrations/vercel/test/fixtures/image/package.json +++ b/packages/integrations/vercel/test/fixtures/image/package.json @@ -7,6 +7,6 @@ }, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/isr/package.json b/packages/integrations/vercel/test/fixtures/isr/package.json index dfcafce62..7d47893c8 100644 --- a/packages/integrations/vercel/test/fixtures/isr/package.json +++ b/packages/integrations/vercel/test/fixtures/isr/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/max-duration/package.json b/packages/integrations/vercel/test/fixtures/max-duration/package.json index e5f1bbb89..ea3d5523b 100644 --- a/packages/integrations/vercel/test/fixtures/max-duration/package.json +++ b/packages/integrations/vercel/test/fixtures/max-duration/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json b/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json index e32d1a84d..d40a35aac 100644 --- a/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json +++ b/packages/integrations/vercel/test/fixtures/middleware-with-edge-file/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json b/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json index 52d3b5bc0..24e41eb3d 100644 --- a/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json +++ b/packages/integrations/vercel/test/fixtures/middleware-without-edge-file/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/no-output/package.json b/packages/integrations/vercel/test/fixtures/no-output/package.json index 3566aa461..ee2bc9cd8 100644 --- a/packages/integrations/vercel/test/fixtures/no-output/package.json +++ b/packages/integrations/vercel/test/fixtures/no-output/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json index 471ba6fbe..e503f9b42 100644 --- a/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json +++ b/packages/integrations/vercel/test/fixtures/prerendered-error-pages/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json b/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json index 393a63a37..64c719061 100644 --- a/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json +++ b/packages/integrations/vercel/test/fixtures/redirects-serverless/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/redirects/package.json b/packages/integrations/vercel/test/fixtures/redirects/package.json index e3e344755..0f544f40c 100644 --- a/packages/integrations/vercel/test/fixtures/redirects/package.json +++ b/packages/integrations/vercel/test/fixtures/redirects/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/server-islands/astro.config.mjs b/packages/integrations/vercel/test/fixtures/server-islands/astro.config.mjs index 534197429..94f52a3d6 100644 --- a/packages/integrations/vercel/test/fixtures/server-islands/astro.config.mjs +++ b/packages/integrations/vercel/test/fixtures/server-islands/astro.config.mjs @@ -3,8 +3,5 @@ import { defineConfig } from 'astro/config'; export default defineConfig({ output: "server", - adapter: vercel(), - experimental: { - serverIslands: true, - } + adapter: vercel() }); diff --git a/packages/integrations/vercel/test/fixtures/server-islands/package.json b/packages/integrations/vercel/test/fixtures/server-islands/package.json index fb8f46eec..7828ee335 100644 --- a/packages/integrations/vercel/test/fixtures/server-islands/package.json +++ b/packages/integrations/vercel/test/fixtures/server-islands/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json b/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json index 37f031879..fbfdcb86e 100644 --- a/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json +++ b/packages/integrations/vercel/test/fixtures/serverless-prerender/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json index a68346acb..bc866494e 100644 --- a/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json +++ b/packages/integrations/vercel/test/fixtures/serverless-with-dynamic-routes/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/static-assets/package.json b/packages/integrations/vercel/test/fixtures/static-assets/package.json index d9182f087..693155026 100644 --- a/packages/integrations/vercel/test/fixtures/static-assets/package.json +++ b/packages/integrations/vercel/test/fixtures/static-assets/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/static/package.json b/packages/integrations/vercel/test/fixtures/static/package.json index 5f346f4bb..440627b64 100644 --- a/packages/integrations/vercel/test/fixtures/static/package.json +++ b/packages/integrations/vercel/test/fixtures/static/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/streaming/package.json b/packages/integrations/vercel/test/fixtures/streaming/package.json index 8771c7205..13bbdd7cb 100644 --- a/packages/integrations/vercel/test/fixtures/streaming/package.json +++ b/packages/integrations/vercel/test/fixtures/streaming/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json index fd12a581e..4e674fa6d 100644 --- a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json +++ b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json index f29142b7d..fd4b24faa 100644 --- a/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json +++ b/packages/integrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json b/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json index f45d660eb..61d3de1f0 100644 --- a/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json +++ b/packages/integrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json b/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json index 162ff9456..914b2f66d 100644 --- a/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json +++ b/packages/integrations/vercel/test/hosted/hosted-astro-project/package.json @@ -7,6 +7,6 @@ }, "dependencies": { "@astrojs/vercel": "workspace:*", - "astro": "^5.0.0-alpha.6" + "astro": "^5.0.0-alpha.8" } } diff --git a/packages/integrations/vercel/test/isr.test.js b/packages/integrations/vercel/test/isr.test.js index e20b43da1..6c88d0081 100644 --- a/packages/integrations/vercel/test/isr.test.js +++ b/packages/integrations/vercel/test/isr.test.js @@ -50,7 +50,7 @@ describe('ISR', () => { dest: '/_isr?x_astro_path=$0', }, { - src: '^\\/_image$', + src: '^\\/_image\\/?$', dest: '_render', }, ]); |