From 2683b8e56add55881f2185d124f5cfebc41c6230 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Mon, 5 Jun 2023 13:19:15 -0500
Subject: [PATCH] Unflag hybrid output (#7260)

* feat(hybrid): unflag hybrid output

* chore: cleanup rebase errors
---
 packages/integrations/vercel/src/lib/prerender.ts             | 4 ++--
 packages/integrations/vercel/src/static/adapter.ts            | 4 ++--
 .../integrations/vercel/test/serverless-prerender.test.js     | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/integrations/vercel/src/lib/prerender.ts b/packages/integrations/vercel/src/lib/prerender.ts
index 9265c80bf0..f69f3b5d47 100644
--- a/packages/integrations/vercel/src/lib/prerender.ts
+++ b/packages/integrations/vercel/src/lib/prerender.ts
@@ -1,5 +1,5 @@
 import type { AstroConfig } from 'astro';
 
-export function isHybridOutput(config: AstroConfig) {
-	return config.experimental.hybridOutput && config.output === 'hybrid';
+export function isServerLikeOutput(config: AstroConfig) {
+	return config.output === 'server' || config.output === 'hybrid';
 }
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
index e0cc14322f..f710356aa7 100644
--- a/packages/integrations/vercel/src/static/adapter.ts
+++ b/packages/integrations/vercel/src/static/adapter.ts
@@ -8,7 +8,7 @@ import {
 } from '../image/shared.js';
 import { exposeEnv } from '../lib/env.js';
 import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js';
-import { isHybridOutput } from '../lib/prerender.js';
+import { isServerLikeOutput } from '../lib/prerender.js';
 import { getRedirects } from '../lib/redirects.js';
 
 const PACKAGE_NAME = '@astrojs/vercel/static';
@@ -56,7 +56,7 @@ export default function vercelStatic({
 				setAdapter(getAdapter());
 				_config = config;
 
-				if (config.output === 'server' || isHybridOutput(config)) {
+				if (isServerLikeOutput(config)) {
 					throw new Error(`${PACKAGE_NAME} should be used with output: 'static'`);
 				}
 			},
diff --git a/packages/integrations/vercel/test/serverless-prerender.test.js b/packages/integrations/vercel/test/serverless-prerender.test.js
index 94d9081f41..18b1653404 100644
--- a/packages/integrations/vercel/test/serverless-prerender.test.js
+++ b/packages/integrations/vercel/test/serverless-prerender.test.js
@@ -27,9 +27,6 @@ describe('Serverless hybrid rendering', () => {
 		fixture = await loadFixture({
 			root: './fixtures/serverless-prerender/',
 			output: 'hybrid',
-			experimental: {
-				hybridOutput: true,
-			},
 		});
 	});