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 <contact@florian-lefebvre.dev> Co-authored-by: Matthew Phillips <matthew@skypack.dev>
withastro · Sep 16, 2024 · b77f99c · b77f99c
1 parent 3a49eb7
commit b77f99c
Show file tree

Hide file tree

Showing 62 changed files with 278 additions and 324 deletions.
diff --git a/.changeset/olive-jobs-press.md b/.changeset/olive-jobs-press.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': major
+---
+
+Updates the adapter to use new `IntegrationRouteData` type
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/underscore-redirects": "^0.3.4",
+    "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
     "@cloudflare/workers-types": "^4.20240821.1",
     "esbuild": "^0.23.1",
     "estree-walker": "^3.0.3",
@@ -40,11 +40,11 @@
     "@inox-tools/astro-when": "^0.2.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",
     "execa": "^8.0.1",

diff --git a/packages/cloudflare/src/entrypoints/image-service.ts b/packages/cloudflare/src/entrypoints/image-service.ts
@@ -25,7 +25,6 @@ const service: ExternalImageService = {
 		}
 
 		const imageEndpoint = joinPaths(
-			// @ts-expect-error - Property 'env' does not exist on type 'ImportMeta'.ts(2339)
 			import.meta.env.BASE_URL,
 			'/cdn-cgi/image',
 			resizingParams.join(','),

diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
@@ -1,4 +1,4 @@
-import type { AstroConfig, AstroIntegration, RouteData } from 'astro';
+import type { AstroConfig, AstroIntegration, IntegrationRouteData } from 'astro';
 import type { PluginOption } from 'vite';
 
 import { createReadStream } from 'node:fs';
@@ -295,7 +295,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					redirectsExists = false;
 				}
 
-				const redirects: RouteData['segments'][] = [];
+				const redirects: IntegrationRouteData['segments'][] = [];
 				if (redirectsExists) {
 					const rl = createInterface({
 						input: createReadStream(new URL('./_redirects', _config.outDir)),
@@ -342,7 +342,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					);
 				}
 
-				const redirectRoutes: [RouteData, string][] = [];
+				const redirectRoutes: [IntegrationRouteData, string][] = [];
 				for (const route of routes) {
 					if (route.type === 'redirect') redirectRoutes.push([route, '']);
 				}

diff --git a/packages/cloudflare/src/utils/generate-routes-json.ts b/packages/cloudflare/src/utils/generate-routes-json.ts
@@ -1,4 +1,4 @@
-import type { AstroConfig, AstroIntegrationLogger, RouteData, RoutePart } from 'astro';
+import type { AstroConfig, AstroIntegrationLogger, IntegrationRouteData, RoutePart } from 'astro';
 
 import { existsSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
@@ -63,7 +63,7 @@ async function writeRoutesFileToOutDir(
 	}
 }
 
-function segmentsToCfSyntax(segments: RouteData['segments'], _config: AstroConfig) {
+function segmentsToCfSyntax(segments: IntegrationRouteData['segments'], _config: AstroConfig) {
 	const pathSegments = [];
 	if (removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)).length > 0) {
 		pathSegments.push(removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)));
