diff options
Diffstat (limited to 'packages/integrations/image')
| -rw-r--r-- | packages/integrations/image/src/integration.ts | 10 | ||||
| -rw-r--r-- | packages/integrations/image/test/image-ssr.test.js | 8 | ||||
| -rw-r--r-- | packages/integrations/image/test/picture-ssr.test.js | 8 |
3 files changed, 9 insertions, 17 deletions
diff --git a/packages/integrations/image/src/integration.ts b/packages/integrations/image/src/integration.ts index afbeb00a9..725276d03 100644 --- a/packages/integrations/image/src/integration.ts +++ b/packages/integrations/image/src/integration.ts @@ -16,7 +16,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte const staticImages = new Map<string, Map<string, TransformOptions>>(); let _config: AstroConfig; - let mode: 'ssr' | 'ssg'; + let output: 'server' | 'static'; function getViteConfiguration() { return { @@ -37,11 +37,11 @@ export default function integration(options: IntegrationOptions = {}): AstroInte _config = config; // Always treat `astro dev` as SSR mode, even without an adapter - mode = command === 'dev' || config.adapter ? 'ssr' : 'ssg'; + output = command === 'dev' ? 'server' : config.output; updateConfig({ vite: getViteConfiguration() }); - if (mode === 'ssr') { + if (output === 'server') { injectRoute({ pattern: ROUTE_PATTERN, entryPoint: @@ -67,7 +67,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte // Helpers for building static images should only be available for SSG globalThis.astroImage = - mode === 'ssg' + output === 'static' ? { addStaticImage, filenameFormat, @@ -75,7 +75,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte : {}; }, 'astro:build:done': async ({ dir }) => { - if (mode === 'ssr') { + if (output === 'server') { // for SSR builds, copy all image files from src to dist // to make sure they are available for use in production await ssrBuild({ srcDir: _config.srcDir, outDir: dir }); diff --git a/packages/integrations/image/test/image-ssr.test.js b/packages/integrations/image/test/image-ssr.test.js index 0804f8068..37274c929 100644 --- a/packages/integrations/image/test/image-ssr.test.js +++ b/packages/integrations/image/test/image-ssr.test.js @@ -19,9 +19,7 @@ describe('SSR images - build', function () { fixture = await loadFixture({ root: './fixtures/basic-image/', adapter: testAdapter({ streaming: false }), - experimental: { - ssr: true, - }, + output: 'server', }); await fixture.build(); }); @@ -139,9 +137,7 @@ describe('SSR images - dev', function () { fixture = await loadFixture({ root: './fixtures/basic-image/', adapter: testAdapter(), - experimental: { - ssr: true, - }, + output: 'server', }); devServer = await fixture.startDevServer(); diff --git a/packages/integrations/image/test/picture-ssr.test.js b/packages/integrations/image/test/picture-ssr.test.js index 080cdbd2b..ebfbdf749 100644 --- a/packages/integrations/image/test/picture-ssr.test.js +++ b/packages/integrations/image/test/picture-ssr.test.js @@ -19,9 +19,7 @@ describe('SSR pictures - build', function () { fixture = await loadFixture({ root: './fixtures/basic-picture/', adapter: testAdapter(), - experimental: { - ssr: true, - }, + output: 'server', }); await fixture.build(); }); @@ -187,9 +185,7 @@ describe('SSR images - dev', function () { fixture = await loadFixture({ root: './fixtures/basic-picture/', adapter: testAdapter(), - experimental: { - ssr: true, - }, + output: 'server', }); devServer = await fixture.startDevServer(); |