From 1048aca550769415e528016e42b358ffbfd44b61 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Mon, 28 Aug 2023 11:57:21 -0400
Subject: [PATCH 01/10] Lazily initialize ResponseWithEncoding (#8253)

* Lazily initialize ResponseWithEncoding

* Fix things

* Add a TODO about removing the workaround

* Remove unused lint ignore

* Use canplaythrough instead

* Use an inline script

* Check the readystate first

* Download the video locally

* Capture consoles

* More debugging

* Use autoplay instead of a ready event
---
 .changeset/grumpy-years-remember.md           |  5 ++
 .../src/components/Video.astro                |  2 +-
 .../src/pages/video-one.astro                 |  8 ----
 packages/astro/e2e/view-transitions.test.js   |  2 +-
 packages/astro/src/core/endpoint/index.ts     | 47 ++++++++++++-------
 5 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/grumpy-years-remember.md

diff --git a/.changeset/grumpy-years-remember.md b/.changeset/grumpy-years-remember.md
new file mode 100644
index 000000000..1e1906cd9
--- /dev/null
+++ b/.changeset/grumpy-years-remember.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix, lazily initialize ResponseWithEncoding
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro b/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro
index 7235266bc..0a3a22913 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro
@@ -1,3 +1,3 @@
-<video controls="" autoplay="" name="media" transition:persist transition:name="video">
+<video controls="" autoplay="" name="media" transition:persist transition:name="video" autoplay>
 	<source src="https://ia804502.us.archive.org/33/items/GoldenGa1939_3/GoldenGa1939_3_512kb.mp4" type="video/mp4">
 </video>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/video-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/video-one.astro
index 76f221c63..a78c3c43b 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/pages/video-one.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/video-one.astro
@@ -6,12 +6,4 @@ import Video from '../components/Video.astro';
 	<p id="video-one">Page 1</p>
 	<a id="click-two" href="/video-two">go to 2</a>
 	<Video />
-	<script>
-		const vid = document.querySelector('video');
-		vid.addEventListener('canplay', () => {
-			// Jump to the 1 minute mark
-			vid.currentTime = 60;
-			vid.dataset.ready = '';
-		}, { once: true });
-	</script>
 </Layout>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index fc69ac640..12fc63e48 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -302,7 +302,7 @@ test.describe('View Transitions', () => {
 
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/video-one'));
-		const vid = page.locator('video[data-ready]');
+		const vid = page.locator('video');
 		await expect(vid).toBeVisible();
 		const firstTime = await page.evaluate(getTime);
 
diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts
index a6e062727..b8c7000fb 100644
--- a/packages/astro/src/core/endpoint/index.ts
+++ b/packages/astro/src/core/endpoint/index.ts
@@ -39,6 +39,7 @@ export function createAPIContext({
 	props,
 	adapterName,
 }: CreateAPIContext): APIContext {
+	initResponseWithEncoding();
 	const context = {
 		cookies: new AstroCookies(request),
 		request,
@@ -91,27 +92,39 @@ export function createAPIContext({
 
 type ResponseParameters = ConstructorParameters<typeof Response>;
 
-export class ResponseWithEncoding extends Response {
-	constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding) {
-		// If a body string is given, try to encode it to preserve the behaviour as simple objects.
-		// We don't do the full handling as simple objects so users can control how headers are set instead.
-		if (typeof body === 'string') {
-			// In NodeJS, we can use Buffer.from which supports all BufferEncoding
-			if (typeof Buffer !== 'undefined' && Buffer.from) {
-				body = Buffer.from(body, encoding);
+export let ResponseWithEncoding: ReturnType<typeof initResponseWithEncoding>;
+// TODO Remove this after StackBlitz supports Node 18.
+let initResponseWithEncoding = () => {
+	class LocalResponseWithEncoding extends Response {
+		constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding) {
+			// If a body string is given, try to encode it to preserve the behaviour as simple objects.
+			// We don't do the full handling as simple objects so users can control how headers are set instead.
+			if (typeof body === 'string') {
+				// In NodeJS, we can use Buffer.from which supports all BufferEncoding
+				if (typeof Buffer !== 'undefined' && Buffer.from) {
+					body = Buffer.from(body, encoding);
+				}
+				// In non-NodeJS, use the web-standard TextEncoder for utf-8 strings
+				else if (encoding == null || encoding === 'utf8' || encoding === 'utf-8') {
+					body = encoder.encode(body);
+				}
 			}
-			// In non-NodeJS, use the web-standard TextEncoder for utf-8 strings
-			else if (encoding == null || encoding === 'utf8' || encoding === 'utf-8') {
-				body = encoder.encode(body);
+	
+			super(body, init);
+	
+			if (encoding) {
+				this.headers.set('X-Astro-Encoding', encoding);
 			}
 		}
-
-		super(body, init);
-
-		if (encoding) {
-			this.headers.set('X-Astro-Encoding', encoding);
-		}
 	}
+
+	// Set the module scoped variable.
+	ResponseWithEncoding = LocalResponseWithEncoding;
+
+	// Turn this into a noop.
+	initResponseWithEncoding = (() => {}) as any;
+
+	return LocalResponseWithEncoding;
 }
 
 export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>(

From 57e9a28063c28e5ad81034ca170291aba6084100 Mon Sep 17 00:00:00 2001
From: matthewp <matthewp@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:59:37 +0000
Subject: [PATCH 02/10] [ci] format

---
 packages/astro/src/core/endpoint/index.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts
index b8c7000fb..a3aff6dca 100644
--- a/packages/astro/src/core/endpoint/index.ts
+++ b/packages/astro/src/core/endpoint/index.ts
@@ -96,7 +96,11 @@ export let ResponseWithEncoding: ReturnType<typeof initResponseWithEncoding>;
 // TODO Remove this after StackBlitz supports Node 18.
 let initResponseWithEncoding = () => {
 	class LocalResponseWithEncoding extends Response {
-		constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding) {
+		constructor(
+			body: ResponseParameters[0],
+			init: ResponseParameters[1],
+			encoding?: BufferEncoding
+		) {
 			// If a body string is given, try to encode it to preserve the behaviour as simple objects.
 			// We don't do the full handling as simple objects so users can control how headers are set instead.
 			if (typeof body === 'string') {
@@ -109,9 +113,9 @@ let initResponseWithEncoding = () => {
 					body = encoder.encode(body);
 				}
 			}
-	
+
 			super(body, init);
-	
+
 			if (encoding) {
 				this.headers.set('X-Astro-Encoding', encoding);
 			}
@@ -125,7 +129,7 @@ let initResponseWithEncoding = () => {
 	initResponseWithEncoding = (() => {}) as any;
 
 	return LocalResponseWithEncoding;
-}
+};
 
 export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>(
 	mod: EndpointHandler,

From ffc9e2d3de46049bf3d82140ef018f524fb03187 Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:02:05 +0200
Subject: [PATCH 03/10] feat(paginate): Return exact types from paginate()
 (#8229)

* feat(paginate): Return exact types from paginate()

* chore: changeset

* fix(types): Fix infer utils while I'm here

---------

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/shiny-dryers-swim.md               |  5 +++
 packages/astro/client.d.ts                    |  2 +-
 packages/astro/src/@types/astro.ts            | 42 ++++++++++++++++---
 packages/astro/src/core/render/paginate.ts    | 12 +++---
 packages/astro/src/core/render/route-cache.ts |  5 ++-
 5 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/shiny-dryers-swim.md

diff --git a/.changeset/shiny-dryers-swim.md b/.changeset/shiny-dryers-swim.md
new file mode 100644
index 000000000..f943b2180
--- /dev/null
+++ b/.changeset/shiny-dryers-swim.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Paginate will now return exact types instead of a naive Record
diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index e6389d415..9d064c0b1 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -57,7 +57,7 @@ declare module 'astro:assets' {
 	};
 
 	type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
-	type Simplify<T> = { [KeyType in keyof T]: T[KeyType] };
+	type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {};
 	type ImgAttributes = WithRequired<
 		Omit<import('./types').HTMLAttributes<'img'>, 'src' | 'width' | 'height'>,
 		'alt'
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index bc47e0779..3efbb7ae8 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1600,7 +1600,9 @@ export type GetStaticPaths = (
  * const { slug } = Astro.params as Params;
  * ```
  */
-export type InferGetStaticParamsType<T> = T extends () => infer R | Promise<infer R>
+export type InferGetStaticParamsType<T> = T extends (
+	opts?: GetStaticPathsOptions
+) => infer R | Promise<infer R>
 	? R extends Array<infer U>
 		? U extends { params: infer P }
 			? P
@@ -1631,7 +1633,9 @@ export type InferGetStaticParamsType<T> = T extends () => infer R | Promise<infe
  * const { propA, propB } = Astro.props;
  * ```
  */
-export type InferGetStaticPropsType<T> = T extends () => infer R | Promise<infer R>
+export type InferGetStaticPropsType<T> = T extends (
+	opts: GetStaticPathsOptions
+) => infer R | Promise<infer R>
 	? R extends Array<infer U>
 		? U extends { props: infer P }
 			? P
@@ -1678,13 +1682,13 @@ export type MarkdownContent<T extends Record<string, any> = Record<string, any>>
  *
  * [Astro reference](https://docs.astro.build/en/reference/api-reference/#paginate)
  */
-export interface PaginateOptions {
+export interface PaginateOptions<PaginateProps extends Props, PaginateParams extends Params> {
 	/** the number of items per-page (default: `10`) */
 	pageSize?: number;
 	/** key: value object of page params (ex: `{ tag: 'javascript' }`) */
-	params?: Params;
+	params?: PaginateParams;
 	/** object of props to forward to `page` result */
-	props?: Props;
+	props?: PaginateProps;
 }
 
 /**
@@ -1718,7 +1722,33 @@ export interface Page<T = any> {
 	};
 }
 
-export type PaginateFunction = (data: any[], args?: PaginateOptions) => GetStaticPathsResult;
+type OmitIndexSignature<ObjectType> = {
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	[KeyType in keyof ObjectType as {} extends Record<KeyType, unknown>
+		? never
+		: KeyType]: ObjectType[KeyType];
+};
+// eslint-disable-next-line @typescript-eslint/ban-types
+type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {};
+export type PaginateFunction = <
+	PaginateData,
+	AdditionalPaginateProps extends Props,
+	AdditionalPaginateParams extends Params,
+>(
+	data: PaginateData[],
+	args?: PaginateOptions<AdditionalPaginateProps, AdditionalPaginateParams>
+) => {
+	params: Simplify<
+		{
+			page: string | undefined;
+		} & OmitIndexSignature<AdditionalPaginateParams>
+	>;
+	props: Simplify<
+		{
+			page: Page<PaginateData>;
+		} & OmitIndexSignature<AdditionalPaginateProps>
+	>;
+}[];
 
 export type Params = Record<string, string | undefined>;
 
diff --git a/packages/astro/src/core/render/paginate.ts b/packages/astro/src/core/render/paginate.ts
index dffabe178..f8cd8709d 100644
--- a/packages/astro/src/core/render/paginate.ts
+++ b/packages/astro/src/core/render/paginate.ts
@@ -1,18 +1,20 @@
 import type {
-	GetStaticPathsResult,
 	Page,
 	PaginateFunction,
+	PaginateOptions,
 	Params,
 	Props,
 	RouteData,
 } from '../../@types/astro';
 import { AstroError, AstroErrorData } from '../errors/index.js';
 
-export function generatePaginateFunction(routeMatch: RouteData): PaginateFunction {
+export function generatePaginateFunction(
+	routeMatch: RouteData
+): (...args: Parameters<PaginateFunction>) => ReturnType<PaginateFunction> {
 	return function paginateUtility(
 		data: any[],
-		args: { pageSize?: number; params?: Params; props?: Props } = {}
-	) {
+		args: PaginateOptions<Props, Params> = {}
+	): ReturnType<PaginateFunction> {
 		let { pageSize: _pageSize, params: _params, props: _props } = args;
 		const pageSize = _pageSize || 10;
 		const paramName = 'page';
@@ -31,7 +33,7 @@ export function generatePaginateFunction(routeMatch: RouteData): PaginateFunctio
 		}
 		const lastPage = Math.max(1, Math.ceil(data.length / pageSize));
 
-		const result: GetStaticPathsResult = [...Array(lastPage).keys()].map((num) => {
+		const result = [...Array(lastPage).keys()].map((num) => {
 			const pageNum = num + 1;
 			const start = pageSize === Infinity ? 0 : (pageNum - 1) * pageSize; // currentPage is 1-indexed
 			const end = Math.min(start + pageSize, data.length);
diff --git a/packages/astro/src/core/render/route-cache.ts b/packages/astro/src/core/render/route-cache.ts
index f607cf5d9..d43ce514b 100644
--- a/packages/astro/src/core/render/route-cache.ts
+++ b/packages/astro/src/core/render/route-cache.ts
@@ -3,6 +3,7 @@ import type {
 	GetStaticPathsItem,
 	GetStaticPathsResult,
 	GetStaticPathsResultKeyed,
+	PaginateFunction,
 	Params,
 	RouteData,
 	RuntimeMode,
@@ -50,7 +51,9 @@ export async function callGetStaticPaths({
 	// Calculate your static paths.
 	let staticPaths: GetStaticPathsResult = [];
 	staticPaths = await mod.getStaticPaths({
-		paginate: generatePaginateFunction(route),
+		// Q: Why the cast?
+		// A: So users downstream can have nicer typings, we have to make some sacrifice in our internal typings, which necessitate a cast here
+		paginate: generatePaginateFunction(route) as PaginateFunction,
 		rss() {
 			throw new AstroError(AstroErrorData.GetStaticPathsRemovedRSSHelper);
 		},

From 52f0837bdeca0b54e07cbf76a7570bd042b98922 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Mon, 28 Aug 2023 12:10:28 -0400
Subject: [PATCH 04/10] Vercel adapter default changes (#8239)

* Vercel adapter default changes

* Update .changeset/silly-dolphins-try.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

* Fix tests

* chore: correctly export `pageModule` when using `functionPerRoute`

* Update .changeset/silly-dolphins-try.md

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>

* Update .changeset/silly-dolphins-try.md

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>

* Make throw be the entrypoint

---------

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
---
 .changeset/silly-dolphins-try.md               |  9 +++++++++
 packages/astro/src/core/build/generate.ts      |  2 +-
 .../astro/src/core/build/plugins/plugin-ssr.ts |  2 ++
 packages/integrations/vercel/README.md         |  8 +++++---
 packages/integrations/vercel/package.json      |  4 ++--
 packages/integrations/vercel/src/edge/throw.ts | 18 ++++++++++++++++++
 .../vercel/src/serverless/adapter.ts           |  2 +-
 .../serverless-prerender/astro.config.mjs      |  2 +-
 8 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/silly-dolphins-try.md
 create mode 100644 packages/integrations/vercel/src/edge/throw.ts

diff --git a/.changeset/silly-dolphins-try.md b/.changeset/silly-dolphins-try.md
new file mode 100644
index 000000000..dcd15130d
--- /dev/null
+++ b/.changeset/silly-dolphins-try.md
@@ -0,0 +1,9 @@
+---
+'@astrojs/vercel': major
+---
+
+Vercel adapter now defaults to `functionPerRoute`.
+
+With this change, `@astrojs/vercel/serverless` now splits each route into its own function. By doing this, the size of each function is reduced and startup time is faster.
+
+You can disable this option, which will cause the code to be bundled into a single function, by setting `functionPerRoute` to `false`.
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 0a3d80000..53a350342 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -163,7 +163,7 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn
 					opts.settings.adapter?.adapterFeatures?.functionPerRoute
 				) {
 					// forcing to use undefined, so we fail in an expected way if the module is not even there.
-					const ssrEntry = ssrEntryPage?.manifest?.pageModule;
+					const ssrEntry = ssrEntryPage?.pageModule;
 					if (ssrEntry) {
 						await generatePage(pageData, ssrEntry, builtPaths, pipeline);
 					} else {
diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
index 8650d5870..44fc31155 100644
--- a/packages/astro/src/core/build/plugins/plugin-ssr.ts
+++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -178,6 +178,8 @@ function vitePluginSSRSplit(
 				imports.push(...ssrCode.imports);
 				contents.push(...ssrCode.contents);
 
+				exports.push('export { pageModule }');
+
 				return `${imports.join('\n')}${contents.join('\n')}${exports.join('\n')}`;
 			}
 			return void 0;
diff --git a/packages/integrations/vercel/README.md b/packages/integrations/vercel/README.md
index b01a7c716..e16d98390 100644
--- a/packages/integrations/vercel/README.md
+++ b/packages/integrations/vercel/README.md
@@ -210,9 +210,11 @@ export default defineConfig({
 });
 ```
 
-### Per-page functions
+### Function bundling configuration
 
-The Vercel adapter builds to a single function by default. Astro 2.7 added support for splitting your build into separate entry points per page. If you use this configuration the Vercel adapter will generate a separate function for each page. This can help reduce the size of each function so they are only bundling code used on that page.
+The Vercel adapter splits builds into a separate function per route by default. This helps reduce the size of each function, as it only bundles code used on that page.
+
+You can disable this and build to a single function by setting the `functionPerRoute` configuration option to `false`:
 
 ```js
 // astro.config.mjs
@@ -222,7 +224,7 @@ import vercel from '@astrojs/vercel/serverless';
 export default defineConfig({
   output: 'server',
   adapter: vercel({
-    functionPerRoute: true,
+    functionPerRoute: false,
   }),
 });
 ```
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index fc622776c..726f6f9d4 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -17,8 +17,8 @@
   "bugs": "https://github.com/withastro/astro/issues",
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/vercel/",
   "exports": {
-    "./edge": "./dist/edge/adapter.js",
-    "./edge/entrypoint": "./dist/edge/entrypoint.js",
+    "./edge": "./dist/edge/throw.js",
+    "./edge/entrypoint": "./dist/edge/throw.js",
     "./serverless": "./dist/serverless/adapter.js",
     "./serverless/entrypoint": "./dist/serverless/entrypoint.js",
     "./static": "./dist/static/adapter.js",
diff --git a/packages/integrations/vercel/src/edge/throw.ts b/packages/integrations/vercel/src/edge/throw.ts
new file mode 100644
index 000000000..5041370e0
--- /dev/null
+++ b/packages/integrations/vercel/src/edge/throw.ts
@@ -0,0 +1,18 @@
+const msg = `
+The Astro Vercel Edge adapter has been removed. We recommend switching to @astrojs/vercel/serverless and enabling Edge middleware.
+
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	output: 'server',
+	adapter: vercel({
+		edgeMiddleware: true,
+	})
+})
+`.trim();
+
+throw new Error(msg);
+
+// Make sure bundlers treat this as ESM.
+export default {};
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index d5ac9c881..0bfdd31f7 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -68,7 +68,7 @@ export default function vercelServerless({
 	analytics,
 	imageService,
 	imagesConfig,
-	functionPerRoute = false,
+	functionPerRoute = true,
 	edgeMiddleware = false,
 }: VercelServerlessConfig = {}): AstroIntegration {
 	let _config: AstroConfig;
diff --git a/packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs b/packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs
index 84b96c27d..f5a86e609 100644
--- a/packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs
+++ b/packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs
@@ -4,7 +4,7 @@ import vercel from '@astrojs/vercel/serverless';
 export default defineConfig({
 	adapter: vercel({
 		// Pass some value to make sure it doesn't error out
-		includeFiles: ['included.js']
+		includeFiles: ['included.js'],
 	}),
 	output: 'server'
 });

From c7921e9e1b2953e211e506cee4a50f0cc0bf6569 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Mon, 28 Aug 2023 17:19:04 +0100
Subject: [PATCH 05/10] refactor: use new Astro internals (#8254)

* refactor: use new Astro internals

* chore: update tests

---------

Co-authored-by: Matthew Phillips <matthew@skypack.dev>
---
 packages/astro/src/@types/astro.ts            |  3 ++
 packages/astro/src/core/app/index.ts          | 10 ++++-
 packages/astro/src/core/preview/index.ts      |  2 +
 .../integrations/cloudflare/src/runtime.ts    | 45 -------------------
 .../test/fixtures/cf/src/pages/index.astro    |  3 +-
 packages/integrations/node/src/index.ts       |  4 +-
 packages/integrations/node/src/preview.ts     | 12 ++---
 .../node/src/response-iterator.ts             |  5 ++-
 packages/integrations/node/src/standalone.ts  |  9 ++--
 .../vercel/src/serverless/adapter.ts          |  9 ++--
 10 files changed, 34 insertions(+), 68 deletions(-)
 delete mode 100644 packages/integrations/cloudflare/src/runtime.ts

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 3efbb7ae8..86d7bc984 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -24,6 +24,8 @@ import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 
+export { type AstroIntegrationLogger };
+
 export type {
 	MarkdownHeading,
 	MarkdownMetadata,
@@ -2203,6 +2205,7 @@ export interface PreviewServerParams {
 	host: string | undefined;
 	port: number;
 	base: string;
+	logger: AstroIntegrationLogger;
 }
 
 export type CreatePreviewServer = (
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index 8fa3f5f14..5773b16d3 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -27,6 +27,7 @@ import { matchRoute } from '../routing/match.js';
 import { EndpointNotFoundError, SSRRoutePipeline } from './ssrPipeline.js';
 import type { RouteInfo } from './types';
 export { deserializeManifest } from './common.js';
+import { AstroIntegrationLogger } from '../logger/core.js';
 
 const clientLocalsSymbol = Symbol.for('astro.locals');
 
@@ -58,6 +59,7 @@ export class App {
 	#pipeline: SSRRoutePipeline;
 	#onRequest: MiddlewareEndpointHandler | undefined;
 	#middlewareLoaded: boolean;
+	#adapterLogger: AstroIntegrationLogger;
 
 	constructor(manifest: SSRManifest, streaming = true) {
 		this.#manifest = manifest;
@@ -68,10 +70,14 @@ export class App {
 		this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
 		this.#pipeline = new SSRRoutePipeline(this.#createEnvironment(streaming));
 		this.#middlewareLoaded = false;
+		this.#adapterLogger = new AstroIntegrationLogger(
+			this.#logger.options,
+			this.#manifest.adapterName
+		);
 	}
 
-	set setManifest(newManifest: SSRManifest) {
-		this.#manifest = newManifest;
+	getAdapterLogger(): AstroIntegrationLogger {
+		return this.#adapterLogger;
 	}
 
 	/**
diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts
index a4e7e7a7b..2ad7ab5aa 100644
--- a/packages/astro/src/core/preview/index.ts
+++ b/packages/astro/src/core/preview/index.ts
@@ -9,6 +9,7 @@ import { createNodeLogger } from '../config/logging.js';
 import { createSettings } from '../config/settings.js';
 import createStaticPreviewServer from './static-preview-server.js';
 import { getResolvedHostForHttpServer } from './util.js';
+import { AstroIntegrationLogger } from '../../core/logger/core.js';
 
 /**
  * Starts a local server to serve your static dist/ directory. This command is useful for previewing
@@ -62,6 +63,7 @@ export default async function preview(inlineConfig: AstroInlineConfig): Promise<
 		host: getResolvedHostForHttpServer(settings.config.server.host),
 		port: settings.config.server.port,
 		base: settings.config.base,
+		logger: new AstroIntegrationLogger(logger.options, settings.adapter.name),
 	});
 
 	return server;
diff --git a/packages/integrations/cloudflare/src/runtime.ts b/packages/integrations/cloudflare/src/runtime.ts
deleted file mode 100644
index 03c15d4a3..000000000
--- a/packages/integrations/cloudflare/src/runtime.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// TODO: remove `getRuntime()` in Astro 3.0
-import type { Cache, CacheStorage, IncomingRequestCfProperties } from '@cloudflare/workers-types';
-
-export type WorkerRuntime<T = unknown> = {
-	name: 'cloudflare';
-	env: T;
-	waitUntil(promise: Promise<any>): void;
-	passThroughOnException(): void;
-	caches?: CacheStorage & { default: Cache };
-	cf?: IncomingRequestCfProperties;
-};
-
-export type PagesRuntime<T = unknown, U = unknown> = {
-	name: 'cloudflare';
-	env: T;
-	functionPath: string;
-	params: Record<string, string>;
-	data: U;
-	waitUntil(promise: Promise<any>): void;
-	next(request: Request): void;
-	caches?: CacheStorage & { default: Cache };
-	cf?: IncomingRequestCfProperties;
-};
-
-/**
- * @deprecated since version 6.8.0
- * The `getRuntime` utility has been deprecated and should be updated to the new [`Astro.locals`](https://docs.astro.build/en/guides/middleware/#locals) API.
- * ```diff
- * - import { getRuntime } from '@astrojs/cloudflare/runtime';
- * - getRuntime(Astro.request);
- *
- * + const runtime = Astro.locals.runtime;
- * ```
- */
-export function getRuntime<T = unknown, U = unknown>(
-	request: Request
-): WorkerRuntime<T> | PagesRuntime<T, U> {
-	if (!!request) {
-		return Reflect.get(request, Symbol.for('runtime'));
-	} else {
-		throw new Error(
-			'To retrieve the current cloudflare runtime you need to pass in the Astro request object'
-		);
-	}
-}
diff --git a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
index 6ba48e803..0e904752f 100644
--- a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
@@ -1,6 +1,5 @@
 ---
-import { getRuntime } from '@astrojs/cloudflare/runtime';
-const runtime = getRuntime(Astro.request);
+const runtime = Astro.locals.runtime;
 ---
 <html>
 	<head>
diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts
index 7435a60ed..20f33f4a8 100644
--- a/packages/integrations/node/src/index.ts
+++ b/packages/integrations/node/src/index.ts
@@ -1,6 +1,6 @@
 import type { AstroAdapter, AstroIntegration } from 'astro';
 import type { Options, UserOptions } from './types';
-
+import { AstroError } from 'astro/errors';
 export function getAdapter(options: Options): AstroAdapter {
 	return {
 		name: '@astrojs/node',
@@ -23,7 +23,7 @@ export function getAdapter(options: Options): AstroAdapter {
 
 export default function createIntegration(userOptions: UserOptions): AstroIntegration {
 	if (!userOptions?.mode) {
-		throw new Error(`[@astrojs/node] Setting the 'mode' option is required.`);
+		throw new AstroError(`Setting the 'mode' option is required.`);
 	}
 
 	let _options: Options;
diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts
index 62a4301c1..2928ac0bf 100644
--- a/packages/integrations/node/src/preview.ts
+++ b/packages/integrations/node/src/preview.ts
@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { getNetworkAddress } from './get-network-address.js';
 import { createServer } from './http-server.js';
 import type { createExports } from './server';
+import { AstroError } from 'astro/errors';
 
 const preview: CreatePreviewServer = async function ({
 	client,
@@ -11,6 +12,7 @@ const preview: CreatePreviewServer = async function ({
 	host,
 	port,
 	base,
+	logger,
 }) {
 	type ServerModule = ReturnType<typeof createExports>;
 	type MaybeServerModule = Partial<ServerModule>;
@@ -21,13 +23,13 @@ const preview: CreatePreviewServer = async function ({
 		if (typeof ssrModule.handler === 'function') {
 			ssrHandler = ssrModule.handler;
 		} else {
-			throw new Error(
+			throw new AstroError(
 				`The server entrypoint doesn't have a handler. Are you sure this is the right file?`
 			);
 		}
 	} catch (err) {
 		if ((err as any).code === 'ERR_MODULE_NOT_FOUND') {
-			throw new Error(
+			throw new AstroError(
 				`The server entrypoint ${fileURLToPath(
 					serverEntrypoint
 				)} does not exist. Have you ran a build yet?`
@@ -63,13 +65,11 @@ const preview: CreatePreviewServer = async function ({
 	const address = getNetworkAddress('http', host, port);
 
 	if (host === undefined) {
-		// eslint-disable-next-line no-console
-		console.log(
+		logger.info(
 			`Preview server listening on \n  local: ${address.local[0]} \t\n  network: ${address.network[0]}\n`
 		);
 	} else {
-		// eslint-disable-next-line no-console
-		console.log(`Preview server listening on ${address.local[0]}`);
+		logger.info(`Preview server listening on ${address.local[0]}`);
 	}
 
 	return server;
diff --git a/packages/integrations/node/src/response-iterator.ts b/packages/integrations/node/src/response-iterator.ts
index 0dd6e63af..ef7a42c40 100644
--- a/packages/integrations/node/src/response-iterator.ts
+++ b/packages/integrations/node/src/response-iterator.ts
@@ -6,6 +6,7 @@
 
 import type { ReadableStreamDefaultReadResult } from 'node:stream/web';
 import { Readable as NodeReadableStream } from 'stream';
+import { AstroError } from 'astro/errors';
 
 interface NodeStreamIterator<T> {
 	next(): Promise<IteratorResult<T, boolean | undefined>>;
@@ -221,5 +222,7 @@ export function responseIterator<T>(response: Response | Buffer): AsyncIterableI
 
 	if (isNodeReadableStream(body)) return nodeStreamIterator<T>(body);
 
-	throw new Error('Unknown body type for responseIterator. Please pass a streamable response.');
+	throw new AstroError(
+		'Unknown body type for responseIterator. Please pass a streamable response.'
+	);
 }
diff --git a/packages/integrations/node/src/standalone.ts b/packages/integrations/node/src/standalone.ts
index 94dc26758..66d1b9c6a 100644
--- a/packages/integrations/node/src/standalone.ts
+++ b/packages/integrations/node/src/standalone.ts
@@ -37,6 +37,7 @@ export function getResolvedHostForHttpServer(host: string | boolean) {
 }
 
 export default function startServer(app: NodeApp, options: Options) {
+	const logger = app.getAdapterLogger();
 	const port = process.env.PORT ? Number(process.env.PORT) : options.port ?? 8080;
 	const { client } = resolvePaths(options);
 	const handler = middleware(app, options.mode);
@@ -59,13 +60,11 @@ export default function startServer(app: NodeApp, options: Options) {
 	const address = getNetworkAddress(protocol, host, port);
 
 	if (host === undefined) {
-		// eslint-disable-next-line no-console
-		console.log(
-			`Preview server listening on \n  local: ${address.local[0]} \t\n  network: ${address.network[0]}\n`
+		logger.info(
+			`Server listening on \n  local: ${address.local[0]} \t\n  network: ${address.network[0]}\n`
 		);
 	} else {
-		// eslint-disable-next-line no-console
-		console.log(`Preview server listening on ${address.local[0]}`);
+		logger.info(`Server listening on ${address.local[0]}`);
 	}
 
 	return {
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index 0bfdd31f7..22c35b87f 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -1,5 +1,5 @@
 import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'astro';
-
+import { AstroError } from 'astro/errors';
 import glob from 'fast-glob';
 import { basename } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -136,10 +136,9 @@ export default function vercelServerless({
 				serverEntry = config.build.serverEntry;
 
 				if (config.output === 'static') {
-					throw new Error(`
-		[@astrojs/vercel] \`output: "server"\` or \`output: "hybrid"\` is required to use the serverless adapter.
-
-	`);
+					throw new AstroError(
+						'`output: "server"` or `output: "hybrid"` is required to use the serverless adapter.'
+					);
 				}
 			},
 

From ba7b23b9e01cb8a6a5073e9146c2400a6b362ec6 Mon Sep 17 00:00:00 2001
From: ematipico <ematipico@users.noreply.github.com>
Date: Mon, 28 Aug 2023 16:21:11 +0000
Subject: [PATCH 06/10] [ci] format

---
 packages/astro/src/core/app/index.ts                | 3 +--
 packages/astro/src/core/preview/index.ts            | 2 +-
 packages/integrations/node/src/index.ts             | 2 +-
 packages/integrations/node/src/preview.ts           | 2 +-
 packages/integrations/node/src/response-iterator.ts | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index 5773b16d3..71a8da439 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -9,7 +9,7 @@ import type {
 import type { SinglePageBuiltModule } from '../build/types';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
 import { consoleLogDestination } from '../logger/console.js';
-import { Logger } from '../logger/core.js';
+import { AstroIntegrationLogger, Logger } from '../logger/core.js';
 import {
 	collapseDuplicateSlashes,
 	prependForwardSlash,
@@ -27,7 +27,6 @@ import { matchRoute } from '../routing/match.js';
 import { EndpointNotFoundError, SSRRoutePipeline } from './ssrPipeline.js';
 import type { RouteInfo } from './types';
 export { deserializeManifest } from './common.js';
-import { AstroIntegrationLogger } from '../logger/core.js';
 
 const clientLocalsSymbol = Symbol.for('astro.locals');
 
diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts
index 2ad7ab5aa..7ba0cb2ea 100644
--- a/packages/astro/src/core/preview/index.ts
+++ b/packages/astro/src/core/preview/index.ts
@@ -1,6 +1,7 @@
 import { createRequire } from 'node:module';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import type { AstroInlineConfig, PreviewModule, PreviewServer } from '../../@types/astro';
+import { AstroIntegrationLogger } from '../../core/logger/core.js';
 import { telemetry } from '../../events/index.js';
 import { eventCliSession } from '../../events/session.js';
 import { runHookConfigDone, runHookConfigSetup } from '../../integrations/index.js';
@@ -9,7 +10,6 @@ import { createNodeLogger } from '../config/logging.js';
 import { createSettings } from '../config/settings.js';
 import createStaticPreviewServer from './static-preview-server.js';
 import { getResolvedHostForHttpServer } from './util.js';
-import { AstroIntegrationLogger } from '../../core/logger/core.js';
 
 /**
  * Starts a local server to serve your static dist/ directory. This command is useful for previewing
diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts
index 20f33f4a8..5afc49f6a 100644
--- a/packages/integrations/node/src/index.ts
+++ b/packages/integrations/node/src/index.ts
@@ -1,6 +1,6 @@
 import type { AstroAdapter, AstroIntegration } from 'astro';
-import type { Options, UserOptions } from './types';
 import { AstroError } from 'astro/errors';
+import type { Options, UserOptions } from './types';
 export function getAdapter(options: Options): AstroAdapter {
 	return {
 		name: '@astrojs/node',
diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts
index 2928ac0bf..77560d734 100644
--- a/packages/integrations/node/src/preview.ts
+++ b/packages/integrations/node/src/preview.ts
@@ -1,10 +1,10 @@
 import type { CreatePreviewServer } from 'astro';
+import { AstroError } from 'astro/errors';
 import type http from 'node:http';
 import { fileURLToPath } from 'node:url';
 import { getNetworkAddress } from './get-network-address.js';
 import { createServer } from './http-server.js';
 import type { createExports } from './server';
-import { AstroError } from 'astro/errors';
 
 const preview: CreatePreviewServer = async function ({
 	client,
diff --git a/packages/integrations/node/src/response-iterator.ts b/packages/integrations/node/src/response-iterator.ts
index ef7a42c40..b79c3a853 100644
--- a/packages/integrations/node/src/response-iterator.ts
+++ b/packages/integrations/node/src/response-iterator.ts
@@ -4,9 +4,9 @@
  *  - https://github.com/apollographql/apollo-client/blob/main/src/utilities/common/responseIterator.ts
  */
 
+import { AstroError } from 'astro/errors';
 import type { ReadableStreamDefaultReadResult } from 'node:stream/web';
 import { Readable as NodeReadableStream } from 'stream';
-import { AstroError } from 'astro/errors';
 
 interface NodeStreamIterator<T> {
 	next(): Promise<IteratorResult<T, boolean | undefined>>;

From 0a97524e38843823a16f22e16ebb656d2f740811 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Mon, 28 Aug 2023 09:23:04 -0700
Subject: [PATCH 07/10] [ci] release (rc) (#8238)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                           |  6 ++
 examples/basics/package.json                  |  2 +-
 examples/blog/package.json                    |  2 +-
 examples/component/package.json               |  2 +-
 examples/deno/package.json                    |  4 +-
 examples/framework-alpine/package.json        |  2 +-
 examples/framework-lit/package.json           |  2 +-
 examples/framework-multiple/package.json      |  2 +-
 examples/framework-preact/package.json        |  2 +-
 examples/framework-react/package.json         |  2 +-
 examples/framework-solid/package.json         |  2 +-
 examples/framework-svelte/package.json        |  2 +-
 examples/framework-vue/package.json           |  2 +-
 examples/hackernews/package.json              |  2 +-
 examples/integration/package.json             |  2 +-
 examples/middleware/package.json              |  2 +-
 examples/minimal/package.json                 |  2 +-
 examples/non-html-pages/package.json          |  2 +-
 examples/portfolio/package.json               |  2 +-
 examples/ssr/package.json                     |  2 +-
 examples/with-markdoc/package.json            |  2 +-
 examples/with-markdown-plugins/package.json   |  2 +-
 examples/with-markdown-shiki/package.json     |  2 +-
 examples/with-mdx/package.json                |  2 +-
 examples/with-nanostores/package.json         |  2 +-
 examples/with-tailwindcss/package.json        |  2 +-
 examples/with-vite-plugin-pwa/package.json    |  2 +-
 examples/with-vitest/package.json             |  2 +-
 packages/astro/CHANGELOG.md                   | 12 ++++
 packages/astro/package.json                   |  2 +-
 packages/integrations/cloudflare/package.json |  2 +-
 packages/integrations/deno/CHANGELOG.md       |  9 +++
 packages/integrations/deno/package.json       |  4 +-
 packages/integrations/markdoc/package.json    |  2 +-
 packages/integrations/mdx/package.json        |  2 +-
 packages/integrations/netlify/package.json    |  2 +-
 packages/integrations/node/package.json       |  2 +-
 packages/integrations/svelte/package.json     |  2 +-
 packages/integrations/tailwind/package.json   |  2 +-
 packages/integrations/vercel/CHANGELOG.md     | 15 +++++
 packages/integrations/vercel/package.json     |  4 +-
 packages/integrations/vue/package.json        |  2 +-
 pnpm-lock.yaml                                | 56 +++++++++----------
 43 files changed, 111 insertions(+), 69 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 37137cbc3..dc80fe9f3 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -34,6 +34,7 @@
     "angry-dogs-shake",
     "big-tips-whisper",
     "brave-cheetahs-float",
+    "chatty-ways-hunt",
     "chilled-ducks-grin",
     "clever-bats-breathe",
     "cool-feet-rest",
@@ -52,6 +53,7 @@
     "giant-plants-sip",
     "gorgeous-kiwis-stare",
     "grumpy-pens-melt",
+    "grumpy-years-remember",
     "happy-penguins-hug",
     "heavy-walls-arrive",
     "honest-houses-deny",
@@ -67,6 +69,7 @@
     "neat-owls-run",
     "neat-suns-search",
     "odd-books-live",
+    "olive-moles-tan",
     "perfect-horses-tell",
     "plenty-keys-add",
     "popular-carrots-sneeze",
@@ -75,7 +78,9 @@
     "quick-boats-bow",
     "rude-ears-play",
     "serious-waves-fry",
+    "shiny-dryers-swim",
     "silent-bikes-crash",
+    "silly-dolphins-try",
     "six-grapes-look",
     "slimy-carrots-sell",
     "small-nails-try",
@@ -83,6 +88,7 @@
     "spicy-eels-rush",
     "spicy-icons-live",
     "spicy-stingrays-cheer",
+    "strange-peas-agree",
     "strong-papayas-chew",
     "tame-files-glow",
     "tasty-camels-speak",
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 36920d101..a84e518a4 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 59f4f82e1..ed47d2987 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^1.0.0-rc.2",
     "@astrojs/rss": "^3.0.0-rc.2",
     "@astrojs/sitemap": "^3.0.0-rc.1",
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index f9604d4e0..04153af27 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/deno/package.json b/examples/deno/package.json
index d50591c03..985033960 100644
--- a/examples/deno/package.json
+++ b/examples/deno/package.json
@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   },
   "devDependencies": {
-    "@astrojs/deno": "^5.0.0-rc.1"
+    "@astrojs/deno": "^5.0.0-rc.2"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index a921c79ba..af6cf3a9a 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.0-rc.1",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index b74dae082..bad47f0b2 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.0-rc.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index d58381e1a..33a5c46b6 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.0-rc.3",
     "@astrojs/svelte": "^4.0.0-rc.2",
     "@astrojs/vue": "^3.0.0-rc.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 77f0dfd71..c219bf7cc 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.0-rc.2",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 696c851e9..fb5994100 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.0-rc.5",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index a191231ad..ca9f62ee1 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.0-rc.3",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "solid-js": "^1.7.11"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 11a2daf11..d5fbfeaf0 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.0-rc.2",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index cc036142a..f9c898a0c 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^3.0.0-rc.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "vue": "^3.3.4"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index a13a3a0ce..ff243bc21 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.0-rc.1",
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index ca3c0b70b..ede5da738 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index e9ec9b10a..40fd9b7d0 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.0-rc.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 40483a12e..9847530df 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index dd5c3b4e9..60c8161f5 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index c587676b9..fe4e920e6 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 57963494e..f1323487f 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.0.0-rc.1",
     "@astrojs/svelte": "^4.0.0-rc.2",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 6e64d357d..ec2f05f19 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.5.0-rc.1",
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 118d5b9c4..9b5755a76 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^3.0.0-rc.1",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "hast-util-select": "^5.0.5",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.1.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index f9985d921..0b8a2fdd9 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7"
+    "astro": "^3.0.0-rc.8"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 34c4a1468..1bd17a990 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^1.0.0-rc.2",
     "@astrojs/preact": "^3.0.0-rc.2",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index cc2e091f4..bb834f862 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.0-rc.2",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "nanostores": "^0.9.3",
     "preact": "^10.17.1"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index dacee74f5..7060689ec 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^1.0.0-rc.2",
     "@astrojs/tailwind": "^5.0.0-rc.1",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.6.0",
     "postcss": "^8.4.28",
diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
index 10dbf74a3..d35f6d0ea 100644
--- a/examples/with-vite-plugin-pwa/package.json
+++ b/examples/with-vite-plugin-pwa/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "vite-plugin-pwa": "0.16.4",
     "workbox-window": "^7.0.0"
   }
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 22e991a19..e9bdc37fa 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^3.0.0-rc.7",
+    "astro": "^3.0.0-rc.8",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 50ab4c1f2..31fc6ba53 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 3.0.0-rc.8
+
+### Patch Changes
+
+- [#8251](https://github.com/withastro/astro/pull/8251) [`46c4c0e05`](https://github.com/withastro/astro/commit/46c4c0e053f830585b9ef229ce1c259df00a80f8) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Adds a link to the error reference in the CLI when an error occurs
+
+- [#8253](https://github.com/withastro/astro/pull/8253) [`1048aca55`](https://github.com/withastro/astro/commit/1048aca550769415e528016e42b358ffbfd44b61) Thanks [@matthewp](https://github.com/matthewp)! - Fix, lazily initialize ResponseWithEncoding
+
+- [#8229](https://github.com/withastro/astro/pull/8229) [`ffc9e2d3d`](https://github.com/withastro/astro/commit/ffc9e2d3de46049bf3d82140ef018f524fb03187) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Paginate will now return exact types instead of a naive Record
+
+- [#8237](https://github.com/withastro/astro/pull/8237) [`3674584e0`](https://github.com/withastro/astro/commit/3674584e02b161a698b429ceb66723918fdc56ac) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix `astro check` not finding the `@astrojs/check` package
+
 ## 3.0.0-rc.7
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index fc7d48d6e..61788e4c5 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.0-rc.7",
+  "version": "3.0.0-rc.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 0d55924ab..ff4afbf31 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -45,7 +45,7 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/CHANGELOG.md b/packages/integrations/deno/CHANGELOG.md
index 90116b7c8..4d7cacb82 100644
--- a/packages/integrations/deno/CHANGELOG.md
+++ b/packages/integrations/deno/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/deno
 
+## 5.0.0-rc.2
+
+### Patch Changes
+
+- [#8245](https://github.com/withastro/astro/pull/8245) [`ed39fbf16`](https://github.com/withastro/astro/commit/ed39fbf168f7a30c4fbf5b5618b70146ce5d5b3e) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - TypeScript users now get better suggestions when configuring the Deno adapter.
+
+- Updated dependencies [[`46c4c0e05`](https://github.com/withastro/astro/commit/46c4c0e053f830585b9ef229ce1c259df00a80f8), [`1048aca55`](https://github.com/withastro/astro/commit/1048aca550769415e528016e42b358ffbfd44b61), [`ffc9e2d3d`](https://github.com/withastro/astro/commit/ffc9e2d3de46049bf3d82140ef018f524fb03187), [`3674584e0`](https://github.com/withastro/astro/commit/3674584e02b161a698b429ceb66723918fdc56ac)]:
+  - astro@3.0.0-rc.8
+
 ## 5.0.0-rc.1
 
 ### Major Changes
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index bf492b841..04bdd4c1c 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/deno",
   "description": "Deploy your site to a Deno server",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -36,7 +36,7 @@
     "esbuild": "^0.19.2"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index e9a015d8a..e1a743b1d 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -75,7 +75,7 @@
     "zod": "3.21.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "workspace:*",
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index e8fdb6a83..d6b10b8ac 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -54,7 +54,7 @@
     "vfile": "^5.3.7"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index 300deccda..94a5d6728 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -43,7 +43,7 @@
     "esbuild": "^0.19.2"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "@netlify/edge-functions": "^2.0.0",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 16956259d..4b9c0e64c 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -37,7 +37,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "@types/node": "^18.17.8",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 2278f3299..82269986f 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -48,7 +48,7 @@
     "vite": "^4.4.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7",
+    "astro": "workspace:^3.0.0-rc.8",
     "svelte": "^3.55.0 || ^4.0.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index b446b4f65..371fd51c6 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -43,7 +43,7 @@
     "vite": "^4.4.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7",
+    "astro": "workspace:^3.0.0-rc.8",
     "tailwindcss": "^3.0.24"
   }
 }
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 3bc6755cc..ff776c9d7 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @astrojs/vercel
 
+## 4.0.0-rc.5
+
+### Major Changes
+
+- [#8239](https://github.com/withastro/astro/pull/8239) [`52f0837bd`](https://github.com/withastro/astro/commit/52f0837bdeca0b54e07cbf76a7570bd042b98922) Thanks [@matthewp](https://github.com/matthewp)! - Vercel adapter now defaults to `functionPerRoute`.
+
+  With this change, `@astrojs/vercel/serverless` now splits each route into its own function. By doing this, the size of each function is reduced and startup time is faster.
+
+  You can disable this option, which will cause the code to be bundled into a single function, by setting `functionPerRoute` to `false`.
+
+### Patch Changes
+
+- Updated dependencies [[`46c4c0e05`](https://github.com/withastro/astro/commit/46c4c0e053f830585b9ef229ce1c259df00a80f8), [`1048aca55`](https://github.com/withastro/astro/commit/1048aca550769415e528016e42b358ffbfd44b61), [`ffc9e2d3d`](https://github.com/withastro/astro/commit/ffc9e2d3de46049bf3d82140ef018f524fb03187), [`3674584e0`](https://github.com/withastro/astro/commit/3674584e02b161a698b429ceb66723918fdc56ac)]:
+  - astro@3.0.0-rc.8
+
 ## 4.0.0-rc.4
 
 ### Major Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 726f6f9d4..fd0f745ca 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/vercel",
   "description": "Deploy your site to Vercel",
-  "version": "4.0.0-rc.4",
+  "version": "4.0.0-rc.5",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "web-vitals": "^3.4.0"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7"
+    "astro": "workspace:^3.0.0-rc.8"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.3",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 572b076a8..4edafd274 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -56,7 +56,7 @@
     "vue": "^3.3.4"
   },
   "peerDependencies": {
-    "astro": "workspace:^3.0.0-rc.7",
+    "astro": "workspace:^3.0.0-rc.8",
     "vue": "^3.2.30"
   },
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 83f842804..528e2062a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,23 +140,23 @@ importers:
         specifier: ^3.0.0-rc.1
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/deno:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
     devDependencies:
       '@astrojs/deno':
-        specifier: ^5.0.0-rc.1
+        specifier: ^5.0.0-rc.2
         version: link:../../packages/integrations/deno
 
   examples/framework-alpine:
@@ -171,7 +171,7 @@ importers:
         specifier: ^3.12.3
         version: 3.12.3
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -183,7 +183,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -207,7 +207,7 @@ importers:
         specifier: ^3.0.0-rc.1
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -237,7 +237,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.17.1)
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -255,7 +255,7 @@ importers:
         specifier: ^18.2.7
         version: 18.2.7
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -270,7 +270,7 @@ importers:
         specifier: ^3.0.0-rc.3
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.7.11
@@ -282,7 +282,7 @@ importers:
         specifier: ^4.0.0-rc.2
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.0
@@ -294,7 +294,7 @@ importers:
         specifier: ^3.0.0-rc.1
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.4
@@ -306,13 +306,13 @@ importers:
         specifier: ^6.0.0-rc.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/middleware:
@@ -321,7 +321,7 @@ importers:
         specifier: ^6.0.0-rc.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -330,19 +330,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/ssr:
@@ -354,7 +354,7 @@ importers:
         specifier: ^4.0.0-rc.2
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.0
@@ -366,7 +366,7 @@ importers:
         specifier: ^0.5.0-rc.1
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -375,7 +375,7 @@ importers:
         specifier: ^3.0.0-rc.1
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^5.0.5
@@ -396,7 +396,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -408,7 +408,7 @@ importers:
         specifier: ^3.0.0-rc.2
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -423,7 +423,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.3)(preact@10.17.1)
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.3
@@ -444,7 +444,7 @@ importers:
         specifier: ^1.6.0
         version: 1.6.0
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -462,7 +462,7 @@ importers:
   examples/with-vite-plugin-pwa:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       vite-plugin-pwa:
         specifier: 0.16.4
@@ -474,7 +474,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^3.0.0-rc.7
+        specifier: ^3.0.0-rc.8
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 1db4e92c12ed73681217f5cefd39f2f47542f961 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Mon, 28 Aug 2023 14:41:00 -0400
Subject: [PATCH 08/10]  Allow fallback animations on html element (#8258)

* Allow fallback animations on html element

* Add fallback attr after swap

* Break apart addModern and addFallback into separate functions
---
 .changeset/strong-needles-accept.md           |  5 +++++
 .../astro/components/ViewTransitions.astro    | 14 +++----------
 .../astro/src/runtime/server/transition.ts    | 21 +++++++++++++++----
 3 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/strong-needles-accept.md

diff --git a/.changeset/strong-needles-accept.md b/.changeset/strong-needles-accept.md
new file mode 100644
index 000000000..4546d988b
--- /dev/null
+++ b/.changeset/strong-needles-accept.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Allow fallback animations on html element
diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
index 7fa336768..33741d535 100644
--- a/packages/astro/components/ViewTransitions.astro
+++ b/packages/astro/components/ViewTransitions.astro
@@ -220,23 +220,15 @@ const { fallback = 'animate' } = Astro.props as Props;
 		links.length && (await Promise.all(links));
 
 		if (fallback === 'animate') {
-			let isAnimating = false;
-			addEventListener('animationstart', () => (isAnimating = true), { once: true });
-
 			// Trigger the animations
 			document.documentElement.dataset.astroTransitionFallback = 'old';
+			const finished = Promise.all(document.getAnimations().map(a => a.finished));
 			const fallbackSwap = () => {
-				removeEventListener('animationend', fallbackSwap);
-				clearTimeout(timeout);
 				swap();
 				document.documentElement.dataset.astroTransitionFallback = 'new';
 			};
-			// If there are any animations, want for the animationend event.
-			addEventListener('animationend', fallbackSwap, { once: true });
-			// If there are no animations, go ahead and swap on next tick
-			// This is necessary because we do not know if there are animations.
-			// The setTimeout is a fallback in case there are none.
-			let timeout = setTimeout(() => !isAnimating && fallbackSwap());
+			await finished;
+			fallbackSwap();
 		} else {
 			swap();
 		}
diff --git a/packages/astro/src/runtime/server/transition.ts b/packages/astro/src/runtime/server/transition.ts
index 88a41d9ae..4a13c8126 100644
--- a/packages/astro/src/runtime/server/transition.ts
+++ b/packages/astro/src/runtime/server/transition.ts
@@ -52,7 +52,8 @@ export function renderTransition(
 			}
 		}
 	} else if (animationName === 'none') {
-		sheet.addAnimationRaw('old', 'animation: none; opacity: 0; mix-blend-mode: normal;');
+		sheet.addFallback('old', 'animation: none; mix-blend-mode: normal;');
+		sheet.addModern('old', 'animation: none; opacity: 0; mix-blend-mode: normal;');
 		sheet.addAnimationRaw('new', 'animation: none; mix-blend-mode: normal;');
 	}
 
@@ -88,11 +89,22 @@ class ViewTransitionStyleSheet {
 	}
 
 	addAnimationRaw(image: 'old' | 'new' | 'group', animation: string) {
-		const { scope, name } = this;
+		this.addModern(image, animation);
+		this.addFallback(image, animation);
+	}
+
+	addModern(image: 'old' | 'new' | 'group', animation: string) {
+		const { name } = this;
 		this.addRule('modern', `::view-transition-${image}(${name}) { ${animation} }`);
+	}
+
+	addFallback(image: 'old' | 'new' | 'group', animation: string) {
+		const { scope } = this;
 		this.addRule(
 			'fallback',
-			`[data-astro-transition-fallback="${image}"] [data-astro-transition-scope="${scope}"] { ${animation} }`
+			// Two selectors here, the second in case there is an animation on the root.
+			`[data-astro-transition-fallback="${image}"] [data-astro-transition-scope="${scope}"],
+			[data-astro-transition-fallback="${image}"][data-astro-transition-scope="${scope}"] { ${animation} }`
 		);
 	}
 
@@ -107,7 +119,8 @@ class ViewTransitionStyleSheet {
 		this.addRule('modern', `${prefix}::view-transition-${image}(${name}) { ${animation} }`);
 		this.addRule(
 			'fallback',
-			`${prefix}[data-astro-transition-fallback="${image}"] [data-astro-transition-scope="${scope}"] { ${animation} }`
+			`${prefix}[data-astro-transition-fallback="${image}"] [data-astro-transition-scope="${scope}"],
+			${prefix}[data-astro-transition-fallback="${image}"][data-astro-transition-scope="${scope}"] { ${animation} }`
 		);
 	}
 }

From 0c7b42dc6780e687e416137539f55a3a427d1d10 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Mon, 28 Aug 2023 16:03:01 -0500
Subject: [PATCH 09/10] Update telemetry notice (#8234)

* chore: enable telemetry notice

* chore: update telemetry date, notify

* chore(telemetry): refactor telemetry notices

* chore: add changeset

* chore: improve debugging

* chore: update debug

* fix: logical error

* chore(lint): remove unused input

* chore: improve telemetry debug

* chore: improve telemetry tests

* chore: allow isCI to be stubbed

* chore: stub process.env

* chore: stub process.env

* chore: add env to class

* chore: act like we're not on CI

* test: didn't commit the env stub properly

* chore: tweak wording
---
 .changeset/breezy-books-notice.md         |  6 ++
 packages/astro/src/cli/index.ts           | 13 ++--
 packages/astro/src/cli/telemetry/index.ts |  7 ++
 packages/astro/src/core/messages.ts       | 28 ++++----
 packages/telemetry/src/index.ts           | 35 +++++++---
 packages/telemetry/test/index.test.js     | 78 ++++++++++++++++++++++-
 6 files changed, 133 insertions(+), 34 deletions(-)
 create mode 100644 .changeset/breezy-books-notice.md

diff --git a/.changeset/breezy-books-notice.md b/.changeset/breezy-books-notice.md
new file mode 100644
index 000000000..586b405ea
--- /dev/null
+++ b/.changeset/breezy-books-notice.md
@@ -0,0 +1,6 @@
+---
+'@astrojs/telemetry': patch
+'astro': patch
+---
+
+Update telemetry notice
diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts
index fdf43201f..0421258a5 100644
--- a/packages/astro/src/cli/index.ts
+++ b/packages/astro/src/cli/index.ts
@@ -109,6 +109,11 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 			await update(subcommand, { flags });
 			return;
 		}
+		case 'sync': {
+			const { sync } = await import('./sync/index.js');
+			const exitCode = await sync({ flags });
+			return process.exit(exitCode);
+		}
 	}
 
 	// In verbose/debug mode, we log the debug logs asap before any potential errors could appear
@@ -122,6 +127,9 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 		process.env.NODE_ENV = cmd === 'dev' ? 'development' : 'production';
 	}
 
+	const { notify } = await import('./telemetry/index.js');
+	await notify();
+
 	// These commands uses the logging and user config. All commands are assumed to have been handled
 	// by the end of this switch statement.
 	switch (cmd) {
@@ -161,11 +169,6 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 				return process.exit(checkServer ? 1 : 0);
 			}
 		}
-		case 'sync': {
-			const { sync } = await import('./sync/index.js');
-			const exitCode = await sync({ flags });
-			return process.exit(exitCode);
-		}
 	}
 
 	// No command handler matched! This is unexpected.
diff --git a/packages/astro/src/cli/telemetry/index.ts b/packages/astro/src/cli/telemetry/index.ts
index 5ff71f5bf..1c9703a9c 100644
--- a/packages/astro/src/cli/telemetry/index.ts
+++ b/packages/astro/src/cli/telemetry/index.ts
@@ -7,6 +7,13 @@ interface TelemetryOptions {
 	flags: yargs.Arguments;
 }
 
+export async function notify() {
+	await telemetry.notify(() => {
+		console.log(msg.telemetryNotice() + '\n');
+		return true;
+	})
+}
+
 export async function update(subcommand: string, { flags }: TelemetryOptions) {
 	const isValid = ['enable', 'disable', 'reset'].includes(subcommand);
 
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index d0c5a5e88..9feecb26a 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -1,4 +1,3 @@
-import boxen from 'boxen';
 import {
 	bgCyan,
 	bgGreen,
@@ -107,34 +106,29 @@ export function serverStart({
 }
 
 export function telemetryNotice() {
-	const headline = yellow(`Astro now collects ${bold('anonymous')} usage data.`);
-	const why = `This ${bold('optional program')} will help shape our roadmap.`;
-	const more = `For more info, visit ${underline('https://astro.build/telemetry')}`;
-	const box = boxen([headline, why, '', more].join('\n'), {
-		margin: 0,
-		padding: 1,
-		borderStyle: 'round',
-		borderColor: 'yellow',
-	});
-	return box;
+	const headline = `${cyan('◆')} Astro collects completely anonymous usage data.`;
+	const why = dim('  This optional program helps shape our roadmap.')
+	const disable = dim('  Run `npm run astro telemetry disable` to opt-out.');
+	const details = `  Details: ${underline('https://astro.build/telemetry')}`;
+	return [headline, why, disable, details].map(v => '  ' + v).join('\n');
 }
 
 export function telemetryEnabled() {
-	return `\n  ${green('◉')} Anonymous telemetry is ${bgGreen(
+	return `${green('◉')} Anonymous telemetry is now ${bgGreen(
 		black(' enabled ')
-	)}. Thank you for improving Astro!\n`;
+	)}\n  ${dim('Thank you for improving Astro!')}\n`;
 }
 
 export function telemetryDisabled() {
-	return `\n  ${yellow('◯')}  Anonymous telemetry is ${bgYellow(
+	return `${yellow('◯')} Anonymous telemetry is now ${bgYellow(
 		black(' disabled ')
-	)}. We won't share any usage data.\n`;
+	)}\n  ${dim('We won\'t ever record your usage data.')}\n`;
 }
 
 export function telemetryReset() {
-	return `\n  ${cyan('◆')} Anonymous telemetry has been ${bgCyan(
+	return `${cyan('◆')} Anonymous telemetry has been ${bgCyan(
 		black(' reset ')
-	)}. You may be prompted again.\n`;
+	)}\n  ${dim('You may be prompted again.')}\n`;
 }
 
 export function fsStrictWarning() {
diff --git a/packages/telemetry/src/index.ts b/packages/telemetry/src/index.ts
index 3d08cd529..b63ff9c23 100644
--- a/packages/telemetry/src/index.ts
+++ b/packages/telemetry/src/index.ts
@@ -10,6 +10,9 @@ import { getSystemInfo, type SystemInfo } from './system-info.js';
 export type AstroTelemetryOptions = { astroVersion: string; viteVersion: string };
 export type TelemetryEvent = { eventName: string; payload: Record<string, any> };
 
+// In the event of significant policy changes, update this!
+const VALID_TELEMETRY_NOTICE_DATE = '2023-08-25';
+
 type EventMeta = SystemInfo;
 interface EventContext extends ProjectInfo {
 	anonymousId: string;
@@ -20,6 +23,8 @@ export class AstroTelemetry {
 	private _anonymousProjectInfo: ProjectInfo | undefined;
 	private config = new GlobalConfig({ name: 'astro' });
 	private debug = debug('astro:telemetry');
+	private isCI = isCI;
+	private env = process.env;
 
 	private get astroVersion() {
 		return this.opts.astroVersion;
@@ -28,10 +33,10 @@ export class AstroTelemetry {
 		return this.opts.viteVersion;
 	}
 	private get ASTRO_TELEMETRY_DISABLED() {
-		return process.env.ASTRO_TELEMETRY_DISABLED;
+		return this.env.ASTRO_TELEMETRY_DISABLED;
 	}
 	private get TELEMETRY_DISABLED() {
-		return process.env.TELEMETRY_DISABLED;
+		return this.env.TELEMETRY_DISABLED;
 	}
 
 	constructor(private opts: AstroTelemetryOptions) {
@@ -47,7 +52,7 @@ export class AstroTelemetry {
 	 */
 	private getConfigWithFallback<T>(key: string, getValue: () => T): T {
 		const currentValue = this.config.get(key);
-		if (currentValue) {
+		if (currentValue !== undefined) {
 			return currentValue;
 		}
 		const newValue = getValue();
@@ -75,7 +80,7 @@ export class AstroTelemetry {
 
 	private get anonymousProjectInfo(): ProjectInfo {
 		// NOTE(fks): this value isn't global, so it can't use getConfigWithFallback().
-		this._anonymousProjectInfo = this._anonymousProjectInfo || getProjectInfo(isCI);
+		this._anonymousProjectInfo = this._anonymousProjectInfo || getProjectInfo(this.isCI);
 		return this._anonymousProjectInfo;
 	}
 
@@ -94,19 +99,29 @@ export class AstroTelemetry {
 		return this.config.clear();
 	}
 
-	async notify(callback: () => Promise<boolean>) {
-		if (this.isDisabled || isCI) {
+	isValidNotice() {
+		if (!this.notifyDate) return false;
+		const current = Number(this.notifyDate);
+		const valid = new Date(VALID_TELEMETRY_NOTICE_DATE).valueOf();
+
+		return current > valid;
+	}
+
+	async notify(callback: () => boolean | Promise<boolean>) {
+		if (this.isDisabled || this.isCI) {
+			this.debug(`[notify] telemetry has been disabled`);
 			return;
 		}
 		// The end-user has already been notified about our telemetry integration!
 		// Don't bother them about it again.
-		// In the event of significant changes, we should invalidate old dates.
-		if (this.notifyDate) {
+		if (this.isValidNotice()) {
+			this.debug(`[notify] last notified on ${this.notifyDate}`)
 			return;
 		}
 		const enabled = await callback();
-		this.config.set(KEY.TELEMETRY_NOTIFY_DATE, Date.now().toString());
+		this.config.set(KEY.TELEMETRY_NOTIFY_DATE, new Date().valueOf().toString());
 		this.config.set(KEY.TELEMETRY_ENABLED, enabled);
+		this.debug(`[notify] telemetry has been ${enabled ? 'enabled' : 'disabled'}`)
 	}
 
 	async record(event: TelemetryEvent | TelemetryEvent[] = []) {
@@ -117,7 +132,7 @@ export class AstroTelemetry {
 
 		// Skip recording telemetry if the feature is disabled
 		if (this.isDisabled) {
-			this.debug('telemetry disabled');
+			this.debug('[record] telemetry has been disabled');
 			return Promise.resolve();
 		}
 
diff --git a/packages/telemetry/test/index.test.js b/packages/telemetry/test/index.test.js
index 29ade53f9..a8929329e 100644
--- a/packages/telemetry/test/index.test.js
+++ b/packages/telemetry/test/index.test.js
@@ -1,9 +1,83 @@
 import { expect } from 'chai';
 import { AstroTelemetry } from '../dist/index.js';
 
-describe('AstroTelemetry', () => {
+function setup() {
+	const config = new Map();
+	const telemetry = new AstroTelemetry({ version: '0.0.0-test.1' });
+	const logs = [];
+	// Stub isCI to false so we can test user-facing behavior
+	telemetry.isCI = false;
+	// Stub process.env to properly test in Astro's own CI
+	telemetry.env = {};
+	// Override config so we can inspect it
+	telemetry.config = config;
+	// Override debug so we can inspect it
+	telemetry.debug.enabled = true;
+	telemetry.debug.log = (...args) => logs.push(args);
+
+	return { telemetry, config, logs }
+}
+describe('AstroTelemetry', () => {	
+	let oldCI;
+	before(() => {
+		oldCI = process.env.CI;
+		// Stub process.env.CI to `false`
+		process.env.CI = 'false';
+	})
+	after(() => {
+		process.env.CI = oldCI;
+	})
 	it('initializes when expected arguments are given', () => {
-		const telemetry = new AstroTelemetry({ version: '0.0.0-test.1' });
+		const { telemetry } = setup();
 		expect(telemetry).to.be.instanceOf(AstroTelemetry);
 	});
+	it('does not record event if disabled', async () => {
+		const { telemetry, config, logs } = setup();
+		telemetry.setEnabled(false);
+		const [key] = Array.from(config.keys());
+		expect(key).not.to.be.undefined;
+		expect(config.get(key)).to.be.false;
+		expect(telemetry.enabled).to.be.false;
+		expect(telemetry.isDisabled).to.be.true;
+		const result = await telemetry.record(['TEST']);
+		expect(result).to.be.undefined;
+		const [log] = logs;
+		expect(log).not.to.be.undefined;
+		expect(logs.join('')).to.match(/disabled/);
+	});
+	it('records event if enabled', async () => {
+		const { telemetry, config, logs } = setup();
+		telemetry.setEnabled(true);
+		const [key] = Array.from(config.keys());
+		expect(key).not.to.be.undefined;
+		expect(config.get(key)).to.be.true;
+		expect(telemetry.enabled).to.be.true;
+		expect(telemetry.isDisabled).to.be.false;
+		await telemetry.record(['TEST']);
+		expect(logs.length).to.equal(2);
+	});
+	it('respects disable from notify', async () => {
+		const { telemetry, config, logs } = setup();
+		await telemetry.notify(() => false);
+		const [key] = Array.from(config.keys());
+		expect(key).not.to.be.undefined;
+		expect(config.get(key)).to.be.false;
+		expect(telemetry.enabled).to.be.false;
+		expect(telemetry.isDisabled).to.be.true;
+		const [log] = logs;
+		expect(log).not.to.be.undefined;
+		expect(logs.join('')).to.match(/disabled/);
+	});
+	it('respects enable from notify', async () => {
+		const { telemetry, config, logs } = setup();
+		await telemetry.notify(() => true);
+		const [key] = Array.from(config.keys());
+		expect(key).not.to.be.undefined;
+		expect(config.get(key)).to.be.true;
+		expect(telemetry.enabled).to.be.true;
+		expect(telemetry.isDisabled).to.be.false;
+		const [log] = logs;
+		expect(log).not.to.be.undefined;
+		expect(logs.join('')).to.match(/enabled/);
+	});
 });

From 04fa5a14536aca01dbf545f972b9883797730535 Mon Sep 17 00:00:00 2001
From: natemoo-re <natemoo-re@users.noreply.github.com>
Date: Mon, 28 Aug 2023 21:05:20 +0000
Subject: [PATCH 10/10] [ci] format

---
 packages/astro/src/cli/telemetry/index.ts |  2 +-
 packages/astro/src/core/messages.ts       | 22 +++++++++++-----------
 packages/telemetry/src/index.ts           |  4 ++--
 packages/telemetry/test/index.test.js     |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/astro/src/cli/telemetry/index.ts b/packages/astro/src/cli/telemetry/index.ts
index 1c9703a9c..b702a5baa 100644
--- a/packages/astro/src/cli/telemetry/index.ts
+++ b/packages/astro/src/cli/telemetry/index.ts
@@ -11,7 +11,7 @@ export async function notify() {
 	await telemetry.notify(() => {
 		console.log(msg.telemetryNotice() + '\n');
 		return true;
-	})
+	});
 }
 
 export async function update(subcommand: string, { flags }: TelemetryOptions) {
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index 9feecb26a..974bf79bf 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -107,28 +107,28 @@ export function serverStart({
 
 export function telemetryNotice() {
 	const headline = `${cyan('◆')} Astro collects completely anonymous usage data.`;
-	const why = dim('  This optional program helps shape our roadmap.')
+	const why = dim('  This optional program helps shape our roadmap.');
 	const disable = dim('  Run `npm run astro telemetry disable` to opt-out.');
 	const details = `  Details: ${underline('https://astro.build/telemetry')}`;
-	return [headline, why, disable, details].map(v => '  ' + v).join('\n');
+	return [headline, why, disable, details].map((v) => '  ' + v).join('\n');
 }
 
 export function telemetryEnabled() {
-	return `${green('◉')} Anonymous telemetry is now ${bgGreen(
-		black(' enabled ')
-	)}\n  ${dim('Thank you for improving Astro!')}\n`;
+	return `${green('◉')} Anonymous telemetry is now ${bgGreen(black(' enabled '))}\n  ${dim(
+		'Thank you for improving Astro!'
+	)}\n`;
 }
 
 export function telemetryDisabled() {
-	return `${yellow('◯')} Anonymous telemetry is now ${bgYellow(
-		black(' disabled ')
-	)}\n  ${dim('We won\'t ever record your usage data.')}\n`;
+	return `${yellow('◯')} Anonymous telemetry is now ${bgYellow(black(' disabled '))}\n  ${dim(
+		"We won't ever record your usage data."
+	)}\n`;
 }
 
 export function telemetryReset() {
-	return `${cyan('◆')} Anonymous telemetry has been ${bgCyan(
-		black(' reset ')
-	)}\n  ${dim('You may be prompted again.')}\n`;
+	return `${cyan('◆')} Anonymous telemetry has been ${bgCyan(black(' reset '))}\n  ${dim(
+		'You may be prompted again.'
+	)}\n`;
 }
 
 export function fsStrictWarning() {
diff --git a/packages/telemetry/src/index.ts b/packages/telemetry/src/index.ts
index b63ff9c23..e103d2a16 100644
--- a/packages/telemetry/src/index.ts
+++ b/packages/telemetry/src/index.ts
@@ -115,13 +115,13 @@ export class AstroTelemetry {
 		// The end-user has already been notified about our telemetry integration!
 		// Don't bother them about it again.
 		if (this.isValidNotice()) {
-			this.debug(`[notify] last notified on ${this.notifyDate}`)
+			this.debug(`[notify] last notified on ${this.notifyDate}`);
 			return;
 		}
 		const enabled = await callback();
 		this.config.set(KEY.TELEMETRY_NOTIFY_DATE, new Date().valueOf().toString());
 		this.config.set(KEY.TELEMETRY_ENABLED, enabled);
-		this.debug(`[notify] telemetry has been ${enabled ? 'enabled' : 'disabled'}`)
+		this.debug(`[notify] telemetry has been ${enabled ? 'enabled' : 'disabled'}`);
 	}
 
 	async record(event: TelemetryEvent | TelemetryEvent[] = []) {
diff --git a/packages/telemetry/test/index.test.js b/packages/telemetry/test/index.test.js
index a8929329e..40afbe184 100644
--- a/packages/telemetry/test/index.test.js
+++ b/packages/telemetry/test/index.test.js
@@ -15,18 +15,18 @@ function setup() {
 	telemetry.debug.enabled = true;
 	telemetry.debug.log = (...args) => logs.push(args);
 
-	return { telemetry, config, logs }
+	return { telemetry, config, logs };
 }
-describe('AstroTelemetry', () => {	
+describe('AstroTelemetry', () => {
 	let oldCI;
 	before(() => {
 		oldCI = process.env.CI;
 		// Stub process.env.CI to `false`
 		process.env.CI = 'false';
-	})
+	});
 	after(() => {
 		process.env.CI = oldCI;
-	})
+	});
 	it('initializes when expected arguments are given', () => {
 		const { telemetry } = setup();
 		expect(telemetry).to.be.instanceOf(AstroTelemetry);