Merge branch 'main' into fix/passthrough-hashing

Princesseuh · web-flow · commit 0a657873c8c5 · 2023-11-13T10:58:44.000+01:00
diff --git a/.changeset/dirty-zoos-fail.md b/.changeset/dirty-zoos-fail.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes display of debug messages when using the `--verbose` flag
diff --git a/packages/astro/src/core/logger/core.ts b/packages/astro/src/core/logger/core.ts
@@ -142,8 +142,8 @@ export class Logger {
 	error(label: string | null, message: string) {
 		error(this.options, label, message);
 	}
-	debug(label: string | null, message: string, ...args: any[]) {
-		debug(this.options, label, message, args);
+	debug(label: string | null, ...messages: any[]) {
+		debug(label, ...messages);
 	}
 
 	level() {
@@ -181,6 +181,6 @@ export class AstroIntegrationLogger {
 		error(this.options, this.label, message);
 	}
 	debug(message: string) {
-		debug(this.options, this.label, message);
+		debug(this.label, message);
 	}
 }
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
@@ -446,7 +446,7 @@ export function navigate(href: string, options?: Options) {
 		if (!navigateOnServerWarned) {
 			// instantiate an error for the stacktrace to show to user.
 			const warning = new Error(
-				'The view transtions client API was called during a server side render. This may be unintentional as the navigate() function is expected to be called in response to user interactions. Please make sure that your usage is correct.'
+				'The view transitions client API was called during a server side render. This may be unintentional as the navigate() function is expected to be called in response to user interactions. Please make sure that your usage is correct.'
 			);
 			warning.name = 'Warning';
 			// eslint-disable-next-line no-console

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'astro': patch
 +---
++
 +Fixes display of debug messages when using the `--verbose` flag
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ export class Logger {`
`142`	`142`	`error(label: string \| null, message: string) {`
`143`	`143`	`error(this.options, label, message);`
`144`	`144`	`}`
`145`		`- debug(label: string \| null, message: string, ...args: any[]) {`
`146`		`- debug(this.options, label, message, args);`
	`145`	`+ debug(label: string \| null, ...messages: any[]) {`
	`146`	`+ debug(label, ...messages);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`level() {`
`@@ -181,6 +181,6 @@ export class AstroIntegrationLogger {`
`181`	`181`	`error(this.options, this.label, message);`
`182`	`182`	`}`
`183`	`183`	`debug(message: string) {`
`184`		`- debug(this.options, this.label, message);`
	`184`	`+ debug(this.label, message);`
`185`	`185`	`}`
`186`	`186`	`}`