feat: remove hybrid (#375)

* feat: remove hybrid * fix: udpate with new API * fix: update for latest next changes * fix: more test-utils fix * fix: build * fix: build * fix: tests * fix: netlify * fix: astro env * fix: use types from AStro * chore: changeset
withastro · Sep 11, 2024 · e7881f7 · e7881f7
1 parent 17a7fe5
commit e7881f7
Show file tree

Hide file tree

Showing 79 changed files with 382 additions and 526 deletions.
diff --git a/.changeset/eighty-badgers-change.md b/.changeset/eighty-badgers-change.md
@@ -0,0 +1,8 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/netlify': major
+'@astrojs/vercel': major
+'@astrojs/node': major
+---
+
+Updates internal code to works with Astro 5 changes to hybrid rendering. No changes are necessary to your project, apart from using Astro 5
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ package-lock.json
 .eslintcache
 .pnpm-store
 .idea/
+**/fixtures/**/.astro
 
 # ignore top-level vscode settings
 /.vscode/settings.json
@@ -20,4 +21,3 @@ package-lock.json
 
 # exclude IntelliJ/WebStorm stuff
 .idea
-
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -40,11 +40,11 @@
     "@inox-tools/astro-when": "^0.2.2"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.0"
+    "astro": "^5.0.0-alpha.6"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.0",
+    "astro": "^5.0.0-alpha.6",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",

diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
@@ -141,10 +141,10 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					order: 'pre',
 				});
 			},
