@tomjs/vite-plugin-vscode 6.0.2 → 6.2.0

package/README.md

@@ -101,6 +101,32 @@ panel.webview.html = getWebviewHtml({
 });
 ```
 
+- Add `"@tomjs/vite-plugin-vscode/types"` to `tsconfig.node.json` or `*.d.ts` file.
+
+`tsconfig.node.json`
+
+```json
+{
+  "extends": "@tomjs/tsconfig/node.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "types": [
+      "@tomjs/vite-plugin-vscode/types"
+    ]
+  },
+  "include": [
+    "extension",
+    "*.config.ts"
+  ]
+}
+```
+
+`*.dt.s`
+
+```ts
+/// <reference types="@tomjs/vite-plugin-vscode/types" />
+```
+
 - `package.json`
 
 ```json
@@ -380,7 +406,7 @@ Run `Debug Extension` through `vscode` to debug. For debugging tools, refer to [
         "background": {
           "activeOnStart": true,
           "beginsPattern": "^.*extension build start*$",
-          "endsPattern": "^.*extension (build|rebuild) success.*$"
+          "endsPattern": "^.*extension build success.*$"
         }
       },
       "isBackground": true,
@@ -420,6 +446,7 @@ Open the [examples](./examples) directory, there are `vue` and `react` examples.
 - [vue](./examples/vue): Simple vue example.
 - [vue-esm](./examples/vue-esm): Simple vue (ESM Extension) example.
 - [vue-import](./examples/vue-import): Dynamic import() and multi-page examples.
