fix conflict

.changeset/chatty-rivers-camp.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/lit': patch
+---
+
+Only shim fetch if not already present

.changeset/curvy-beds-warn.md

@@ -0,0 +1,16 @@
+---
+'astro': major
+'@astrojs/prism': major
+'create-astro': major
+'@astrojs/mdx': minor
+'@astrojs/node': major
+'@astrojs/preact': major
+'@astrojs/react': major
+'@astrojs/solid-js': major
+'@astrojs/svelte': major
+'@astrojs/vercel': major
+'@astrojs/vue': major
+'@astrojs/telemetry': major
+---
+
+Remove support for Node 14. Minimum supported Node version is now >=16.12.0

.changeset/lemon-bobcats-kick.md

@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+Default preview host to `localhost` instead of `127.0.0.1`. This allows the static server and integration preview servers to serve under ipv6.

.changeset/lovely-worms-invite.md

@@ -1,8 +1,10 @@
 ---
 '@astrojs/deno': major
 '@astrojs/netlify': major
-'@astrojs/image': minor
+'@astrojs/image': major
 'astro': major
 ---
 
-Builds chunks into the `assets` folder. This simplifies configuring immutable caching with your adapter provider as all files are now in the same `assets` folder.
+**Breaking Change**: client assets are built to an `_astro` directory rather than the previous `assets` directory. This setting can now be controlled by the new `build` configuration option named `assets`.
+
+This should simplify configuring immutable caching with your adapter provider as all files are now in the same `_astro` directory.

.changeset/poor-chicken-film.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/markdown-remark': major
+---
+
+Drop support for legacy Astro-flavored Markdown

.changeset/six-carpets-talk.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Cleanup dependencies

.changeset/stupid-wolves-explain.md

@@ -0,0 +1,7 @@
+---
+'@astrojs/webapi': major
+---
+
+Replace node-fetch's polyfill with undici.
+
+Since `undici` does not support it, this change also removes custom support for the `file:` protocol

.changeset/thin-seahorses-worry.md

@@ -0,0 +1,16 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/deno': major
+'@astrojs/netlify': major
+'@astrojs/node': major
+'@astrojs/svelte': major
+'@astrojs/tailwind': major
+'@astrojs/vercel': major
+'@astrojs/vue': major
+'@astrojs/markdown-remark': major
+'@astrojs/image': minor
+---
+
+Make astro a peerDependency of integrations
+
+This marks `astro` as a peerDependency of several packages that are already getting `major` version bumps. This is so we can more properly track the dependency between them and what version of Astro they are being used with.

README.md

@@ -45,7 +45,7 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 | [create-astro](packages/create-astro)                   | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md)            |
 | [@astrojs/react](packages/integrations/react)           | [![astro version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md)           |
 | [@astrojs/preact](packages/integrations/preact)         | [![astro version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md)         |
-| [@astrojs/solid-js](packages/integrations/solid)        | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid-js/CHANGELOG.md)     |
+| [@astrojs/solid-js](packages/integrations/solid)        | [![astro version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md)     |
 | [@astrojs/svelte](packages/integrations/svelte)         | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md)         |
 | [@astrojs/vue](packages/integrations/vue)               | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md)               |
 | [@astrojs/lit](packages/integrations/lit)               | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md)               |

packages/astro-prism/package.json

@@ -35,6 +35,6 @@
     "@types/prismjs": "1.26.0"
   },
   "engines": {
-    "node": "^14.18.0 || >=16.12.0"
+    "node": ">=16.12.0"
   }
 }

packages/astro/astro.js

