chore: cleanup code (withastro#6897)

ghostdevv · Apr 24, 2023 · b246070 · b246070
1 parent b6154d2
commit b246070
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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<string>();
 
- 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
@@ -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;
  }