From b24607069ed1b305b47ca25171e682f7c71603eb Mon Sep 17 00:00:00 2001 From: chlorine Date: Mon, 24 Apr 2023 13:25:03 +0800 Subject: [PATCH] chore: cleanup code (#6897) --- packages/astro/src/core/build/generate.ts | 4 ++-- packages/astro/src/core/build/plugins/plugin-ssr.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index e1924c285b..812ae673fa 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -89,7 +89,7 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn const serverEntry = opts.buildConfig.serverEntry; const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir); - if (opts.settings.config.output === 'server' && !hasPrerenderedPages(internals)) return; + if (ssr && !hasPrerenderedPages(internals)) return; const verb = ssr ? 'prerendering' : 'generating'; info(opts.logging, null, `\n${bgGreen(black(` ${verb} static routes `))}`); @@ -98,7 +98,7 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn const ssrEntry = await import(ssrEntryURL.toString()); const builtPaths = new Set(); - if (opts.settings.config.output === 'server') { + if (ssr) { for (const pageData of eachPrerenderedPageData(internals)) { await generatePage(opts, internals, pageData, ssrEntry, builtPaths); } diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts index 837c72b721..1133fc8e04 100644 --- a/packages/astro/src/core/build/plugins/plugin-ssr.ts +++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts @@ -28,7 +28,7 @@ export function vitePluginSSR(internals: BuildInternals, adapter: AstroAdapter): options(opts) { return addRollupInput(opts, [virtualModuleId]); }, - resolveId(id, parent) { + resolveId(id) { if (id === virtualModuleId) { return resolvedVirtualModuleId; }