Add the output option

.changeset/famous-coins-destroy.md

@@ -0,0 +1,36 @@
+---
+'astro': minor
+'@astrojs/cloudflare': minor
+'@astrojs/deno': minor
+'@astrojs/image': minor
+'@astrojs/netlify': minor
+'@astrojs/node': minor
+'@astrojs/sitemap': minor
+'@astrojs/vercel': minor
+---
+
+New `mode` configuration option
+
+This change introduces a new configuration option `mode`. Mode can be either
+
+* `static` - The default, when building a static site.
+* `server` - When building an app to be deployed for SSR (server-side rendering).
+
+The default, `static`, can be omitted from your config file.
+
+If you want to use SSR you now need to provide `mode: 'server'` *in addition* to an adapter.
+
+The `adapter` configuration has been renamed to `deploy`. In the future adapters will support configuring a static site as well!
+
+For SSR make this change:
+
+```diff
+import { defineConfig } from 'astro/config';
+import netlify from '@astrojs/netlify/functions';
+
+export default defineConfig({
+-  adapter: netlify(),
++  deploy: netlify(),
++  mode: 'server',
+});
+```

.changeset/lucky-apes-yell.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Update "astro add" output to remove confusing multi-select prompt.

.changeset/perfect-drinks-fold.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Update the help output to improve formatting

examples/ssr/astro.config.mjs

@@ -4,6 +4,7 @@ import node from '@astrojs/node';
 
 // https://astro.build/config
 export default defineConfig({
-	adapter: node(),
+	mode: 'server',
+	deploy: node(),
 	integrations: [svelte()],
 });

packages/astro/package.json

@@ -42,6 +42,7 @@
     "./package.json": "./package.json",
     "./runtime/*": "./dist/runtime/*",
     "./server/*": "./dist/runtime/server/*",
+    "./adapter-node/server.js": "./dist/adapter-node/server.js",
     "./vite-plugin-astro": "./dist/vite-plugin-astro/index.js",
     "./vite-plugin-astro/*": "./dist/vite-plugin-astro/*",
     "./vite-plugin-astro-postprocess": "./dist/vite-plugin-astro-postprocess/index.js",

packages/astro/src/@types/astro.ts

@@ -76,7 +76,6 @@ export interface BuildConfig {
 	client: URL;
 	server: URL;
 	serverEntry: string;
-	staticMode: boolean | undefined;
 }
 
 /**
@@ -622,7 +621,7 @@ export interface AstroUserConfig {
 	/**
 	 * @docs
 	 * @kind heading
-	 * @name Adapter
+	 * @name Deploy
 	 * @description
 	 *
 	 * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssredge), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
@@ -633,11 +632,15 @@ export interface AstroUserConfig {
 	 * import netlify from '@astrojs/netlify/functions';
 	 * {
 	 *   // Example: Build for Netlify serverless deployment
-	 * 	 adapter: netlify(),
+	 * 	 deploy: netlify(),
 	 * }
 	 * ```
 	 */
