Merge branch 'feat/environment-api' into tests/env-various-tests

Author: matthewp

packages/astro/src/container/index.ts

@@ -149,7 +149,7 @@ function createManifest(
 		buildFormat: manifest?.buildFormat ?? ASTRO_CONFIG_DEFAULTS.build.format,
 		compressHTML: manifest?.compressHTML ?? ASTRO_CONFIG_DEFAULTS.compressHTML,
 		assetsDir: manifest?.assetsDir ?? ASTRO_CONFIG_DEFAULTS.build.assets,
-		serverLike: manifest?.serverLike ?? false,
+		serverLike: manifest?.serverLike ?? true,
 		assets: manifest?.assets ?? new Set(),
 		assetsPrefix: manifest?.assetsPrefix ?? undefined,
 		entryModules: manifest?.entryModules ?? {},

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

@@ -228,8 +228,8 @@ async function buildEnvironments(opts: StaticBuildOptions, internals: BuildInter
 					target: 'esnext',
 					outDir: fileURLToPath(getClientOutputDirectory(settings)),
 					copyPublicDir: true,
+					sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? false,
 					minify: true,
-					sourcemap: false,
 					rollupOptions: {
 						preserveEntrySignatures: 'exports-only',
 						output: {

packages/astro/test/astro-pageDirectoryUrl.test.js

@@ -1,14 +1,11 @@
 import assert from 'node:assert/strict';
-import { Writable } from 'node:stream';
 import { before, describe, it } from 'node:test';
-import { Logger } from '../dist/core/logger/core.js';
 import { loadFixture } from './test-utils.js';
 
 describe('build format', () => {
 	describe('build.format: file', () => {
 		/** @type {import('./test-utils.js').Fixture} */
 		let fixture;
-		const logs = [];
 
 		before(async () => {
 			fixture = await loadFixture({
@@ -17,41 +14,19 @@ describe('build format', () => {
 					format: 'file',
 				},
 			});
-			await fixture.build({
-				logger: new Logger({
-					level: 'info',
-					dest: new Writable({
-						objectMode: true,
-						write(event, _, callback) {
-							logs.push(event);
-							callback();
-						},
-					}),
-				}),
-			});
+			await fixture.build();
 		});
 
 		it('outputs', async () => {
 			assert.ok(await fixture.readFile('/client.html'));
 			assert.ok(await fixture.readFile('/nested-md.html'));
 			assert.ok(await fixture.readFile('/nested-astro.html'));
 		});
-
-		it('logs correct output paths', () => {
-			assert.ok(logs.find((log) => log.level === 'info' && log.message.includes('/client.html')));
-			assert.ok(
-				logs.find((log) => log.level === 'info' && log.message.includes('/nested-md.html')),
-			);
-			assert.ok(
-				logs.find((log) => log.level === 'info' && log.message.includes('/nested-astro.html')),
-			);
-		});
 	});
 
 	describe('build.format: preserve', () => {
 		/** @type {import('./test-utils.js').Fixture} */
 		let fixture;
-		const logs = [];
 
 		before(async () => {
 			fixture = await loadFixture({
@@ -60,36 +35,13 @@ describe('build format', () => {
 					format: 'preserve',
 				},
 			});
-			await fixture.build({
-				logger: new Logger({
-					level: 'info',
-					dest: new Writable({
-						objectMode: true,
-						write(event, _, callback) {
-							logs.push(event);
-							callback();
-						},
-					}),
-				}),
-			});
+			await fixture.build();
 		});
 
 		it('outputs', async () => {
 			assert.ok(await fixture.readFile('/client.html'));
 			assert.ok(await fixture.readFile('/nested-md/index.html'));
 			assert.ok(await fixture.readFile('/nested-astro/index.html'));
 		});
-
-		it('logs correct output paths', () => {
-			assert.ok(logs.find((log) => log.level === 'info' && log.message.includes('/client.html')));
-			assert.ok(
-				logs.find((log) => log.level === 'info' && log.message.includes('/nested-md/index.html')),
-			);
-			assert.ok(
-				logs.find(
-					(log) => log.level === 'info' && log.message.includes('/nested-astro/index.html'),
-				),
-			);
-		});
 	});
 });

packages/astro/test/dev-routing.test.js

@@ -405,8 +405,8 @@ describe('Development Routing', () => {
 			assert.equal((await response.text()).includes('none: 1'), true);
 		});
 
-		it('200 when loading /html-ext/1.html', async () => {
-			const response = await fixture.fetch('/html-ext/1.html');
+		it('200 when loading /html-ext/1.html.html', async () => {
+			const response = await fixture.fetch('/html-ext/1.html.html');
 			assert.equal(response.status, 200);
 			assert.equal((await response.text()).includes('html: 1'), true);
 		});

packages/astro/test/fixtures/sourcemap/astro.config.mjs

@@ -4,8 +4,12 @@ import { defineConfig } from 'astro/config';
 export default defineConfig({
 	integrations: [react()],
 	vite: {
-		build: {
-			sourcemap: true,
+		environments: {
+			client: {
+				build: {
+					sourcemap: true,
+				}
+			}
 		}
 	}
 })