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

wip: revert to unresolved. Issue reported!

Browse source
This commit is contained in:
bholmesdev 2022-06-23 17:50:11 -04:00
parent fa373a71fe
commit 3d52d8c2ac
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/astro/src/core/build/static-build.ts
View file

@ -67,22 +67,18 @@ export async function staticBuild(opts: StaticBuildOptions) {
const ssrResult = (await ssrBuild(opts, internals, pageInput)) as RollupOutput; const ssrResult = (await ssrBuild(opts, internals, pageInput)) as RollupOutput;
info(opts.logging, 'build', dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`)); info(opts.logging, 'build', dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`));
const rendererClientEntrypoints = opts.astroConfig._ctx.renderers.map((r) => r.clientEntrypoint).filter(a => typeof a === 'string') as string[]
const clientInput = new Set([ const clientInput = new Set([
...internals.discoveredHydratedComponents, ...internals.discoveredHydratedComponents,
...internals.discoveredClientOnlyComponents, ...internals.discoveredClientOnlyComponents,
...opts.astroConfig._ctx.renderers.map((r) => r.clientEntrypoint).filter(a => typeof a === 'string') as string[], ...rendererClientEntrypoints,
...internals.discoveredScripts, ...internals.discoveredScripts,
]); ]);
// Resolve any npm package paths with resolveDependency
// before passing to Vite input
const resolvedClientInput = new Set([...clientInput]
.map(input => new URL(resolveDependency(input, opts.astroConfig.root)).pathname)
);
// Run client build first, so the assets can be fed into the SSR rendered version. // Run client build first, so the assets can be fed into the SSR rendered version.
timer.clientBuild = performance.now(); timer.clientBuild = performance.now();
await clientBuild(opts, internals, resolvedClientInput); await clientBuild(opts, internals, clientInput);
timer.generate = performance.now(); timer.generate = performance.now();
if (opts.buildConfig.staticMode) { if (opts.buildConfig.staticMode) {
@ -173,7 +169,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
async function clientBuild( async function clientBuild(
opts: StaticBuildOptions, opts: StaticBuildOptions,
internals: BuildInternals, internals: BuildInternals,
input: Set<string> input: Set<string>,
) { ) {
const { astroConfig, viteConfig } = opts; const { astroConfig, viteConfig } = opts;
const timer = performance.now(); const timer = performance.now();