+- [vue-vite8](./examples/vue-rolldown): [vite8](https://vite.dev/) example.
 
 ## Related
 

package/README.zh_CN.md

@@ -79,6 +79,32 @@ npm i @tomjs/vite-plugin-vscode -D
 
 ### extension
 
+- 添加 `"@tomjs/vite-plugin-vscode/types"` 到 `tsconfig.node.json` 或 `*.d.ts`
+
+`tsconfig.node.json`
+
+```json
+{
+  "extends": "@tomjs/tsconfig/node.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "types": [
+      "@tomjs/vite-plugin-vscode/types"
+    ]
+  },
+  "include": [
+    "extension",
+    "*.config.ts"
+  ]
+}
+```
+
+`*.dt.s`
+
+```ts
+/// <reference types="@tomjs/vite-plugin-vscode/types" />
+```
+
 代码片段，更多配置看示例
 
 ```ts
@@ -380,7 +406,7 @@ const value = await acquireVsCodeApi().getState();
         "background": {
           "activeOnStart": true,
           "beginsPattern": "^.*extension build start*$",
-          "endsPattern": "^.*extension (build|rebuild) success.*$"
+          "endsPattern": "^.*extension build success.*$"
         }
       },
       "isBackground": true,
@@ -424,6 +450,7 @@ pnpm build
 - [vue](./examples/vue)：简单的 vue 示例。
 - [vue-esm](./examples/vue-esm)：简单的 vue（ESM 扩展）示例。
 - [vue-import](./examples/vue-import)：动态 import() 和多页面示例。
+- [vue-vite8](./examples/vue-rolldown): [vite8](https://cn.vite.dev/) 示例。
 
 ## 关联
 

package/dist/index.js

@@ -6,10 +6,11 @@ import { readFileSync, readJsonSync } from "@tomjs/node";
 import { execa } from "execa";
 import merge from "lodash.merge";
 import { parse } from "node-html-parser";
+import colors from "picocolors";
 import { build } from "tsdown";
-import Logger from "@tomjs/logger";
+import { createLogger } from "vite";
 
-//#region node_modules/.pnpm/tsdown@0.18.3_publint@0.3.16_synckit@0.11.11_typescript@5.9.3_vue-tsc@3.2.0_typescript@5.9.3_/node_modules/tsdown/esm-shims.js
+//#region node_modules/.pnpm/tsdown@0.19.0_publint@0.3.16_synckit@0.11.11_typescript@5.9.3_vue-tsc@3.2.1_typescript@5.9.3_/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -23,12 +24,28 @@ const RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`;
 
 //#endregion
 //#region src/logger.ts
-function createLogger() {
-	return new Logger({
+function createLogger$1(logLevel) {
+	const logger$1 = createLogger(logLevel, {
 		prefix: `[${PLUGIN_NAME}]`,
-		time: true
+		allowClearScreen: true
 	});
+	[
+		"info",
+		"warn",
+		"warnOnce",
+		"error"
+	].forEach((level) => {
+		const _level = logger$1[level];
+		logger$1[level] = (msg, options) => {
+			_level(msg, Object.assign({
+				timestamp: true,
+				clear: false
+			}, options));
+		};
+	});
+	return logger$1;
 }
+const logger = createLogger$1();
 
 //#endregion
 //#region src/utils.ts
@@ -66,7 +83,6 @@ function resolveServerUrl(server) {
 //#endregion
 //#region src/index.ts
 const isDev = process.env.NODE_ENV === "development";
-const logger = createLogger();
 function getPkg() {
 	const pkgFile = path.resolve(process.cwd(), "package.json");
 	if (!fs.existsSync(pkgFile)) throw new Error("Main file is not specified, and no package.json found");
@@ -153,7 +169,7 @@ function uuid() {
   return text;
 }
 
-export default function getWebviewHtml(options){
+export function getWebviewHtml(options){
   const { webview, context, inputName, injectCode } = options || {};
   const nonce = uuid();
   const baseUri = webview.asWebviewUri(Uri.joinPath(context.extensionUri, (process.env.VITE_WEBVIEW_DIST || 'dist')));
@@ -164,11 +180,13 @@ export default function getWebviewHtml(options){
 
   return html.replaceAll('{{cspSource}}', webview.cspSource).replaceAll('{{nonce}}', nonce).replaceAll('{{baseUri}}', baseUri);
 }
-  `;
+
+export default getWebviewHtml;
+`;
 }
 function useVSCodePlugin(options) {
 	const opts = preMergeOptions(options);
-	const handleConfig = (config) => {
+	const handleConfig = (config, isRolldown) => {
 		let outDir = config?.build?.outDir || "dist";
 		opts.extension ??= {};
 		if (opts.recommended) {
@@ -176,18 +194,22 @@ function useVSCodePlugin(options) {
 			outDir = path.resolve(outDir, "webview");
 		}
 		const assetsDir = config?.build?.assetsDir || "assets";
-		const output = {
+		const outputDefault = {
 			chunkFileNames: `${assetsDir}/[name].js`,
 			entryFileNames: `${assetsDir}/[name].js`,
 			assetFileNames: `${assetsDir}/[name].[ext]`
 		};
-		let rollupOutput = config?.build?.rollupOptions?.output ?? {};
-		if (Array.isArray(rollupOutput)) rollupOutput.map((s) => Object.assign(s, output));
-		else rollupOutput = Object.assign({}, rollupOutput, output);
+		const outputOptions = {};
+		const buildConfig = config.build || {};
+		const optKey = isRolldown ? "rolldownOptions" : ["rolldownOptions", "rollupOptions"].find((s) => buildConfig[s]) || "rollupOptions";
+		let output = buildConfig[optKey]?.output || {};
+		if (Array.isArray(output)) output.map((s) => Object.assign(s, outputDefault));
+		else output = Object.assign({}, output, outputDefault);
+		outputOptions[optKey] = Object.assign(outputOptions[optKey] || {}, { output });
 		return { build: {
 			outDir,
 			sourcemap: isDev ? true : config?.build?.sourcemap,
-			rollupOptions: { output: rollupOutput }
+			...outputOptions
 		} };
 	};
 	let devWebviewClientCode;
@@ -199,7 +221,7 @@ function useVSCodePlugin(options) {
 		name: "@tomjs:vscode",
 		apply: "serve",
 		config(config) {
-			return handleConfig(config);
+			return handleConfig(config, this && "rolldownVersion" in this.meta);
 		},
 		configResolved(config) {
 			resolvedConfig = config;
@@ -216,9 +238,10 @@ function useVSCodePlugin(options) {
 					VITE_DEV_SERVER_URL: resolveServerUrl(server)
 				};
 				logger.info("extension build start");
-				let buildCount = 0;
 				const webview = opts?.webview;
 				const { onSuccess: _onSuccess, ignoreWatch, logLevel, watchFiles, ...tsdownOptions } = opts.extension || {};
+				const entryDir = path.dirname(tsdownOptions.entry);
+				let buildFlag = false;
 				await build(merge(tsdownOptions, {
 					watch: watchFiles ?? (opts.recommended ? ["extension"] : true),
 					ignoreWatch: [
@@ -237,6 +260,13 @@ function useVSCodePlugin(options) {
 						},
 						load(id) {
 							if (id === RESOLVED_VIRTUAL_MODULE_ID) return devWebviewVirtualCode;
+						},
+						watchChange(id, e) {
+							let event = "";
+							if (e.event === "update") event = colors.green(e.event);
+							else if (e.event === "delete") event = colors.red(e.event);
+							else event = colors.blue(e.event);
+							logger.info(`${event} ${colors.dim(path.relative(entryDir, id))}`);
 						}
 					}],
 					async onSuccess(config, signal) {
@@ -244,9 +274,12 @@ function useVSCodePlugin(options) {
 							if (typeof _onSuccess === "string") await execa(_onSuccess);
 							else if (typeof _onSuccess === "function") await _onSuccess(config, signal);
 						}
-						if (buildCount++ > 1) logger.info("extension rebuild success");
-						else logger.info("extension build success");
-					}
+						if (!buildFlag) {
+							buildFlag = true;
+							logger.info("extension build success");
+						}
+					},
+					buildOptions: {}
 				}));
 			});
 		},
@@ -269,7 +302,7 @@ function useVSCodePlugin(options) {
 		apply: "build",
 		enforce: "post",
 		config(config) {
-			return handleConfig(config);
+			return handleConfig(config, this && "rolldownVersion" in this.meta);
 		},
 		configResolved(config) {
 			resolvedConfig = config;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tomjs/vite-plugin-vscode",
   "type": "module",
-  "version": "6.0.2",
+  "version": "6.2.0",
   "description": "Use vue/react to develop 'vscode extension webview', supporting esm/cjs",
   "author": {
     "name": "Tom Gao",
@@ -27,7 +27,10 @@
     ".": "./dist/index.js",
     "./webview": "./dist/webview.js",
     "./client": "./dist/client.iife.js",
-    "./env": "./env.d.ts"
+    "./env": "./env.d.ts",
+    "./types": {
+      "types": "./env.d.ts"
+    }
   },
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -47,23 +50,22 @@
     "vite": ">=2"
   },
   "dependencies": {
-    "@tomjs/logger": "^1.4.0",
     "@tomjs/node": "^2.2.3",
     "execa": "^9.6.1",
     "lodash.merge": "^4.6.2",
-    "node-html-parser": "^7.0.1",
-    "tsdown": "~0.18.3"
+    "node-html-parser": "^7.0.2",
+    "picocolors": "^1.1.1",
+    "tsdown": "~0.19.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^6.7.3",
-    "@commitlint/cli": "^20.2.0",
+    "@commitlint/cli": "^20.3.1",
     "@tomjs/commitlint": "^5.0.0",
-    "@tomjs/eslint": "^6.0.0",
-    "@tomjs/stylelint": "^7.0.0",
-    "@tomjs/tsconfig": "^2.2.0",
+    "@tomjs/eslint": "^6.5.0",
+    "@tomjs/stylelint": "^7.1.1",
+    "@tomjs/tsconfig": "^3.2.0",
     "@types/lodash.merge": "^4.6.9",
-    "@types/node": "^20.19.27",
-    "@vitejs/plugin-vue": "^6.0.3",
+    "@types/node": "^20.19.28",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
     "globals": "^16.5.0",
@@ -75,8 +77,7 @@
     "stylelint": "^16.26.1",
     "tsx": "^4.21.0",
     "typescript": "~5.9.3",
-    "vite": "^7.3.0",
-    "vue-tsc": "^3.2.0"
+    "vite": "^7.3.1"
   },
   "scripts": {
     "dev": "pnpm clean && tsdown --watch",