Merge branch 'main' into prerender_two

.changeset/breezy-coats-remember.md

@@ -0,0 +1,7 @@
+---
+'astro': patch
+'@astrojs/netlify': patch
+'@astrojs/node': patch
+---
+
+Updated Undici to 5.20.0. This fixes a security issue and handling of cookies in certain cases in dev

.changeset/eighty-rockets-crash.md

@@ -0,0 +1,6 @@
+---
+'@astrojs/netlify': patch
+'@astrojs/vercel': patch
+---
+
+Use .mjs extension when building to support CJS environments

.changeset/great-colts-accept.md

@@ -0,0 +1,5 @@
+---
+'create-astro': patch
+---
+
+Prompt for git initialization last, so all configurations can get added to the initial commit

.changeset/rare-pumpkins-end.md

@@ -0,0 +1,5 @@
+---
+'create-astro': patch
+---
+
+`create-astro` help info add `--typescript` flag

examples/blog/src/components/HeaderLink.astro

@@ -1,5 +1,7 @@
 ---
-export interface Props extends astroHTML.JSX.AnchorHTMLAttributes {}
+import type { HTMLAttributes } from 'astro/types';
+
+type Props = HTMLAttributes<'a'>;
 
 const { href, class: className, ...props } = Astro.props;
 

examples/docs/src/content/docs/en/introduction.md

@@ -20,6 +20,6 @@ This is the `docs` starter template. It contains all of the features that you ne
 
 To get started with this theme, check out the `README.md` in your new project directory. It provides documentation on how to use and customize this template for your own project. Keep the README around so that you can always refer back to it as you build.
 
-Found a missing feature that you can't live without? Please suggest it on Discord [(#ideas-and-suggestions channel)](https://astro.build/chat) and even consider adding it yourself on GitHub! Astro is an open source project and contributions from developers like you are how we grow!
+Found a missing feature that you can't live without? Please suggest it [on our Discord](https://astro.build/chat) and even consider adding it yourself on GitHub! Astro is an open source project and contributions from developers like you are how we grow!
 
 Good luck out there, Astronaut. 🧑‍🚀

packages/astro/package.json

@@ -188,7 +188,7 @@
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
     "srcset-parse": "^1.1.0",
-    "undici": "^5.14.0",
+    "undici": "^5.20.0",
     "unified": "^10.1.2"
   },
   "engines": {

packages/astro/src/vite-plugin-astro-server/response.ts

@@ -57,12 +57,6 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
 
 	const _headers = Object.fromEntries(headers.entries());
 
-	// Undici 5.19.1 includes a `getSetCookie` helper that returns an array of all the `set-cookies` headers.
-	// Previously, `headers.entries()` would already have those merged, but it seems like this isn't the case anymore, weird.
-	if ((headers as any)['getSetCookie']) {
-		_headers['set-cookie'] = (headers as any).getSetCookie();
-	}
-
 	// Attach any set-cookie headers added via Astro.cookies.set()
 	const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
 	if (setCookieHeaders.length) {

packages/create-astro/README.md

@@ -47,6 +47,7 @@ May be provided in place of prompts
 | `--no` (`-n`) | Skip all prompt by declining defaults. |
 | `--dry-run` | Walk through steps without executing. |
 | `--skip-houston` | Skip Houston animation. |
+| `--typescript <option>` | TypeScript option: `strict` / `strictest` / `relaxed`. |
 
 [examples]: https://github.com/withastro/astro/tree/main/examples
 [typescript]: https://github.com/withastro/astro/tree/main/packages/astro/tsconfigs

packages/create-astro/src/actions/help.ts

@@ -14,6 +14,7 @@ export function help() {
 				['--no (-n)', 'Skip all prompt by declining defaults.'],
 				['--dry-run', 'Walk through steps without executing.'],
 				['--skip-houston', 'Skip Houston animation.'],
+				['--typescript <option>', 'TypeScript option: strict | strictest | relaxed.'],
 			],
 		},
 	});

packages/create-astro/src/index.ts

@@ -29,7 +29,17 @@ export async function main() {
 		return;
 	}
 
-	const steps = [intro, projectName, template, dependencies, git, typescript, next];
+	const steps = [
+		intro,
+		projectName,
+		template,
+		dependencies,
+		typescript,
+
+		// Steps which write to files need to go above git
+		git,
+		next,
+	];
 
 	for (const step of steps) {
 		await step(ctx);

packages/integrations/netlify/package.json

@@ -30,7 +30,7 @@
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test-fn": "mocha --exit --timeout 20000 test/functions/",
-    "test-edge": "deno test --allow-run --allow-read --allow-net ./test/edge-functions/",
+    "test-edge": "deno test --allow-run --allow-read --allow-net --allow-env ./test/edge-functions/",
     "test": "npm run test-fn"
   },
   "dependencies": {

packages/integrations/netlify/src/integration-edge-functions.ts

@@ -122,7 +122,7 @@ export function netlifyEdgeFunctions({ dist }: NetlifyEdgeFunctionsOptions = {})
 					build: {
 						client: outDir,
 						server: new URL('./.netlify/edge-functions/', config.root),
-						serverEntry: 'entry.js',
+						serverEntry: 'entry.mjs',
 					},
 				});
 			},