@@ -50,7 +50,7 @@ async function main() {
 	// it's okay to hard-code the valid Node versions here since they will not change over time.
 	if (typeof require === 'undefined') {
 		console.error(`\nNode.js v${version} is not supported by Astro!
-Please upgrade to a version of Node.js with complete ESM support: "^14.18.0 || >=16.12.0"\n`);
+Please upgrade to a supported version of Node.js: ">=16.12.0"\n`);
 	}
 
 	// Not supported: Report the most helpful error message possible.

packages/astro/package.json

@@ -121,7 +121,6 @@
     "@babel/traverse": "^7.18.2",
     "@babel/types": "^7.18.4",
     "@types/babel__core": "^7.1.19",
-    "@types/html-escaper": "^3.0.0",
     "@types/yargs-parser": "^21.0.0",
     "acorn": "^8.8.1",
     "boxen": "^6.2.1",
@@ -138,25 +137,18 @@
     "fast-glob": "^3.2.11",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
-    "html-entities": "^2.3.3",
     "html-escaper": "^3.0.3",
-    "import-meta-resolve": "^2.1.0",
     "kleur": "^4.1.4",
     "magic-string": "^0.27.0",
     "mime": "^3.0.0",
     "ora": "^6.1.0",
-    "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "postcss": "^8.4.14",
-    "postcss-load-config": "^3.1.4",
     "preferred-pm": "^3.0.3",
     "prompts": "^2.4.2",
-    "recast": "^0.20.5",
     "rehype": "^12.0.1",
-    "resolve": "^1.22.0",
     "semver": "^7.3.7",
+    "server-destroy": "^1.0.1",
     "shiki": "^0.11.1",
-    "sirv": "^2.0.2",
     "slash": "^4.0.0",
     "string-width": "^5.1.2",
     "strip-ansi": "^7.0.1",
@@ -171,7 +163,7 @@
     "zod": "^3.17.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.22.2",
+    "@playwright/test": "^1.29.2",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.17.1",
     "@types/chai": "^4.3.1",
@@ -182,23 +174,22 @@
     "@types/diff": "^5.0.2",
     "@types/estree": "^0.0.51",
     "@types/hast": "^2.3.4",
+    "@types/html-escaper": "^3.0.0",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^9.1.1",
-    "@types/parse5": "^6.0.3",
-    "@types/path-browserify": "^1.0.0",
     "@types/prettier": "^2.6.3",
     "@types/prompts": "^2.0.14",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
+    "@types/server-destroy": "^1.0.1",
     "@types/unist": "^2.0.6",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "eol": "^0.9.1",
     "memfs": "^3.4.7",
     "mocha": "^9.2.2",
-    "node-fetch": "^3.2.5",
     "node-mocks-http": "^1.11.0",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.0.1",
@@ -207,10 +198,11 @@
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
     "srcset-parse": "^1.1.0",
+    "undici": "^5.14.0",
     "unified": "^10.1.2"
   },
   "engines": {
-    "node": "^14.18.0 || >=16.12.0",
+    "node": ">=16.12.0",
     "npm": ">=6.14.0"
   }
 }

packages/astro/src/@types/astro.ts

@@ -586,6 +586,25 @@ export interface AstroUserConfig {
 		 * ```
 		 */
 		server?: string;
+		/**
+		 * @docs
+		 * @name build.assets
+		 * @type {string}
+		 * @default `'_astro'`
+		 * @see outDir
+		 * @version 2.0.0
+		 * @description
+		 * Specifies the directory in the build output where Astro-generated assets (bundled JS and CSS for example) should live.
+		 *
+		 * ```js
+		 * {
+		 *   build: {
+		 *     assets: '_custom'
+		 *   }
+		 * }
+		 * ```
+		 */
+		assets?: string;
 		/**
 		 * @docs
 		 * @name build.serverEntry

packages/astro/src/core/build/static-build.ts

@@ -2,7 +2,6 @@ import * as eslexer from 'es-module-lexer';
 import glob from 'fast-glob';
 import fs from 'fs';
 import { bgGreen, bgMagenta, black, dim } from 'kleur/colors';
-import path from 'path';
 import { fileURLToPath } from 'url';
 import * as vite from 'vite';
 import { astroBundleDelayedAssetPlugin } from '../../content/index.js';
@@ -11,8 +10,8 @@ import {
 	createBuildInternals,
 	eachPrerenderedPageData,
 } from '../../core/build/internal.js';
-import { emptyDir, removeDir } from '../../core/fs/index.js';
-import { prependForwardSlash } from '../../core/path.js';
+import { emptyDir, removeEmptyDirs } from '../../core/fs/index.js';
+import { appendForwardSlash, prependForwardSlash } from '../../core/path.js';
 import { isModeServerWithNoAdapter } from '../../core/util.js';
 import { runHookBuildSetup } from '../../integrations/index.js';
 import { PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
@@ -133,8 +132,10 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
 				input: [],
 				output: {
 					format: 'esm',
-					chunkFileNames: 'chunks/[name].[hash].mjs',
-					assetFileNames: 'assets/[name].[hash][extname]',
+					// Server chunks can't go in the assets (_astro) folder
+					// We need to keep these separate
+					chunkFileNames: `chunks/[name].[hash].mjs`,
+					assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
 					...viteConfig.build?.rollupOptions?.output,
 					entryFileNames: opts.buildConfig.serverEntry,
 				},
@@ -212,9 +213,9 @@ async function clientBuild(
 				input: Array.from(input),
 				output: {
 					format: 'esm',
-					entryFileNames: 'assets/[name].[hash].js',
-					chunkFileNames: 'assets/chunks/[name].[hash].js',
-					assetFileNames: 'assets/[name].[hash][extname]',
+					entryFileNames: `${settings.config.build.assets}/[name].[hash].js`,
+					chunkFileNames: `${settings.config.build.assets}/[name].[hash].js`,
+					assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
 					...viteConfig.build?.rollupOptions?.output,
 				},
 				preserveEntrySignatures: 'exports-only',
@@ -285,25 +286,8 @@ async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInter
 				await fs.promises.writeFile(url, value, { encoding: 'utf8' });
 			})
 		);
-		// Map directories heads from the .mjs files
-		const directories: Set<string> = new Set();
-		files.forEach((i) => {
-			const splitFilePath = i.split(path.sep);
-			// If the path is more than just a .mjs filename itself
-			if (splitFilePath.length > 1) {
-				directories.add(splitFilePath[0]);
-			}
-		});
-		// Attempt to remove only those folders which are empty
-		await Promise.all(
-			Array.from(directories).map(async (filename) => {
-				const url = new URL(filename, out);
-				const folder = await fs.promises.readdir(url);
-				if (!folder.length) {
-					await fs.promises.rm(url, { recursive: true, force: true });
-				}
-			})
-		);
+
+		removeEmptyDirs(out);
 	}
 }
 
@@ -321,28 +305,10 @@ async function cleanServerOutput(opts: StaticBuildOptions) {
 				await fs.promises.rm(url);
 			})
 		);
-		// Map directories heads from the .mjs files
-		const directories: Set<string> = new Set();
-		files.forEach((i) => {
-			const splitFilePath = i.split(path.sep);
-			// If the path is more than just a .mjs filename itself
-			if (splitFilePath.length > 1) {
-				directories.add(splitFilePath[0]);
-			}
-		});
-		// Attempt to remove only those folders which are empty
-		await Promise.all(
-			Array.from(directories).map(async (filename) => {
-				const url = new URL(filename, out);
-				const dir = await glob(fileURLToPath(url));
-				// Do not delete chunks/ directory!
-				if (filename === 'chunks') return;
-				if (!dir.length) {
-					await fs.promises.rm(url, { recursive: true, force: true });
-				}
-			})
-		);
+
+		removeEmptyDirs(out);
 	}
+
 	// Clean out directly if the outDir is outside of root
 	if (out.toString() !== opts.settings.config.outDir.toString()) {
 		// Copy assets before cleaning directory if outside root
@@ -374,22 +340,23 @@ async function ssrMoveAssets(opts: StaticBuildOptions) {
 	const serverRoot =
 		opts.settings.config.output === 'static' ? opts.buildConfig.client : opts.buildConfig.server;
 	const clientRoot = opts.buildConfig.client;
-	const serverAssets = new URL('./assets/', serverRoot);
-	const clientAssets = new URL('./assets/', clientRoot);
-	const files = await glob('assets/**/*', {
-		cwd: fileURLToPath(serverRoot),
+	const assets = opts.settings.config.build.assets;
+	const serverAssets = new URL(`./${assets}/`, appendForwardSlash(serverRoot.toString()));
+	const clientAssets = new URL(`./${assets}/`, appendForwardSlash(clientRoot.toString()));
+	const files = await glob(`**/*`, {
+		cwd: fileURLToPath(serverAssets),
 	});
 
 	if (files.length > 0) {
 		// Make the directory
 		await fs.promises.mkdir(clientAssets, { recursive: true });
 		await Promise.all(
 			files.map(async (filename) => {
-				const currentUrl = new URL(filename, serverRoot);
-				const clientUrl = new URL(filename, clientRoot);
+				const currentUrl = new URL(filename, appendForwardSlash(serverAssets.toString()));
+				const clientUrl = new URL(filename, appendForwardSlash(clientAssets.toString()));
 				return fs.promises.rename(currentUrl, clientUrl);
 			})
 		);
-		removeDir(serverAssets);
+		removeEmptyDirs(serverAssets);
 	}
 }