chore: upgrade esbuild

vuejs · Oct 30, 2023 · 85a236c · 85a236c
1 parent 92cf193
commit 85a236c
Show file tree

Hide file tree

Showing 10 changed files with 945 additions and 731 deletions.
diff --git a/.npmrc b/.npmrc
diff --git a/extensions/vscode-typescript-plugin/package.json b/extensions/vscode-typescript-plugin/package.json
@@ -36,7 +36,7 @@
 		"release:next": "vsce publish --pre-release"
 	},
 	"devDependencies": {
-		"esbuild": "0.15.18",
+		"esbuild": "latest",
 		"typescript-vue-plugin": "1.8.22",
 		"vsce": "latest"
 	}

diff --git a/extensions/vscode-typescript-plugin/scripts/build.js b/extensions/vscode-typescript-plugin/scripts/build.js
@@ -1,4 +1,6 @@
-require('esbuild').build({
+// @ts-check
+
+require('esbuild').context({
 	entryPoints: ['./node_modules/typescript-vue-plugin/out/index.js'],
 	bundle: true,
 	outfile: './node_modules/typescript-vue-plugin-bundle/index.js',
@@ -10,7 +12,6 @@ require('esbuild').build({
 	platform: 'node',
 	tsconfig: './tsconfig.json',
 	minify: process.argv.includes('--minify'),
-	watch: process.argv.includes('--watch'),
 	plugins: [{
 		name: 'umd2esm',
 		setup(build) {
@@ -21,4 +22,14 @@ require('esbuild').build({
 			})
 		},
 	}],
-}).catch(() => process.exit(1))
+}).then(async ctx => {
+	console.log('building...');
+	if (process.argv.includes('--watch')) {
+		await ctx.watch();
+		console.log('watching...');
+	} else {
+		await ctx.rebuild();
+		await ctx.dispose();
+		console.log('finished.');
+	}
+})
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -740,7 +740,7 @@
 		"@volar/vscode": "~1.10.5",
 		"@vue/language-core": "1.8.22",
 		"@vue/language-server": "1.8.22",
-		"esbuild": "0.15.18",
+		"esbuild": "latest",
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",
 		"semver": "^7.5.4",

diff --git a/extensions/vscode/scripts/build.js b/extensions/vscode/scripts/build.js
@@ -1,7 +1,9 @@
+// @ts-check
+
 const path = require('path');
 const fs = require('fs');
 
-require('esbuild').build({
+require('esbuild').context({
 	entryPoints: {
 		client: './out/nodeClientMain.js',
 		server: './node_modules/@vue/language-server/out/nodeServer.js',
@@ -18,7 +20,6 @@ require('esbuild').build({
 	tsconfig: './tsconfig.json',
 	define: { 'process.env.NODE_ENV': '"production"' },
 	minify: process.argv.includes('--minify'),
-	watch: process.argv.includes('--watch'),
 	plugins: [
 		{
 			name: 'umd2esm',
@@ -37,6 +38,7 @@ require('esbuild').build({
 				from: ['./node_modules/@vue/language-core/schemas/**/*'],
 				to: ['./dist/schemas'],
 			},
+			// @ts-expect-error
 			keepStructure: true,
 		}),
 		{
@@ -53,4 +55,14 @@ require('esbuild').build({
 			},
 		},
 	],
-}).catch(() => process.exit(1))
+}).then(async ctx => {
+	console.log('building...');
+	if (process.argv.includes('--watch')) {
+		await ctx.watch();
+		console.log('watching...');
+	} else {
+		await ctx.rebuild();
+		await ctx.dispose();
+		console.log('finished.');
+	}
+})
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@volar/language-service": "~1.10.5",
-		"typescript": "next",
+		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"
 	},

diff --git a/packages/component-meta/src/index.ts b/packages/component-meta/src/index.ts
@@ -158,7 +158,7 @@ export function baseCreate(
 		ts,
 	) : [];
 	const core = vue.createLanguageContext(host, vueLanguages);
-	const tsLsHost = createLanguageServiceHost(core, ts, ts.sys, undefined);
+	const tsLsHost = createLanguageServiceHost(core, ts, ts.sys);
 	const tsLs = ts.createLanguageService(tsLsHost);
 
 	decorateLanguageService(core.virtualFiles, tsLs, false);

diff --git a/packages/tsc/src/index.ts b/packages/tsc/src/index.ts
@@ -86,7 +86,7 @@ export function createProgram(options: ts.CreateProgramOptions) {
 				ts,
 			),
 		);
-		const languageServiceHost = volarTs.createLanguageServiceHost(languageContext, ts, ts.sys, undefined);
+		const languageServiceHost = volarTs.createLanguageServiceHost(languageContext, ts, ts.sys);
 		const vueTsLs = ts.createLanguageService(languageServiceHost, volarTs.getDocumentRegistry(ts, ts.sys.useCaseSensitiveFileNames, languageHost.workspacePath));
 
 		volarTs.decorateLanguageService(languageContext.virtualFiles, vueTsLs, false);

diff --git a/packages/typescript-plugin/src/index.ts b/packages/typescript-plugin/src/index.ts
@@ -44,6 +44,7 @@ const init: ts.server.PluginModuleFactory = (modules) => {
 		},
 		getExternalFiles(project, updateLevel = 0) {
 			if (
+				// @ts-expect-error wait for TS 5.3
 				updateLevel >= (1 satisfies ts.ProgramUpdateLevel.RootNamesAndUpdate)
 				|| !externalFiles.has(project)
 			) {