diff options
Diffstat (limited to 'packages/integrations')
9 files changed, 8 insertions, 30 deletions
diff --git a/packages/integrations/cloudflare/test/prerender.test.js b/packages/integrations/cloudflare/test/prerender.test.js index 5d3ff9f10..526f8a4ac 100644 --- a/packages/integrations/cloudflare/test/prerender.test.js +++ b/packages/integrations/cloudflare/test/prerender.test.js @@ -38,9 +38,6 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', output: 'hybrid', - experimental: { - hybridOutput: true, - }, }); await fixture.build(); }); diff --git a/packages/integrations/image/src/index.ts b/packages/integrations/image/src/index.ts index b2bc11447..fb6496c0c 100644 --- a/packages/integrations/image/src/index.ts +++ b/packages/integrations/image/src/index.ts @@ -3,7 +3,7 @@ import { ssgBuild } from './build/ssg.js'; import type { ImageService, SSRImageService, TransformOptions } from './loaders/index.js'; import type { LoggerLevel } from './utils/logger.js'; import { joinPaths, prependForwardSlash, propsToFilename } from './utils/paths.js'; -import { isHybridOutput } from './utils/prerender.js'; +import { isServerLikeOutput } from './utils/prerender.js'; import { createPlugin } from './vite-plugin-astro-image.js'; export { getImage } from './lib/get-image.js'; @@ -85,7 +85,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte vite: getViteConfiguration(command === 'dev'), }); - if (command === 'dev' || config.output === 'server' || isHybridOutput(config)) { + if (command === 'dev' || isServerLikeOutput(config)) { injectRoute({ pattern: ROUTE_PATTERN, entryPoint: '@astrojs/image/endpoint', diff --git a/packages/integrations/image/src/utils/prerender.ts b/packages/integrations/image/src/utils/prerender.ts index 9265c80bf..f69f3b5d4 100644 --- a/packages/integrations/image/src/utils/prerender.ts +++ b/packages/integrations/image/src/utils/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/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs b/packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs index c579d74ef..d049599e5 100644 --- a/packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs +++ b/packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs @@ -6,13 +6,6 @@ const isHybridMode = process.env.PRERENDER === "false"; /** @type {import('astro').AstroConfig} */ const partialConfig = { output: isHybridMode ? "hybrid" : "server", - ...(isHybridMode - ? ({ - experimental: { - hybridOutput: true, - }, - }) - : ({})), }; export default defineConfig({ diff --git a/packages/integrations/netlify/test/functions/prerender.test.js b/packages/integrations/netlify/test/functions/prerender.test.js index 9718df083..a571dd76e 100644 --- a/packages/integrations/netlify/test/functions/prerender.test.js +++ b/packages/integrations/netlify/test/functions/prerender.test.js @@ -46,9 +46,6 @@ describe('Mixed Hybrid rendering with SSR', () => { fixture = await loadFixture({ root: new URL('./fixtures/prerender/', import.meta.url).toString(), output: 'hybrid', - experimental: { - hybridOutput: true, - }, adapter: netlifyAdapter({ dist: new URL('./fixtures/prerender/dist/', import.meta.url), }), diff --git a/packages/integrations/node/test/prerender.test.js b/packages/integrations/node/test/prerender.test.js index 751ed2ae7..4b5522a31 100644 --- a/packages/integrations/node/test/prerender.test.js +++ b/packages/integrations/node/test/prerender.test.js @@ -140,9 +140,6 @@ describe('Hybrid rendering', () => { base: '/some-base', root: './fixtures/prerender/', output: 'hybrid', - experimental: { - hybridOutput: true, - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); @@ -199,9 +196,6 @@ describe('Hybrid rendering', () => { fixture = await loadFixture({ root: './fixtures/prerender/', output: 'hybrid', - experimental: { - hybridOutput: true, - }, adapter: nodejs({ mode: 'standalone' }), }); await fixture.build(); diff --git a/packages/integrations/vercel/src/lib/prerender.ts b/packages/integrations/vercel/src/lib/prerender.ts index 9265c80bf..f69f3b5d4 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 0b3579cdd..ccbf26e57 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'; @@ -55,7 +55,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 94d9081f4..18b165340 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, - }, }); }); |