packages/integrations/netlify/src/netlify-functions.ts

@@ -102,34 +102,11 @@ export const createExports = (manifest: SSRManifest, args: Args) => {
 			isBase64Encoded: responseIsBase64Encoded,
 		};
 
-		// Special-case set-cookie which has to be set an different way :/
-		// The fetch API does not have a way to get multiples of a single header, but instead concatenates
-		// them. There are non-standard ways to do it, and node-fetch gives us headers.raw()
-		// See https://github.com/whatwg/fetch/issues/973 for discussion
-		if (response.headers.has('set-cookie')) {
-			if ('raw' in response.headers) {
-				// Node fetch allows you to get the raw headers, which includes multiples of the same type.
-				// This is needed because Set-Cookie *must* be called for each cookie, and can't be
-				// concatenated together.
-				type HeadersWithRaw = Headers & {
-					raw: () => Record<string, string[]>;
-				};
-
-				const rawPacked = (response.headers as HeadersWithRaw).raw();
-				if ('set-cookie' in rawPacked) {
-					fnResponse.multiValueHeaders = {
-						'set-cookie': rawPacked['set-cookie'],
-					};
-				}
-			} else {
-				const cookies = response.headers.get('set-cookie');
-
-				if (cookies) {
-					fnResponse.multiValueHeaders = {
-						'set-cookie': Array.isArray(cookies) ? cookies : splitCookiesString(cookies),
-					};
-				}
-			}
+		const cookies = response.headers.get('set-cookie');
+		if (cookies) {
+			fnResponse.multiValueHeaders = {
+				'set-cookie': Array.isArray(cookies) ? cookies : splitCookiesString(cookies),
+			};
 		}
 
 		// Apply cookies set via Astro.cookies.set/delete

packages/integrations/netlify/test/edge-functions/fixtures/prerender/astro.config.mjs

@@ -0,0 +1,9 @@
+import { defineConfig } from 'astro/config';
+import { netlifyEdgeFunctions } from '@astrojs/netlify';
+
+export default defineConfig({
+	adapter: netlifyEdgeFunctions({
+		dist: new URL('./dist/', import.meta.url),
+	}),
+	output: 'server',
+})

packages/integrations/netlify/test/edge-functions/fixtures/prerender/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-netlify-prerender",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/netlify": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

packages/integrations/netlify/test/edge-functions/fixtures/prerender/src/pages/index.astro

@@ -0,0 +1,12 @@
+---
+export const prerender = true
+---
+
+<html>
+	<head>
+		<title>testing</title>
+	</head>
+	<body>
+		<h1>testing</h1>
+	</body>
+</html>

packages/integrations/netlify/test/edge-functions/prerender.test.ts

@@ -0,0 +1,18 @@
+// @ts-ignore
+import { runBuild } from './test-utils.ts';
+// @ts-ignore
+import { assertEquals } from './deps.ts';
+
+// @ts-ignore
+Deno.test({
+	name: 'Prerender',
+	async fn() {
+		let close = await runBuild('./fixtures/prerender/');
+		const { default: handler } = await import(
+			'./fixtures/prerender/.netlify/edge-functions/entry.mjs'
+		);
+		const response = await handler(new Request('http://example.com/index.html'));
+		assertEquals(response, undefined, 'No response because this is an asset');
+		await close();
+	},
+});

packages/integrations/node/package.json

@@ -46,6 +46,6 @@
     "cheerio": "^1.0.0-rc.11",
     "mocha": "^9.2.2",
     "node-mocks-http": "^1.11.0",
-    "undici": "^5.14.0"
+    "undici": "^5.20.0"
   }
 }

packages/integrations/vercel/src/serverless/adapter.ts

@@ -43,7 +43,7 @@ export default function vercelServerless({
 				updateConfig({
 					outDir,
 					build: {
-						serverEntry: 'entry.js',
+						serverEntry: 'entry.mjs',
 						client: new URL('./static/', outDir),
 						server: new URL('./dist/', config.root),
 					},

packages/integrations/vercel/test/fixtures/serverless-prerender/astro.config.mjs

@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/serverless';
+
+export default defineConfig({
+	adapter: vercel(),
+	output: 'server'
+});

packages/integrations/vercel/test/fixtures/serverless-prerender/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-serverless-prerender",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

packages/integrations/vercel/test/fixtures/serverless-prerender/src/pages/index.astro

@@ -0,0 +1,12 @@
+---
+export const prerender = true
+---
+
+<html>
+	<head>
+		<title>testing</title>
+	</head>
+	<body>
+		<h1>testing</h1>
+	</body>
+</html>

packages/integrations/vercel/test/serverless-prerender.test.js

@@ -0,0 +1,18 @@
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('Serverless prerender', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/serverless-prerender/',
+		});
+	});
+
+	it('build successful', async () => {
+		await fixture.build();
+		expect(fixture.readFile('/static/index.html')).to.be.ok;
+	});
+});

packages/telemetry/package.json

@@ -32,7 +32,7 @@
     "dset": "^3.1.2",
     "is-docker": "^3.0.0",
     "is-wsl": "^2.2.0",
-    "undici": "^5.14.0",
+    "undici": "^5.20.0",
     "which-pm-runs": "^1.1.0"
   },
   "devDependencies": {