-			'astro:config:done': ({ setAdapter, config }) => {
-				if (config.output === 'static') {
-					throw new AstroError(
-						'[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.'
+			'astro:config:done': ({ setAdapter, config, buildOutput, logger }) => {
+				if (buildOutput === 'static') {
+					logger.warn(
+						'[@astrojs/cloudflare] This adapter is intended to be used with server rendered pages, which this project does not contain any of. As such, this adapter is unnecessary.'
 					);
 				}
 
@@ -156,6 +156,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					exports: ['default'],
 					adapterFeatures: {
 						edgeMiddleware: false,
+						buildOutput: 'server',
 					},
 					supportedAstroFeatures: {
 						serverOutput: 'stable',

diff --git a/packages/cloudflare/src/utils/image-config.ts b/packages/cloudflare/src/utils/image-config.ts
@@ -1,10 +1,10 @@
-import type { AstroConfig, AstroIntegrationLogger } from 'astro';
+import type { AstroConfig, AstroIntegrationLogger, HookParameters } from 'astro';
 import { passthroughImageService, sharpImageService } from 'astro/config';
 
 export function setImageConfig(
 	service: string,
 	config: AstroConfig['image'],
-	command: 'dev' | 'build' | 'preview',
+	command: HookParameters<'astro:config:setup'>['command'],
 	logger: AstroIntegrationLogger
 ) {
 	switch (service) {

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.0"
+    "astro": "^5.0.0-alpha.6"
   },
   "devDependencies": {
     "wrangler": "^3.72.2"

diff --git a/packages/cloudflare/test/fixtures/astro-env/astro.config.ts b/packages/cloudflare/test/fixtures/astro-env/astro.config.ts
@@ -2,13 +2,11 @@ import cloudflare from '@astrojs/cloudflare';
 import { defineConfig, envField } from 'astro/config';
 
 export default defineConfig({
-	experimental: {
-		env: {
-			schema: {
-				API_URL: envField.string({ context: 'client', access: 'public', optional: true }),
-				PORT: envField.number({ context: 'server', access: 'public', default: 4321 }),
-				API_SECRET: envField.string({ context: 'server', access: 'secret' }),
-			},
+	env: {
+		schema: {
+			API_URL: envField.string({ context: 'client', access: 'public', optional: true }),
+			PORT: envField.number({ context: 'server', access: 'public', default: 4321 }),
+			API_SECRET: envField.string({ context: 'server', access: 'secret' }),
 		},
 	},
 	adapter: cloudflare(),

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.0"
+    "astro": "^5.0.0-alpha.6"
   },
   "devDependencies": {
     "wrangler": "^3.72.2"

diff --git a/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs b/packages/cloudflare/test/fixtures/compile-image-service/astro.config.mjs
@@ -5,5 +5,5 @@ export default defineConfig({
 	adapter: cloudflare({
 		imageService: 'compile',
 	}),
-	output: 'hybrid',
+	output: 'static',
 });
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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs b/packages/cloudflare/test/fixtures/module-loader/astro.config.mjs
@@ -3,5 +3,5 @@ import { defineConfig } from 'astro/config';
 
 export default defineConfig({
 	adapter: cloudflare({}),
-	output: 'hybrid'
+	output: 'static'
 });
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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
diff --git a/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs b/packages/cloudflare/test/fixtures/routes-json/astro.config.mjs
@@ -1,7 +1,7 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	output: 'hybrid',
+	output: 'static',
 	redirects: {
 		'/a/redirect': '/',
 	},

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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
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.0",
+    "astro": "^5.0.0-alpha.6",
     "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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
diff --git a/packages/cloudflare/test/no-output.test.js b/packages/cloudflare/test/no-output.test.js
diff --git a/packages/cloudflare/test/routes-json.test.js b/packages/cloudflare/test/routes-json.test.js
@@ -23,7 +23,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/_image', '/a/*'],
+				include: ['/a/*', '/_image'],
 				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'],
 			});
 		});
@@ -71,7 +71,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/_image'],
+				include: [],
 				exclude: [],
 			});
 		});
@@ -101,7 +101,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/_image', '/a/*', '/another'],
+				include: ['/a/*', '/_image', '/another'],
 				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'],
 			});
 		});
@@ -131,7 +131,7 @@ describe('_routes.json generation', () => {
 
 			assert.deepEqual(routes, {
 				version: 1,
-				include: ['/_image', '/a/*'],
+				include: ['/a/*', '/_image'],
 				exclude: [
 					'/_astro/*',
 					'/redirectme',

diff --git a/packages/netlify/package.json b/packages/netlify/package.json
@@ -38,14 +38,14 @@
     "esbuild": "^0.23.1"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.0"
+    "astro": "^5.0.0-alpha.6"
   },
   "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.0",
+    "astro": "^5.0.0-alpha.6",
     "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
@@ -5,7 +5,13 @@ import { fileURLToPath } from 'node:url';
 import { emptyDir } from '@astrojs/internal-helpers/fs';
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
 import type { Context } from '@netlify/functions';
-import type { AstroConfig, AstroIntegration, AstroIntegrationLogger, RouteData } from 'astro';
+import type {
+	AstroConfig,
+	AstroIntegration,
+	AstroIntegrationLogger,
+	HookParameters,
+	RouteData,
+} from 'astro';
 import { build } from 'esbuild';
 import { copyDependenciesToFunction } from './lib/nft.js';
 import type { Args } from './ssr-function.js';
@@ -201,6 +207,8 @@ export default function netlifyIntegration(
 	// Secret used to verify that the caller is the astro-generated edge middleware and not a third-party
 	const middlewareSecret = randomUUID();
 
+	let finalBuildOutput: HookParameters<'astro:config:done'>['buildOutput'];
+
 	const TRACE_CACHE = {};
 
 	const ssrBuildDir = () => new URL('./.netlify/build/', rootDir);
@@ -215,7 +223,7 @@ export default function netlifyIntegration(
 		]);
 
 	async function writeRedirects(routes: RouteData[], dir: URL) {
-		const fallback = _config.output === 'static' ? '/.netlify/static' : '/.netlify/functions/ssr';
+		const fallback = finalBuildOutput === 'static' ? '/.netlify/static' : '/.netlify/functions/ssr';
 		const redirects = createRedirectsFromAstroRoutes({
 			config: _config,
 			dir,
@@ -283,7 +291,7 @@ export default function netlifyIntegration(
 			import { createContext, trySerializeLocals } from 'astro/middleware';
 
 			export default async (request, context) => {
-				const ctx = createContext({ 
+				const ctx = createContext({
 					request,
 					params: {}
 				});
@@ -294,7 +302,7 @@ export default function netlifyIntegration(
 					request.headers.set("x-astro-middleware-secret", "${middlewareSecret}");
 					return context.next();
 				};
-			
+
 				return onRequest(ctx, next);
 			}
 
@@ -440,10 +448,12 @@ export default function netlifyIntegration(
 					},
 				});
 			},
-			'astro:config:done': async ({ config, setAdapter, logger }) => {
+			'astro:config:done': async ({ config, setAdapter, logger, buildOutput }) => {
 				rootDir = config.root;
 				_config = config;
 
+				finalBuildOutput = buildOutput;
+
 				await writeNetlifyFrameworkConfig(config, logger);
 
 				const edgeMiddleware = integrationConfig?.edgeMiddleware ?? false;
@@ -477,7 +487,7 @@ export default function netlifyIntegration(
 				await writeRedirects(routes, dir);
 				logger.info('Emitted _redirects');
 
-				if (_config.output !== 'static') {
+				if (finalBuildOutput !== 'static') {
 					let notFoundContent = undefined;
 					try {
 						notFoundContent = await readFile(new URL('./404.html', dir), 'utf8');

diff --git a/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs b/packages/netlify/test/functions/fixtures/redirects/astro.config.mjs
@@ -2,10 +2,10 @@ import netlify from '@astrojs/netlify';
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-  output: 'hybrid',
+  output: 'static',
   adapter: netlify(),
   site: `http://example.com`,
   redirects: {
     '/other': '/',
   },
-});
+});
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.0"
+    "astro": "^5.0.0-alpha.6"
   }
 }
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.0"
+    "astro": "^5.0.0-alpha.6"
   },
   "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.0",
+    "astro": "^5.0.0-alpha.6",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "express": "^4.19.2",