refactor: remove legacyBuild (with TODOs)

packages/astro/src/core/build/index.ts

@@ -12,7 +12,6 @@ import { nodeLogOptions } from '../logger/node.js';
 import { createRouteManifest } from '../routing/index.js';
 import { generateSitemap } from '../render/sitemap.js';
 import { collectPagesData } from './page-data.js';
-import { build as scanBasedBuild } from './scan-based-build.js';
 import { staticBuild } from './static-build.js';
 import { RouteCache } from '../render/route-cache.js';
 import { runHookBuildDone, runHookBuildStart, runHookConfigDone, runHookConfigSetup } from '../../integrations/index.js';
@@ -126,31 +125,17 @@ class AstroBuilder {
  this.timer.buildStart = performance.now();
  info(this.logging, 'build', colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`));
 
- // Use the new faster static based build.
- if (!this.config.buildOptions.legacyBuild) {
- await staticBuild({
- allPages,
- astroConfig: this.config,
- logging: this.logging,
- manifest: this.manifest,
- origin: this.origin,
- pageNames,
- routeCache: this.routeCache,
- viteConfig,
- buildConfig,
- });
- } else {
- await scanBasedBuild({
- allPages,
- astroConfig: this.config,
- logging: this.logging,
- origin: this.origin,
- pageNames,
- routeCache: this.routeCache,
- viteConfig,
- viteServer,
- });
- }
+ await staticBuild({
+ allPages,
+ astroConfig: this.config,
+ logging: this.logging,
+ manifest: this.manifest,
+ origin: this.origin,
+ pageNames,
+ routeCache: this.routeCache,
+ viteConfig,
+ buildConfig,
+ });
 
  // Write any additionally generated assets to disk.
  this.timer.assetsStart = performance.now();

packages/astro/src/core/config.ts

@@ -432,10 +432,9 @@ function resolveFlags(flags: Partial<Flags>): CLIFlags {
  config: typeof flags.config === 'string' ? flags.config : undefined,
  hostname: typeof flags.hostname === 'string' ? flags.hostname : undefined,
  host: typeof flags.host === 'string' || typeof flags.host === 'boolean' ? flags.host : undefined,
- legacyBuild: typeof flags.legacyBuild === 'boolean' ? flags.legacyBuild : undefined,
- experimentalSsr: typeof flags.experimentalSsr === 'boolean' ? flags.experimentalSsr : undefined,
- experimentalIntegrations: typeof flags.experimentalIntegrations === 'boolean' ? flags.experimentalIntegrations : undefined,
- drafts: typeof flags.drafts === 'boolean' ? flags.drafts : undefined,
+ experimentalSsr: typeof flags.experimentalSsr === 'boolean' ? flags.experimentalSsr : false,
+ experimentalIntegrations: typeof flags.experimentalIntegrations === 'boolean' ? flags.experimentalIntegrations : false,
+ drafts: typeof flags.drafts === 'boolean' ? flags.drafts : false,
  };
 }
 
@@ -448,7 +447,6 @@ function mergeCLIFlags(astroConfig: AstroUserConfig, flags: CLIFlags) {
  if (typeof flags.port === 'number') astroConfig.devOptions.port = flags.port;
  if (typeof flags.host === 'string' || typeof flags.host === 'boolean') astroConfig.devOptions.host = flags.host;
  if (typeof flags.hostname === 'string') astroConfig.devOptions.hostname = flags.hostname;
- if (typeof flags.legacyBuild === 'boolean') astroConfig.buildOptions.legacyBuild = flags.legacyBuild;
  if (typeof flags.experimentalSsr === 'boolean') astroConfig.buildOptions.experimentalSsr = flags.experimentalSsr;
  if (typeof flags.experimentalIntegrations === 'boolean') astroConfig.experimentalIntegrations = flags.experimentalIntegrations;
  if (typeof flags.drafts === 'boolean') astroConfig.buildOptions.drafts = flags.drafts;

packages/astro/src/core/render/dev/index.ts

@@ -65,7 +65,8 @@ export async function preload({ astroConfig, filePath, viteServer }: Pick<SSROpt
 /** use Vite to SSR */
 export async function render(renderers: SSRLoadedRenderer[], mod: ComponentInstance, ssrOpts: SSROptions): Promise<RenderResponse> {
  const { astroConfig, filePath, logging, mode, origin, pathname, request, route, routeCache, viteServer } = ssrOpts;
- const legacy = astroConfig.buildOptions.legacyBuild;
+ // TODO: clean up "legacy" flag passed through helper functions
+ const legacy = false;
 
  // Add hoisted script tags
  const scripts = createModuleScriptElementWithSrcSet(!legacy && mod.hasOwnProperty('$$metadata') ? Array.from(mod.$$metadata.hoistedScriptPaths()) : []);
@@ -114,7 +115,8 @@ export async function render(renderers: SSRLoadedRenderer[], mod: ComponentInsta
  }
 
  let content = await coreRender({
- legacyBuild: astroConfig.buildOptions.legacyBuild,
+ // TODO: remove legacyBuild flag
+ legacyBuild: false,
  links,
  logging,
  markdownRender: astroConfig.markdownOptions.render,
@@ -126,22 +128,15 @@ export async function render(renderers: SSRLoadedRenderer[], mod: ComponentInsta
  // TODO: Can we pass the hydration code more directly through Vite, so that we
  // don't need to copy-paste and maintain Vite's import resolution here?
  async resolve(s: string) {
- // The legacy build needs these to remain unresolved so that vite HTML
- // Can do the resolution. Without this condition the build output will be
- // broken in the legacy build. This can be removed once the legacy build is removed.
- if (!astroConfig.buildOptions.legacyBuild) {
- const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
- if (resolvedPath.includes('node_modules/.vite')) {
- return resolvedPath.replace(/.*?node_modules\/\.vite/, '/node_modules/.vite');
- }
- // NOTE: This matches the same logic that Vite uses to add the `/@id/` prefix.
- if (!resolvedUrl.startsWith('.') && !resolvedUrl.startsWith('/')) {
- return '/@id' + prependForwardSlash(resolvedUrl);
- }
- return '/@fs' + prependForwardSlash(resolvedPath);
- } else {
- return s;
+ const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
+ if (resolvedPath.includes('node_modules/.vite')) {
+ return resolvedPath.replace(/.*?node_modules\/\.vite/, '/node_modules/.vite');
+ }
+ // NOTE: This matches the same logic that Vite uses to add the `/@id/` prefix.
+ if (!resolvedUrl.startsWith('.') && !resolvedUrl.startsWith('/')) {
+ return '/@id' + prependForwardSlash(resolvedUrl);
  }
+ return '/@fs' + prependForwardSlash(resolvedPath);
  },
  renderers,
  request,
@@ -196,12 +191,6 @@ export async function render(renderers: SSRLoadedRenderer[], mod: ComponentInsta
  // add injected tags
  let html = injectTags(content.html, tags);
 
- // run transformIndexHtml() in dev to run Vite dev transformations
- if (mode === 'development' && astroConfig.buildOptions.legacyBuild) {
- const relativeURL = filePath.href.replace(astroConfig.root.href, '/');
- html = await viteServer.transformIndexHtml(relativeURL, html, pathname);
- }
-
  // inject <!doctype html> if missing (TODO: is a more robust check needed for comments, etc.?)
  if (!/<!doctype html/i.test(html)) {
  html = '<!DOCTYPE html>\n' + content;

packages/astro/src/runtime/server/index.ts

@@ -467,6 +467,7 @@ export async function renderHead(result: SSRResult): Promise<string> {
  const styles = Array.from(result.styles)
  .filter(uniqueElements)
  .map((style) => {
+ // TODO: clean up legacyBuild from metadata
  const styleChildren = !result._metadata.legacyBuild ? '' : style.children;
  return renderElement('style', {
  children: styleChildren,

packages/astro/src/vite-plugin-astro/compile.ts

@@ -52,25 +52,23 @@ async function compile(config: AstroConfig, filename: string, source: string, vi
  sourcefile: filename,
  sourcemap: 'both',
  internalURL: `/@fs${prependForwardSlash(viteID(new URL('../runtime/server/index.js', import.meta.url)))}`,
- experimentalStaticExtraction: !config.buildOptions.legacyBuild,
- // TODO add experimental flag here
+ // TODO: baseline flag
+ experimentalStaticExtraction: true,
  preprocessStyle: async (value: string, attrs: Record<string, string>) => {
  const lang = `.${attrs?.lang || 'css'}`.toLowerCase();
 
  try {
  // In the static build, grab any @import as CSS dependencies for HMR.
- if (!config.buildOptions.legacyBuild) {
- value.replace(/(?:@import)\s(?:url\()?\s?["\'](.*?)["\']\s?\)?(?:[^;]*);?/gi, (match, spec) => {
- rawCSSDeps.add(spec);
- // If the language is CSS: prevent `@import` inlining to prevent scoping of imports.
- // Otherwise: Sass, etc. need to see imports for variables, so leave in for their compiler to handle.
- if (lang === '.css') {
- return createImportPlaceholder(spec);
- } else {
- return match;
- }
- });
- }
+ value.replace(/(?:@import)\s(?:url\()?\s?["\'](.*?)["\']\s?\)?(?:[^;]*);?/gi, (match, spec) => {
+ rawCSSDeps.add(spec);
+ // If the language is CSS: prevent `@import` inlining to prevent scoping of imports.
+ // Otherwise: Sass, etc. need to see imports for variables, so leave in for their compiler to handle.
+ if (lang === '.css') {
+ return createImportPlaceholder(spec);
+ } else {
+ return match;
+ }
+ });
 
  const result = await transformWithVite({
  value,

scripts/memory/index.js

@@ -18,8 +18,6 @@ let config = await loadConfig({
  cwd: fileURLToPath(projDir),
 });
 
-config.buildOptions.legacyBuild = false;
-
 const server = await dev(config, { logging: { level: 'error' } });
 
 // Prime the server so initial memory is created