-	adapter?: AstroIntegration;
+	deploy?: AstroIntegration;
+
+	// TODO: Document
+	mode?: 'static' | 'server';
+
 
 	/**
 	 * @docs
@@ -750,7 +753,7 @@ export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
 	// This is a more detailed type than zod validation gives us.
 	// TypeScript still confirms zod validation matches this type.
 	integrations: AstroIntegration[];
-	adapter?: AstroIntegration;
+
 	// Private:
 	// We have a need to pass context based on configured state,
 	// that is different from the user-exposed configuration.

packages/astro/src/cli/index.ts

@@ -132,7 +132,7 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 		}
 	}
 
-	let { astroConfig, userConfig, userConfigPath } = await openConfig({ cwd: root, flags, cmd });
+	let { astroConfig, userConfig, userConfigPath } = await openConfig({ cwd: root, flags, cmd, logging });
 	telemetry.record(event.eventCliSession(cmd, userConfig, flags));
 
 	// Common CLI Commands:
@@ -154,7 +154,7 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 				watcher.on('add', async function restartServerOnNewConfigFile(addedFile: string) {
 					// if there was not a config before, attempt to resolve
 					if (!userConfigPath && addedFile.includes('astro.config')) {
-						const addedConfig = await openConfig({ cwd: root, flags, cmd });
+						const addedConfig = await openConfig({ cwd: root, flags, cmd, logging });
 						if (addedConfig.userConfigPath) {
 							info(logging, 'astro', 'Astro config detected. Restarting server...');
 							astroConfig = addedConfig.astroConfig;

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

@@ -66,15 +66,21 @@ export default async function add(names: string[], { cwd, flags, logging, teleme
 					['--yes', 'Accept all prompts.'],
 					['--help', 'Show this help message.'],
 				],
-				'Example: Add a UI Framework': [
+				'Recommended: UI Frameworks': [
 					['react', 'astro add react'],
 					['preact', 'astro add preact'],
 					['vue', 'astro add vue'],
 					['svelte', 'astro add svelte'],
 					['solid-js', 'astro add solid-js'],
 					['lit', 'astro add lit'],
 				],
-				'Example: Add an Integration': [
+				'Recommended: Hosting': [
+					['netlify', 'astro add netlify'],
+					['vercel', 'astro add vercel'],
+					['cloudflare', 'astro add cloudflare'],
+					['deno', 'astro add deno'],
+				],
+				'Recommended: Integrations': [
 					['tailwind', 'astro add tailwind'],
 					['partytown', 'astro add partytown'],
 					['sitemap', 'astro add sitemap'],
@@ -85,9 +91,7 @@ export default async function add(names: string[], { cwd, flags, logging, teleme
 					['deno', 'astro add deno'],
 				],
 			},
-			description: `Check out the full integration catalog: ${cyan(
-				'https://astro.build/integrations'
-			)}`,
+			description: `For more integrations, check out: ${cyan('https://astro.build/integrations')}`,
 		});
 		return;
 	}

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

@@ -18,7 +18,7 @@ import { debug, info } from '../logger/core.js';
 import { render } from '../render/core.js';
 import { createLinkStylesheetElementSet, createModuleScriptsSet } from '../render/ssr-element.js';
 import { createRequest } from '../request.js';
-import { getOutputFilename, isBuildingToSSR } from '../util.js';
+import { getOutputFilename } from '../util.js';
 import { getOutFile, getOutFolder } from './common.js';
 import { eachPageData, getPageDataByComponent } from './internal.js';
 import type { PageBuildData, SingleFileBuiltModule, StaticBuildOptions } from './types';
@@ -97,7 +97,7 @@ export async function generatePages(
 	const timer = performance.now();
 	info(opts.logging, null, `\n${bgGreen(black(' generating static routes '))}`);
 
-	const ssr = isBuildingToSSR(opts.astroConfig);
+	const ssr = opts.astroConfig.mode === 'server';
 	const serverEntry = opts.buildConfig.serverEntry;
 	const outFolder = ssr ? opts.buildConfig.server : opts.astroConfig.outDir;
 	const ssrEntryURL = new URL('./' + serverEntry + `?time=${Date.now()}`, outFolder);
@@ -207,7 +207,7 @@ async function generatePath(
 		}
 	}
 
-	const ssr = isBuildingToSSR(opts.astroConfig);
+	const ssr = opts.astroConfig.mode === 'server';
 	const url = new URL(opts.astroConfig.base + removeLeadingForwardSlash(pathname), origin);
 	const options: RenderOptions = {
 		adapterName: undefined,

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

@@ -1,5 +1,5 @@
 import type { AstroTelemetry } from '@astrojs/telemetry';
-import type { AstroConfig, BuildConfig, ManifestData, RuntimeMode } from '../../@types/astro';
+import type { AstroAdapter, AstroConfig, BuildConfig, ManifestData, RuntimeMode } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 
 import fs from 'fs';
@@ -18,7 +18,7 @@ import { debug, info, levels, timerMessage } from '../logger/core.js';
 import { apply as applyPolyfill } from '../polyfill.js';
 import { RouteCache } from '../render/route-cache.js';
 import { createRouteManifest } from '../routing/index.js';
-import { createSafeError, isBuildingToSSR } from '../util.js';
+import { createSafeError } from '../util.js';
 import { collectPagesData } from './page-data.js';
 import { staticBuild } from './static-build.js';
 import { getTimeStat } from './util.js';
@@ -98,11 +98,13 @@ class AstroBuilder {
 			client: new URL('./client/', this.config.outDir),
 			server: new URL('./server/', this.config.outDir),
 			serverEntry: 'entry.mjs',
-			staticMode: undefined,
 		};
 		await runHookBuildStart({ config: this.config, buildConfig });
 
-		info(this.logging, 'build', 'Collecting build information...');
+		const getPrettyDeployTarget = (adapter: AstroAdapter | undefined) => adapter?.name || 'unknown';
+		info(this.logging, 'build', `build target: ${colors.green(this.config.mode)}`);
+		info(this.logging, 'build', `deploy target: ${colors.green(getPrettyDeployTarget(this.config._ctx.adapter))}`);
+		info(this.logging, 'build', 'Collecting build info...');
 		this.timer.loadStart = performance.now();
 		const { assets, allPages } = await collectPagesData({
 			astroConfig: this.config,
@@ -111,7 +113,7 @@ class AstroBuilder {
 			origin,
 			routeCache: this.routeCache,
 			viteServer,
-			ssr: isBuildingToSSR(this.config),
+			ssr: this.config.mode === 'server',
 		});
 
 		debug('build', timerMessage('All pages loaded', this.timer.loadStart));
@@ -168,12 +170,11 @@ class AstroBuilder {
 		});
 
 		if (this.logging.level && levels[this.logging.level] <= levels['info']) {
-			const buildMode = isBuildingToSSR(this.config) ? 'ssr' : 'static';
 			await this.printStats({
 				logging: this.logging,
 				timeStart: this.timer.init,
 				pageCount: pageNames.length,
-				buildMode,
+				buildMode: this.config.mode,
 			});
 		}
 	}
@@ -198,7 +199,7 @@ class AstroBuilder {
 		logging: LogOptions;
 		timeStart: number;
 		pageCount: number;
-		buildMode: 'static' | 'ssr';
+		buildMode: 'static' | 'server';
 	}) {
 		const total = getTimeStat(timeStart, performance.now());
 

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

@@ -10,7 +10,6 @@ import { debug } from '../logger/core.js';
 import { removeTrailingForwardSlash } from '../path.js';
 import { callGetStaticPaths, RouteCache, RouteCacheEntry } from '../render/route-cache.js';
 import { matchRoute } from '../routing/match.js';
-import { isBuildingToSSR } from '../util.js';
 
 export interface CollectPagesDataOptions {
 	astroConfig: AstroConfig;
@@ -36,9 +35,6 @@ export async function collectPagesData(
 	const assets: Record<string, string> = {};
 	const allPages: AllPagesData = {};
 	const builtPaths = new Set<string>();
-
-	const buildMode = isBuildingToSSR(astroConfig) ? 'ssr' : 'static';
-
 	const dataCollectionLogTimeout = setInterval(() => {
 		info(opts.logging, 'build', 'The data collection step may take longer for larger projects...');
 		clearInterval(dataCollectionLogTimeout);
@@ -72,7 +68,7 @@ export async function collectPagesData(
 			};
 
 			clearInterval(routeCollectionLogTimeout);
-			if (buildMode === 'static') {
+			if (astroConfig.mode === 'static') {
 				const html = `${route.pathname}`.replace(/\/?$/, '/index.html');
 				debug(
 					'build',

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

@@ -6,12 +6,11 @@ import { fileURLToPath } from 'url';
 import * as vite from 'vite';
 import { BuildInternals, createBuildInternals } from '../../core/build/internal.js';
 import { prependForwardSlash } from '../../core/path.js';
-import { emptyDir, removeDir } from '../../core/util.js';
+import { emptyDir, removeDir, isModeServerWithNoAdapter } from '../../core/util.js';
 import { runHookBuildSetup } from '../../integrations/index.js';
 import { rollupPluginAstroBuildCSS } from '../../vite-plugin-build-css/index.js';
 import type { ViteConfigWithSSR } from '../create-vite';
 import { info } from '../logger/core.js';
-import { isBuildingToSSR } from '../util.js';
 import { generatePages } from './generate.js';
 import { trackPageData } from './internal.js';
 import type { PageBuildData, StaticBuildOptions } from './types';
@@ -25,6 +24,16 @@ import { injectManifest, vitePluginSSR } from './vite-plugin-ssr.js';
 export async function staticBuild(opts: StaticBuildOptions) {
 	const { allPages, astroConfig } = opts;
 
+	// Verify this app is buildable.
+	if(isModeServerWithNoAdapter(opts.astroConfig)) {
+		throw new Error(`Cannot use mode: 'server' without an adapter. Please install and configure an adapter by setting it on the deploy configuration.
+
+export default {
+	mode: 'static',
+	adapter: netlify(),
+}`)
+	}
+
 	// The pages to be built for rendering purposes.
 	const pageInput = new Set<string>();
 
@@ -60,9 +69,7 @@ export async function staticBuild(opts: StaticBuildOptions) {
 	info(
 		opts.logging,
 		'build',
-		isBuildingToSSR(astroConfig)
-			? 'Building SSR entrypoints...'
-			: 'Building entrypoints for prerendering...'
+		`Building ${astroConfig.mode} entrypoints...`
 	);
 	const ssrResult = (await ssrBuild(opts, internals, pageInput)) as RollupOutput;
 	info(opts.logging, 'build', dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`));
@@ -83,7 +90,7 @@ export async function staticBuild(opts: StaticBuildOptions) {
 	await clientBuild(opts, internals, clientInput);
 
 	timer.generate = performance.now();
-	if (opts.buildConfig.staticMode) {
+	if (astroConfig.mode === 'static') {
 		try {
 			await generatePages(ssrResult, opts, internals, facadeIdToPageDataMap);
 		} finally {
@@ -100,7 +107,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 ssr = astroConfig.mode === 'server';
 	const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
 
 	const viteBuildConfig: ViteConfigWithSSR = {
@@ -144,7 +151,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
 			}),
 			...(viteConfig.plugins || []),
 			// SSR needs to be last
-			isBuildingToSSR(opts.astroConfig) && vitePluginSSR(internals, opts.astroConfig._ctx.adapter!),
+			opts.astroConfig.mode === 'server' && vitePluginSSR(internals, opts.astroConfig._ctx.adapter!),
 			vitePluginAnalyzer(opts.astroConfig, internals),
 		],
 		publicDir: ssr ? false : viteConfig.publicDir,
@@ -174,7 +181,7 @@ async function clientBuild(
 ) {
 	const { astroConfig, viteConfig } = opts;
 	const timer = performance.now();
-	const ssr = isBuildingToSSR(astroConfig);
+	const ssr = astroConfig.mode === 'server';
 	const out = ssr ? opts.buildConfig.client : astroConfig.outDir;
 
 	// Nothing to do if there is no client-side JS.
@@ -275,7 +282,7 @@ async function copyFiles(fromFolder: URL, toFolder: URL) {
 
 async function ssrMoveAssets(opts: StaticBuildOptions) {
 	info(opts.logging, 'build', 'Rearranging server assets...');
-	const serverRoot = opts.buildConfig.staticMode
+	const serverRoot = opts.astroConfig.mode === 'static'
 		? opts.buildConfig.client
 		: opts.buildConfig.server;
 	const clientRoot = opts.buildConfig.client;