From 3d52d8c2acded7beb4bf019ee93d91d46019aa8c Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Thu, 23 Jun 2022 17:50:11 -0400 Subject: [PATCH] wip: revert to unresolved. Issue reported! --- packages/astro/src/core/build/static-build.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 98fd669c4..8680438f8 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -67,22 +67,18 @@ export async function staticBuild(opts: StaticBuildOptions) { const ssrResult = (await ssrBuild(opts, internals, pageInput)) as RollupOutput; 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([ ...internals.discoveredHydratedComponents, ...internals.discoveredClientOnlyComponents, - ...opts.astroConfig._ctx.renderers.map((r) => r.clientEntrypoint).filter(a => typeof a === 'string') as string[], + ...rendererClientEntrypoints, ...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. timer.clientBuild = performance.now(); - await clientBuild(opts, internals, resolvedClientInput); + await clientBuild(opts, internals, clientInput); timer.generate = performance.now(); if (opts.buildConfig.staticMode) { @@ -173,7 +169,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp async function clientBuild( opts: StaticBuildOptions, internals: BuildInternals, - input: Set + input: Set, ) { const { astroConfig, viteConfig } = opts; const timer = performance.now();