@@ -138,11 +138,11 @@ class PathTrie {
 export async function createRoutesFile(
 	_config: AstroConfig,
 	logger: AstroIntegrationLogger,
-	routes: RouteData[],
+	routes: IntegrationRouteData[],
 	pages: {
 		pathname: string;
 	}[],
-	redirects: RouteData['segments'][],
+	redirects: IntegrationRouteData['segments'][],
 	includeExtends:
 		| {
 				pattern: string;

diff --git a/packages/cloudflare/src/utils/image-config.ts b/packages/cloudflare/src/utils/image-config.ts
@@ -24,17 +24,16 @@ export function setImageConfig(
 			return {
 				...config,
 				service: sharpImageService(),
-				endpoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+				endpoint: {
+					entrypoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+				},
 			};
 
 		case 'custom':
 			return { ...config };
 
 		default:
-			if (
-				config.service.entrypoint === 'astro/assets/services/sharp' ||
-				config.service.entrypoint === 'astro/assets/services/squoosh'
-			) {
+			if (config.service.entrypoint === 'astro/assets/services/sharp') {
 				logger.warn(
 					`The current configuration does not support image optimization. To allow your project to build with the original, unoptimized images, the image service has been automatically switched to the 'noop' option. See https://docs.astro.build/en/reference/configuration-reference/#imageservice`
 				);

diff --git a/packages/cloudflare/test/fixtures/astro-dev-platform/package.json b/packages/cloudflare/test/fixtures/astro-dev-platform/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   },
   "devDependencies": {
     "wrangler": "^3.72.2"

diff --git a/packages/cloudflare/test/fixtures/astro-env/package.json b/packages/cloudflare/test/fixtures/astro-env/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   },
   "devDependencies": {
     "wrangler": "^3.72.2"

diff --git a/packages/cloudflare/test/fixtures/compile-image-service/package.json b/packages/cloudflare/test/fixtures/compile-image-service/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/external-image-service/package.json b/packages/cloudflare/test/fixtures/external-image-service/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/module-loader/package.json b/packages/cloudflare/test/fixtures/module-loader/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/no-output/package.json b/packages/cloudflare/test/fixtures/no-output/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/routes-json/package.json b/packages/cloudflare/test/fixtures/routes-json/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/with-solid-js/package.json b/packages/cloudflare/test/fixtures/with-solid-js/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
     "@astrojs/solid-js": "^4.4.1",
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "solid-js": "^1.8.21"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json b/packages/cloudflare/test/fixtures/wrangler-preview-platform/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/netlify/package.json b/packages/netlify/package.json
@@ -32,20 +32,20 @@
   },
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/underscore-redirects": "^0.3.4",
+    "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
     "@netlify/functions": "^2.8.0",
     "@vercel/nft": "^0.27.3",
     "esbuild": "^0.23.1"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
     "@netlify/edge-functions": "^2.10.0",
     "@netlify/edge-handler-types": "^0.34.1",
     "@types/node": "^20.16.1",
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",

diff --git a/packages/netlify/src/index.ts b/packages/netlify/src/index.ts
@@ -10,7 +10,7 @@ import type {
 	AstroIntegration,
 	AstroIntegrationLogger,
 	HookParameters,
-	RouteData,
+	IntegrationRouteData,
 } from 'astro';
 import { build } from 'esbuild';
 import { copyDependenciesToFunction } from './lib/nft.js';
@@ -26,7 +26,7 @@ export interface NetlifyLocals {
 	};
 }
 
-const isStaticRedirect = (route: RouteData) =>
+const isStaticRedirect = (route: IntegrationRouteData) =>
 	route.type === 'redirect' && (route.redirect || route.redirectRoute);
 
 type RemotePattern = AstroConfig['image']['remotePatterns'][number];
@@ -212,7 +212,7 @@ export default function netlifyIntegration(
 			emptyDir(ssrBuildDir()),
 		]);
 
-	async function writeRedirects(routes: RouteData[], dir: URL) {
+	async function writeRedirects(routes: IntegrationRouteData[], dir: URL) {
 		const fallback = finalBuildOutput === 'static' ? '/.netlify/static' : '/.netlify/functions/ssr';
 		const redirects = createRedirectsFromAstroRoutes({
 			config: _config,

diff --git a/packages/netlify/test/hosted/hosted-astro-project/package.json b/packages/netlify/test/hosted/hosted-astro-project/package.json
@@ -7,6 +7,6 @@
   },
   "dependencies": {
     "@astrojs/netlify": "workspace:*",
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   }
 }
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -30,14 +30,14 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.6"
+    "astro": "^5.0.0-alpha.8"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
     "@types/node": "^18.17.8",
     "@types/send": "^0.17.4",
     "@types/server-destroy": "^1.0.4",
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "express": "^4.19.2",

diff --git a/packages/node/test/fixtures/api-route/package.json b/packages/node/test/fixtures/api-route/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/bad-urls/package.json b/packages/node/test/fixtures/bad-urls/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/encoded/package.json b/packages/node/test/fixtures/encoded/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/errors/package.json b/packages/node/test/fixtures/errors/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/headers/package.json b/packages/node/test/fixtures/headers/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/image/package.json b/packages/node/test/fixtures/image/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   },
   "scripts": {

diff --git a/packages/node/test/fixtures/locals/package.json b/packages/node/test/fixtures/locals/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/node-middleware/package.json b/packages/node/test/fixtures/node-middleware/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/prerender-404-500/package.json b/packages/node/test/fixtures/prerender-404-500/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/prerender/package.json b/packages/node/test/fixtures/prerender/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/prerender/src/middleware.ts b/packages/node/test/fixtures/prerender/src/middleware.ts
@@ -1,7 +1,5 @@
 import { shared } from './shared';
 export const onRequest = (ctx, next) => {
-	ctx.locals = {
-		name: shared,
-	};
+	ctx.locals.name = shared;
 	return next();
 };
diff --git a/packages/node/test/fixtures/preview-headers/package.json b/packages/node/test/fixtures/preview-headers/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/trailing-slash/package.json b/packages/node/test/fixtures/trailing-slash/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/url/package.json b/packages/node/test/fixtures/url/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }
diff --git a/packages/node/test/fixtures/well-known-locations/package.json b/packages/node/test/fixtures/well-known-locations/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "^5.0.0-alpha.6",
+    "astro": "^5.0.0-alpha.8",
     "@astrojs/node": "workspace:*"
   }
 }