astro-vscode 2.17.1 → 2.17.2

package/package.json

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.17.1",
+  "version": "2.17.2",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -245,11 +245,10 @@
     "@vscode/test-cli": "^0.0.15",
     "@vscode/test-electron": "^3.1.0",
     "@vscode/vsce": "^4.0.0",
-    "esbuild": "^0.17.19",
-    "esbuild-plugin-copy": "^2.1.1",
     "kleur": "^4.1.5",
     "mocha": "^12.0.2",
     "ovsx": "^1.2.0",
+    "rolldown": "^1.2.11",
     "tsx": "^4.23.13",
     "vscode-languageclient": "^10.1.2",
     "vscode-tmgrammar-test": "^0.1.3",

package/scripts/build.mjs

@@ -1,78 +1,112 @@
 // @ts-check
 import fs from 'node:fs';
+import path from 'node:path';
 import { createRequire } from 'node:module';
-import esbuild from 'esbuild';
-import { copy } from 'esbuild-plugin-copy';
-import { rebuildPlugin } from './shared.mjs';
+import { rolldown, watch } from 'rolldown';
+import { logError, logUpdated } from './shared.mjs';
 
 const require = createRequire(import.meta.url);
 
-export default async function build() {
-	const isDev = process.argv.includes('--watch');
-	const metaFile = process.argv.includes('--metafile');
+const isDev = process.argv.includes('--watch');
+const minify = process.argv.includes('--minify');
+
+/**
+ * Resolve UMD builds of `vscode-*-languageservice` and `jsonc-parser` to their
+ * ESM counterparts.
+ * @returns {import('rolldown').Plugin}
+ */
+function umd2esm() {
+	return {
+		name: 'umd2esm',
+		resolveId(source, importer) {
+			if (/^(?:vscode-.*-languageservice|jsonc-parser)/.test(source)) {
+				const resolveDir = importer ? path.dirname(importer) : process.cwd();
+				const pathUmdMay = require.resolve(source, { paths: [resolveDir] });
+				// Call twice the replace is to solve the problem of the path in Windows
+				const pathEsm = pathUmdMay.replace('/umd/', '/esm/').replace('\\umd\\', '\\esm\\');
+				return pathEsm;
+			}
+		},
+	};
+}
 
-	/**
-	 * @satisfies {import('esbuild').BuildOptions}
-	 */
-	const config = {
-		entryPoints: {
-			'dist/node/client': './src/client.ts',
-			'dist/node/server': './node_modules/@astrojs/language-server/bin/nodeServer.js',
-			// We need to generate this inside node_modules so VS Code can resolve it
-			'node_modules/astro-ts-plugin-bundle/index':
-				'./node_modules/@astrojs/ts-plugin/dist/index.js',
+/**
+ * Copy the language server types into `dist/types` so VS Code can resolve them.
+ * @returns {import('rolldown').Plugin}
+ */
+function copyTypes() {
+	return {
+		name: 'astro:copy-types',
+		async writeBundle() {
+			await fs.promises.cp('../language-server/types', './dist/types', {
+				recursive: true,
+				filter: (src) => fs.statSync(src).isDirectory() || src.endsWith('.d.ts'),
+			});
 		},
-		bundle: true,
-		metafile: metaFile,
-		sourcemap: isDev,
-		outdir: '.',
+	};
+}
+
+/** @type {Record<string, string>} */
+const entries = {
+	'dist/node/client': './src/client.ts',
+	'dist/node/server': './node_modules/@astrojs/language-server/bin/nodeServer.js',
+	// We need to generate this inside node_modules so VS Code can resolve it
+	'node_modules/astro-ts-plugin-bundle/index': './node_modules/@astrojs/ts-plugin/dist/index.js',
+};
+
+/**
+ * Each entry is bundled on its own so shared code is inlined instead of emitted
+ * as extra chunks.
+ * @param {string} name
+ * @param {string} input
+ */
+function config(name, input) {
+	return {
+		input,
+		platform: /** @type {const} */ ('node'),
 		external: ['vscode', '@astrojs/astro2tsx', 'prettier', 'prettier-plugin-astro'],
-		format: 'cjs',
-		platform: 'node',
 		tsconfig: './tsconfig.json',
-		define: { 'process.env.NODE_ENV': '"production"' },
-		minify: process.argv.includes('--minify'),
-		plugins: [
-			copy({
-				resolveFrom: 'cwd',
-				assets: {
-					from: ['../language-server/types/**/*.d.ts'],
-					to: ['./dist/types'],
-					watch: isDev,
-				},
-			}),
-			{
-				name: 'umd2esm',
-				setup(pluginBuild) {
-					pluginBuild.onResolve(
-						{ filter: /^(vscode-.*-languageservice|jsonc-parser)/ },
-						(buildArgs) => {
-							const pathUmdMay = require.resolve(buildArgs.path, { paths: [buildArgs.resolveDir] });
-							// Call twice the replace is to solve the problem of the path in Windows
-							const pathEsm = pathUmdMay.replace('/umd/', '/esm/').replace('\\umd\\', '\\esm\\');
-							return { path: pathEsm };
-						},
-					);
-				},
-			},
-		],
+		transform: {
+			define: { 'process.env.NODE_ENV': '"production"' },
+		},
+		plugins: [copyTypes(), umd2esm()],
+		output: {
+			dir: '.',
+			format: /** @type {const} */ ('cjs'),
+			sourcemap: isDev,
+			minify,
+			codeSplitting: false,
+			entryFileNames: `${name}.js`,
+		},
 	};
+}
+
+export default async function build() {
+	const configs = Object.entries(entries).map(([name, input]) => config(name, input));
 
 	if (!isDev) {
-		const result = await esbuild.build(config);
-		if (metaFile) fs.writeFileSync('meta.json', JSON.stringify(result.metafile));
+		for (const options of configs) {
+			const bundle = await rolldown(options);
+			try {
+				await bundle.write(options.output);
+			} finally {
+				await bundle.close();
+			}
+		}
 		return;
 	}
 
-	const builder = await esbuild.context({
-		...config,
-		plugins: [rebuildPlugin, ...(config.plugins ?? [])],
+	const watcher = watch(configs);
+	watcher.on('event', (event) => {
+		if (event.code === 'ERROR') {
+			logError(event.error);
+		} else if (event.code === 'END') {
+			logUpdated();
+		}
 	});
 
-	await builder.watch();
-
 	process.on('beforeExit', () => {
-		void builder.dispose?.();
+		void watcher.close();
 	});
 }
 

package/scripts/shared.mjs

@@ -1,29 +1,21 @@
 // @ts-check
-import { dim, green, red, yellow } from 'kleur/colors';
+import { dim, green, red } from 'kleur/colors';
 
 const dt = new Intl.DateTimeFormat('en-us', {
 	hour: '2-digit',
 	minute: '2-digit',
 });
 
+export function logUpdated() {
+	console.info(dim(`[${dt.format(new Date())}] `) + green('✔ updated'));
+}
+
 /**
- * @type {import('esbuild').Plugin}
+ * @param {unknown} error
  */
-export const rebuildPlugin = {
-	name: 'astro:rebuild',
-	setup(build) {
-		build.onEnd(async (result) => {
-			const date = dt.format(new Date());
-			if (result && result.errors.length) {
-				console.error(dim(`[${date}] `) + red(result.errors.map((error) => error.text).join('\n')));
-			} else {
-				if (result.warnings.length) {
-					console.info(
-						dim(`[${date}] `) + yellow('⚠ updated with warnings:\n' + result.warnings.join('\n')),
-					);
-				}
-				console.info(dim(`[${date}] `) + green('✔ updated'));
-			}
-		});
-	},
-};
+export function logError(error) {
+	console.error(
+		dim(`[${dt.format(new Date())}] `) +
+			red(error instanceof Error ? error.message : String(error)),
+	);
+}