From db5e8ad8aff7a62ba45182115a95054b73f42a7d Mon Sep 17 00:00:00 2001
From: Reuben Tier <64310361+TheOtterlord@users.noreply.github.com>
Date: Wed, 16 Aug 2023 18:52:40 +0100
Subject: [PATCH 1/3] Update build.inlineStylesheets docs (#8061)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Elian ☕️ <hello@elian.codes>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 packages/astro/src/@types/astro.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 4fa3048bd85d..e35ad48636a0 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -839,10 +839,10 @@ export interface AstroUserConfig {
 		 * @default `never`
 		 * @version 2.6.0
 		 * @description
-		 * Control whether styles are sent to the browser in a separate css file or inlined into `<style>` tags. Choose from the following options:
-		 *  - `'always'` - all styles are inlined into `<style>` tags
-		 *  - `'auto'` - only stylesheets smaller than `ViteConfig.build.assetsInlineLimit` (default: 4kb) are inlined. Otherwise, styles are sent in external stylesheets.
-		 *  - `'never'` - all styles are sent in external stylesheets
+		 * Control whether project styles are sent to the browser in a separate css file or inlined into `<style>` tags. Choose from the following options:
+		 *  - `'always'` - project styles are inlined into `<style>` tags
+		 *  - `'auto'` - only stylesheets smaller than `ViteConfig.build.assetsInlineLimit` (default: 4kb) are inlined. Otherwise, project styles are sent in external stylesheets.
+		 *  - `'never'` - project styles are sent in external stylesheets
 		 *
 		 * ```js
 		 * {

From 79d35bbb90444ac98f56d646bd557f330bf8399e Mon Sep 17 00:00:00 2001
From: Adam Heath <doogie@brainfood.com>
Date: Wed, 16 Aug 2023 12:57:00 -0500
Subject: [PATCH 2/3] Fix missing async/await in
 vite-plugin-integrations-container on astro:server:setup hook (#8104)

* All astro integrations hooks are defined as returning void|Promise, so
all calls need to deal with a possible async/await pattern.  One was
missed in vite-plugin-integrations-container.

This plugin is definitely used by the astro-dev when using a node
adapter, but I am not sure about other such scenarios.  I did a search
through the code base, and all other runHook* calls are properly
awaited.

* chore: make test async

---------

Co-authored-by: Nate Moore <nate@astro.build>
---
 .../astro/src/vite-plugin-integrations-container/index.ts   | 4 ++--
 .../test/fixtures/integration-server-setup/integration.js   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/vite-plugin-integrations-container/index.ts b/packages/astro/src/vite-plugin-integrations-container/index.ts
index d6bfd76d7621..6cc2da1528ad 100644
--- a/packages/astro/src/vite-plugin-integrations-container/index.ts
+++ b/packages/astro/src/vite-plugin-integrations-container/index.ts
@@ -16,9 +16,9 @@ export default function astroIntegrationsContainerPlugin({
 }): VitePlugin {
 	return {
 		name: 'astro:integration-container',
-		configureServer(server) {
+		async configureServer(server) {
 			if (server.config.isProduction) return;
-			runHookServerSetup({ config: settings.config, server, logging });
+			await runHookServerSetup({ config: settings.config, server, logging });
 		},
 		async buildStart() {
 			if (settings.injectedRoutes.length === settings.resolvedInjectedRoutes.length) return;
diff --git a/packages/astro/test/fixtures/integration-server-setup/integration.js b/packages/astro/test/fixtures/integration-server-setup/integration.js
index bcbd86228a89..f5000fa6bacd 100644
--- a/packages/astro/test/fixtures/integration-server-setup/integration.js
+++ b/packages/astro/test/fixtures/integration-server-setup/integration.js
@@ -1,8 +1,12 @@
+import { setTimeout } from "node:timers/promises";
+
 export default function() {
 	return {
 		name: '@astrojs/test-integration',
 		hooks: {
-			'astro:server:setup': ({ server }) => {
+			'astro:server:setup': async ({ server }) => {
+				// Ensure that `async` is respected
+				await setTimeout(100);
 				server.middlewares.use(
 					function middleware(req, res, next) {
 						res.setHeader('x-middleware', 'true');

From 42ed85b3e263bb5e28725395924d0b595e1e0041 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:28:57 -0500
Subject: [PATCH 3/3] Fix flaky Cloudflare test (#8103)

* chore: fix flaky CF test

* chore: increase wrangler timeout
---
 packages/integrations/cloudflare/test/cf.test.js             | 5 +----
 .../cloudflare/test/fixtures/cf/src/pages/index.astro        | 2 +-
 .../cloudflare/test/fixtures/runtime/src/pages/index.astro   | 2 +-
 packages/integrations/cloudflare/test/runtime.test.js        | 2 +-
 packages/integrations/cloudflare/test/test-utils.js          | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/integrations/cloudflare/test/cf.test.js b/packages/integrations/cloudflare/test/cf.test.js
index b671f41e9838..ec0e52c97e4d 100644
--- a/packages/integrations/cloudflare/test/cf.test.js
+++ b/packages/integrations/cloudflare/test/cf.test.js
@@ -31,10 +31,7 @@ describe('Cf metadata and caches', () => {
 		let html = await res.text();
 		let $ = cheerio.load(html);
 
-		expect($('#cf').text()).to.contain(
-			'city',
-			`Expected "city" to exist in runtime, but got ${$('#cf').text()}`
-		);
+		expect($('#hasRuntime').text()).to.equal('true');
 		expect($('#hasCache').text()).to.equal('true');
 	});
 });
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 c9e67bb05af4..6ba48e803213 100644
--- a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
@@ -8,7 +8,7 @@ const runtime = getRuntime(Astro.request);
 	</head>
 	<body>
 		<h1>Testing</h1>
-		<div id="cf">{JSON.stringify(runtime.cf)}</div>
+		<div id="hasRuntime">{!!runtime.cf?.colo}</div>
 		<div id="hasCache">{!!runtime.caches}</div>
 	</body>
 </html>
diff --git a/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
index 320e8e16243f..aa73ab8ea666 100644
--- a/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
@@ -8,8 +8,8 @@ const env = runtime.env;
 	</head>
 	<body>
 		<h1>Testing</h1>
-		<div id="cf">{JSON.stringify(runtime.cf)}</div>
 		<div id="env">{JSON.stringify(env)}</div>
+		<div id="hasRuntime">{!!runtime.cf?.colo}</div>
 		<div id="hasCache">{!!runtime.caches}</div>
 	</body>
 </html>
diff --git a/packages/integrations/cloudflare/test/runtime.test.js b/packages/integrations/cloudflare/test/runtime.test.js
index 17d813448ba0..be14718e8f4f 100644
--- a/packages/integrations/cloudflare/test/runtime.test.js
+++ b/packages/integrations/cloudflare/test/runtime.test.js
@@ -30,9 +30,9 @@ describe('Runtime Locals', () => {
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
-		expect($('#cf').text()).to.contain('city');
 		expect($('#env').text()).to.contain('SECRET_STUFF');
 		expect($('#env').text()).to.contain('secret');
+		expect($('#hasRuntime').text()).to.contain('true');
 		expect($('#hasCache').text()).to.equal('true');
 	});
 });
diff --git a/packages/integrations/cloudflare/test/test-utils.js b/packages/integrations/cloudflare/test/test-utils.js
index 61067c538263..36515f8316b4 100644
--- a/packages/integrations/cloudflare/test/test-utils.js
+++ b/packages/integrations/cloudflare/test/test-utils.js
@@ -48,7 +48,7 @@ export async function runCLI(basePath, { silent, port }) {
 	p.stderr.setEncoding('utf-8');
 	p.stdout.setEncoding('utf-8');
 
-	const timeout = 10_000;
+	const timeout = 20_000;
 
 	const ready = new Promise(async (resolve, reject) => {
 		const failed = setTimeout(() => {