michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into add-Minification

Browse source
This commit is contained in:
wulinsheng123 2023-04-25 10:12:17 +08:00 • committed by GitHub
commit 0c58f5b1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
packages/astro/src/core/build
generate.ts
plugins
plugin-ssr.ts

4
packages/astro/src/core/build/generate.ts
View file

@ -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);
}

2
packages/astro/src/core/build/plugins/plugin-ssr.ts
View file

@ -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;
}