[ci] format

packages/astro/src/core/config/schema.ts

@@ -74,10 +74,7 @@ export const AstroConfigSchema = z.object({
 		.url()
 		.optional()
 		.transform((val) => (val ? appendForwardSlash(val) : val)),
-	base: z
+	base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base),
-		.string()
-		.optional()
-		.default(ASTRO_CONFIG_DEFAULTS.base),
 	trailingSlash: z
 		.union([z.literal('always'), z.literal('never'), z.literal('ignore')])
 		.optional()

packages/astro/src/core/routing/manifest/create.ts

@@ -61,7 +61,11 @@ function getParts(part: string, file: string) {
 	return result;
 }
 
-function getPattern(segments: RoutePart[][], base: string, addTrailingSlash: AstroConfig['trailingSlash']) {
+function getPattern(
+	segments: RoutePart[][],
+	base: string,
+	addTrailingSlash: AstroConfig['trailingSlash']
+) {
 	const pathname = segments
 		.map((segment) => {
 			if (segment.length === 1 && segment[0].spread) {

packages/astro/test/units/dev/base.test.js

@@ -9,18 +9,23 @@ describe('base configuration', () => {
 	describe('with trailingSlash: "never"', () => {
 		describe('index route', () => {
 			it('Requests that include a trailing slash 404', async () => {
-				const fs = createFs({
+				const fs = createFs(
+					{
 						'/src/pages/index.astro': `<h1>testing</h1>`,
-				}, root);
+					},
+					root
+				);
 
-				await runInContainer({
+				await runInContainer(
+					{
 						fs,
 						root,
 						userConfig: {
 							base: '/docs',
 							trailingSlash: 'never',
 						},
-				}, async (container) => {
+					},
+					async (container) => {
 						const { req, res, done } = createRequestAndResponse({
 							method: 'GET',
 							url: '/docs/',
@@ -28,22 +33,28 @@ describe('base configuration', () => {
 						container.handle(req, res);
 						await done;
 						expect(res.statusCode).to.equal(404);
-				});
+					}
+				);
 			});
 
 			it('Requests that exclude a trailing slash 200', async () => {
-				const fs = createFs({
+				const fs = createFs(
+					{
 						'/src/pages/index.astro': `<h1>testing</h1>`,
-				}, root);
+					},
+					root
+				);
 
-				await runInContainer({
+				await runInContainer(
+					{
 						fs,
 						root,
 						userConfig: {
 							base: '/docs',
 							trailingSlash: 'never',
 						},
-				}, async (container) => {
+					},
+					async (container) => {
 						const { req, res, done } = createRequestAndResponse({
 							method: 'GET',
 							url: '/docs',
@@ -51,24 +62,30 @@ describe('base configuration', () => {
 						container.handle(req, res);
 						await done;
 						expect(res.statusCode).to.equal(200);
-				});
+					}
+				);
 			});
 		});
 
 		describe('sub route', () => {
 			it('Requests that include a trailing slash 404', async () => {
-				const fs = createFs({
+				const fs = createFs(
+					{
 						'/src/pages/sub/index.astro': `<h1>testing</h1>`,
-				}, root);
+					},
+					root
+				);
 
-				await runInContainer({
+				await runInContainer(
+					{
 						fs,
 						root,
 						userConfig: {
 							base: '/docs',
 							trailingSlash: 'never',
 						},
-				}, async (container) => {
+					},
+					async (container) => {
 						const { req, res, done } = createRequestAndResponse({
 							method: 'GET',
 							url: '/docs/sub/',
@@ -76,22 +93,28 @@ describe('base configuration', () => {
 						container.handle(req, res);
 						await done;
 						expect(res.statusCode).to.equal(404);
-				});
+					}
+				);
 			});
 
 			it('Requests that exclude a trailing slash 200', async () => {
-				const fs = createFs({
+				const fs = createFs(
+					{
 						'/src/pages/sub/index.astro': `<h1>testing</h1>`,
-				}, root);
+					},
+					root
+				);
 
-				await runInContainer({
+				await runInContainer(
+					{
 						fs,
 						root,
 						userConfig: {
 							base: '/docs',
 							trailingSlash: 'never',
 						},
-				}, async (container) => {
+					},
+					async (container) => {
 						const { req, res, done } = createRequestAndResponse({
 							method: 'GET',
 							url: '/docs/sub',
@@ -99,7 +122,8 @@ describe('base configuration', () => {
 						container.handle(req, res);
 						await done;
 						expect(res.statusCode).to.equal(200);
-				});
+					}
+				);
 			});
 		});
 	});

packages/astro/test/units/routing/manifest.test.js

@@ -9,17 +9,23 @@ const root = new URL('../../fixtures/alias/', import.meta.url);
 
 describe('routing - createRouteManifest', () => {
 	it('using trailingSlash: "never" does not match the index route when it contains a trailing slash', async () => {
-		const fs = createFs({
+		const fs = createFs(
+			{
 				'/src/pages/index.astro': `<h1>test</h1>`,
-		}, root);
+			},
-		const settings = await createDefaultDevSettings({
+			root
+		);
+		const settings = await createDefaultDevSettings(
+			{
 				base: '/search',
-			trailingSlash: 'never'
+				trailingSlash: 'never',
-		}, root);
+			},
+			root
+		);
 		const manifest = createRouteManifest({
 			cwd: fileURLToPath(root),
 			settings,
-			fsMod: fs
+			fsMod: fs,
 		});
 		const [{ pattern }] = manifest.routes;
 		expect(pattern.test('')).to.equal(true);