Adapter related changes for IntegrationData (#377)

* chore: port adapter related changes from astro #11864 * chore: bump version * chore: bump * fix: types * fix * fix: tests * fix: locals * Update expected image endpoint --------- Co-authored-by: Florian Lefebvre <[email protected]> Co-authored-by: Matthew Phillips <[email protected]>
withastro · Sep 16, 2024 · bea4ad2 · bea4ad2
1 parent f952649
commit bea4ad2
Show file tree

Hide file tree

Showing 26 changed files with 33 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...tegrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-server/package.json b/...tegrations/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/...tegrations/vercel/test/fixtures/with-speed-insights-enabled/output-as-static/package.json b/...tegrations/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/...ntegrations/vercel/test/fixtures/with-web-analytics-enabled/output-as-static/package.json b/...ntegrations/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
@@ -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
@@ -50,7 +50,7 @@ describe('ISR', () => {
 				dest: '/_isr?x_astro_path=$0',
 			},
 			{
-				src: '^\\/_image$',
+				src: '^\\/_image\\/?$',
 				dest: '_render',
 			},
 		]);