summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chlorine <nicksonlvqq@gmail.com> 2023-04-24 13:25:03 +0800
committerGravatar GitHub <noreply@github.com> 2023-04-24 13:25:03 +0800
commitb24607069ed1b305b47ca25171e682f7c71603eb (patch)
treeb803f6143d06729031256801e3f69e3569b04c10
parentb6154d2d57bfb77767a3ccf9e91c1ae4051c81bc (diff)
downloadastro-b24607069ed1b305b47ca25171e682f7c71603eb.tar.gz
astro-b24607069ed1b305b47ca25171e682f7c71603eb.tar.zst
astro-b24607069ed1b305b47ca25171e682f7c71603eb.zip
chore: cleanup code (#6897)
Diffstat (limited to '')
-rw-r--r--packages/astro/src/core/build/generate.ts4
-rw-r--r--packages/astro/src/core/build/plugins/plugin-ssr.ts2
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 e1924c285..812ae673f 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<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
index 837c72b72..1133fc8e0 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;
}