refactor: dist -> outDir

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

@@ -5,7 +5,7 @@ import { appendForwardSlash } from '../../core/path.js';
 const STATUS_CODE_PAGES = new Set(['/404', '/500']);
 
 function getOutRoot(astroConfig: AstroConfig): URL {
- return new URL('./', astroConfig.dist);
+ return new URL('./', astroConfig.outDir);
 }
 
 export function getOutFolder(astroConfig: AstroConfig, pathname: string, routeType: RouteType): URL {

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

@@ -73,7 +73,7 @@ export async function generatePages(result: RollupOutput, opts: StaticBuildOptio
 
  const ssr = isBuildingToSSR(opts.astroConfig);
  const serverEntry = opts.buildConfig.serverEntry;
- const outFolder = ssr ? opts.buildConfig.server : opts.astroConfig.dist;
+ const outFolder = ssr ? opts.buildConfig.server : opts.astroConfig.outDir;
  const ssrEntryURL = new URL('./' + serverEntry + `?time=${Date.now()}`, outFolder);
  const ssrEntry = await import(ssrEntryURL.toString());
 

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

@@ -85,8 +85,8 @@ class AstroBuilder {
  private async build({ viteConfig, viteServer }: { viteConfig: ViteConfigWithSSR; viteServer: vite.ViteDevServer }) {
  const { origin } = this;
  const buildConfig: BuildConfig = {
- client: new URL('./client/', this.config.dist),
- server: new URL('./server/', this.config.dist),
+ client: new URL('./client/', this.config.outDir),
+ server: new URL('./server/', this.config.outDir),
  serverEntry: 'entry.mjs',
  staticMode: undefined,
  };
@@ -171,7 +171,7 @@ class AstroBuilder {
  pageNames.map((pageName) => new URL(pageName, this.config.site).href),
  sitemapFilter
  );
- const sitemapPath = new URL('./sitemap.xml', this.config.dist);
+ const sitemapPath = new URL('./sitemap.xml', this.config.outDir);
  await fs.promises.mkdir(new URL('./', sitemapPath), { recursive: true });
  await fs.promises.writeFile(sitemapPath, sitemap, 'utf8');
  debug('build', timerMessage('Sitemap built', this.timer.sitemapStart));

packages/astro/src/core/build/page-data.ts

@@ -106,7 +106,7 @@ export async function collectPagesData(opts: CollectPagesDataOptions): Promise<C
  if (rssResult.xml) {
  const { url, content } = rssResult.xml;
  if (content) {
- const rssFile = new URL(url.replace(/^\/?/, './'), astroConfig.dist);
+ const rssFile = new URL(url.replace(/^\/?/, './'), astroConfig.outDir);
  if (assets[fileURLToPath(rssFile)]) {
  throw new Error(`[getStaticPaths] RSS feed ${url} already exists.\nUse \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.component})`);
  }
@@ -115,7 +115,7 @@ export async function collectPagesData(opts: CollectPagesDataOptions): Promise<C
  }
  if (rssResult.xsl?.content) {
  const { url, content } = rssResult.xsl;
- const stylesheetFile = new URL(url.replace(/^\/?/, './'), astroConfig.dist);
+ const stylesheetFile = new URL(url.replace(/^\/?/, './'), astroConfig.outDir);
  if (assets[fileURLToPath(stylesheetFile)]) {
  throw new Error(
  `[getStaticPaths] RSS feed stylesheet ${url} already exists.\nUse \`rss(data, {stylesheet: '...'})\` to choose a unique, custom URL. (${route.component})`

packages/astro/src/core/build/scan-based-build.ts

@@ -53,7 +53,7 @@ export async function build(opts: ScanBasedBuildOptions): Promise<RollupOutput |
  build: {
  emptyOutDir: true,
  minify: 'esbuild', // significantly faster than "terser" but may produce slightly-bigger bundles
- outDir: fileURLToPath(astroConfig.dist),
+ outDir: fileURLToPath(astroConfig.outDir),
  rollupOptions: {
  // The `input` will be populated in the build rollup plugin.
  input: [],

packages/astro/src/core/build/static-build.ts

@@ -87,7 +87,7 @@ export async function staticBuild(opts: StaticBuildOptions) {
  // Empty out the dist folder, if needed. Vite has a config for doing this
  // but because we are running 2 vite builds in parallel, that would cause a race
  // condition, so we are doing it ourselves
- emptyDir(astroConfig.dist, new Set('.git'));
+ emptyDir(astroConfig.outDir, new Set('.git'));
 
  timer.clientBuild = performance.now();
  // Run client build first, so the assets can be fed into the SSR rendered version.
@@ -112,7 +112,7 @@ export async function staticBuild(opts: StaticBuildOptions) {
 async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, input: Set<string>) {
  const { astroConfig, viteConfig } = opts;
  const ssr = isBuildingToSSR(astroConfig);
- const out = ssr ? opts.buildConfig.server : astroConfig.dist;
+ const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
 
  const viteBuildConfig = {
  logLevel: 'error',
@@ -170,7 +170,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals,
  const { astroConfig, viteConfig } = opts;
  const timer = performance.now();
  const ssr = isBuildingToSSR(astroConfig);
- const out = ssr ? opts.buildConfig.client : astroConfig.dist;
+ const out = ssr ? opts.buildConfig.client : astroConfig.outDir;
 
  // Nothing to do if there is no client-side JS.
  if (!input.size) {
@@ -184,7 +184,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals,
 
  // TODO: use vite.mergeConfig() here?
  info(opts.logging, null, `\n${bgGreen(black(' building client '))}`);
-
+ 
  const viteBuildConfig = {
  logLevel: 'info',
  mode: 'production',
@@ -231,11 +231,11 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals,
 async function cleanSsrOutput(opts: StaticBuildOptions) {
  // The SSR output is all .mjs files, the client output is not.
  const files = await glob('**/*.mjs', {
- cwd: fileURLToPath(opts.astroConfig.dist),
+ cwd: fileURLToPath(opts.astroConfig.outDir),
  });
  await Promise.all(
  files.map(async (filename) => {
- const url = new URL(filename, opts.astroConfig.dist);
+ const url = new URL(filename, opts.astroConfig.outDir);
  await fs.promises.rm(url);
  })
  );

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

@@ -30,7 +30,7 @@ export default async function preview(config: AstroConfig, { logging }: PreviewO
  const trailingSlash = config.devOptions.trailingSlash;
  /** Base request URL. */
  let baseURL = new URL(config.site || '/', defaultOrigin);
- const staticFileServer = sirv(fileURLToPath(config.dist), {
+ const staticFileServer = sirv(fileURLToPath(config.outDir), {
  dev: true,
  etag: true,
  maxAge: 0,

packages/astro/src/integrations/index.ts

@@ -103,7 +103,7 @@ export async function runHookBuildSetup({ config, vite, target }: { config: Astr
 export async function runHookBuildDone({ config, pages, routes }: { config: AstroConfig; pages: string[]; routes: RouteData[] }) {
  for (const integration of config.integrations) {
  if (integration.hooks['astro:build:done']) {
- await integration.hooks['astro:build:done']({ pages: pages.map((p) => ({ pathname: p })), dir: config.dist, routes });
+ await integration.hooks['astro:build:done']({ pages: pages.map((p) => ({ pathname: p })), dir: config.outDir, routes });
  }
  }
 }

packages/astro/test/test-utils.js

@@ -90,11 +90,11 @@ export async function loadFixture(inlineConfig) {
  const previewServer = await preview(config, { logging, ...opts });
  return previewServer;
  },
- readFile: (filePath) => fs.promises.readFile(new URL(filePath.replace(/^\//, ''), config.dist), 'utf8'),
- readdir: (fp) => fs.promises.readdir(new URL(fp.replace(/^\//, ''), config.dist)),
- clean: () => fs.promises.rm(config.dist, { maxRetries: 10, recursive: true, force: true }),
+ readFile: (filePath) => fs.promises.readFile(new URL(filePath.replace(/^\//, ''), config.outDir), 'utf8'),
+ readdir: (fp) => fs.promises.readdir(new URL(fp.replace(/^\//, ''), config.outDir)),
+ clean: () => fs.promises.rm(config.outDir, { maxRetries: 10, recursive: true, force: true }),
  loadTestAdapterApp: async () => {
- const url = new URL('./server/entry.mjs', config.dist);
+ const url = new URL('./server/entry.mjs', config.outDir);
  const { createApp } = await import(url);
  return createApp();
  },

packages/integrations/netlify/src/index.ts

@@ -22,9 +22,9 @@ function netlifyFunctions({ dist }: NetlifyFunctionsOptions = {}): AstroIntegrat
  hooks: {
  'astro:config:setup': ({ config }) => {
  if (dist) {
- config.dist = dist;
+ config.outDir = dist;
  } else {
- config.dist = new URL('./netlify/', config.root);
+ config.outDir = new URL('./netlify/', config.root);
  }
  },
  'astro:config:done': ({ config, setAdapter }) => {
@@ -33,8 +33,8 @@ function netlifyFunctions({ dist }: NetlifyFunctionsOptions = {}): AstroIntegrat
  },
  'astro:build:start': async ({ buildConfig }) => {
  entryFile = buildConfig.serverEntry.replace(/\.m?js/, '');
- buildConfig.client = _config.dist;
- buildConfig.server = new URL('./functions/', _config.dist);
+ buildConfig.client = _config.outDir;
+ buildConfig.server = new URL('./functions/', _config.outDir);
  },
  'astro:build:done': async ({ routes, dir }) => {
  const _redirectsURL = new URL('./_redirects', dir);

packages/integrations/partytown/src/index.ts

@@ -26,7 +26,7 @@ export default function createPlugin(): AstroIntegration {
  server.middlewares.use(sirv(partytownLibDirectory, { mount: '/~partytown', dev: true, etag: true, extensions: [] }));
  },
  'astro:build:done': async () => {
- await copyLibFiles(fileURLToPath(new URL('~partytown', config.dist)), { debugDir: false });
+ await copyLibFiles(fileURLToPath(new URL('~partytown', config.outDir)), { debugDir: false });
  },
  },
  };