feat: 优化 hbuilderx-cli 配置

Author: tomgao365

packages/hbuilderx-cli/package.json

@@ -19,6 +19,12 @@
     "extension",
     "webview"
   ],
+  "exports": {
+    "./types": {
+      "types": "./dist/types.d.ts"
+    }
+  },
+  "types": "./dist/types.d.ts",
   "bin": {
     "hx-cli": "./dist/index.js"
   },
@@ -30,7 +36,7 @@
   },
   "scripts": {
     "dev": "tsdown --watch",
-    "build": "tsdown",
+    "build": "rimraf ./dist && tsdown",
     "lint": "eslint --fix",
     "prepublishOnly": "pnpm build"
   },
@@ -40,6 +46,7 @@
     "archiver": "^7.0.1",
     "chokidar": "^5.0.0",
     "cosmiconfig": "^9.0.0",
+    "glob": "^13.0.0",
     "meow": "^14.0.0",
     "picocolors": "^1.1.1"
   },

packages/hbuilderx-cli/src/pack.ts

@@ -3,30 +3,43 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { readJson } from '@tomjs/node';
 import archiver from 'archiver';
+import { glob } from 'glob';
 import colors from 'picocolors';
 import { logger } from './util';
 
 export async function packExtension(opts: CliOptions) {
-  const packFiles = Array.isArray(opts.packFiles) ? opts.packFiles : ['dist', 'package.json', 'license'];
-  if (!packFiles.includes('package.json')) {
-    packFiles.push('package.json');
-  }
-
   const cwd = opts.cwd || process.cwd();
   const pkgPath = path.join(cwd, 'package.json');
   if (!fs.existsSync(pkgPath)) {
     logger.error(`未找到 ${colors.green(pkgPath)}`);
     return;
   }
   const pkg = await readJson(pkgPath);
-  if (!checkPackage(pkg)) {
+  if (!checkPackageFields(pkg)) {
     return;
   }
   const mainFile = path.join(cwd, pkg.main);
   if (!fs.existsSync(mainFile)) {
     logger.error(`未找到 ${colors.bold('package.json')} 中 ${colors.bold('main')} 字段值路径： ${colors.green(mainFile)}`);
     return;
   }
+
+  const packFilters: string[] = Array.isArray(pkg.files) && pkg.files.length
+    ? pkg.files
+    : [
+        'dist',
+        'resources',
+        'package.json',
+        'LICENSE',
+      ];
+
+  const pkgFiles = await glob(packFilters.filter(s => !s.startsWith('!')), {
+    cwd,
+    ignore: packFilters.filter(s => s.startsWith('!')).map(s => s.slice(1)).concat(['node_modules/**']),
+  });
+
+  console.log(pkgFiles);
+
   logger.info(`${colors.blue(pkg.name)} 插件打包开始`);
   const archive = archiver('zip', {
     zlib: { level: 9 },
@@ -51,7 +64,7 @@ export async function packExtension(opts: CliOptions) {
   const output = fs.createWriteStream(path.join(cwd, `${pkg.name}.zip`));
   archive.pipe(output);
 
-  packFiles.forEach((file) => {
+  pkgFiles.forEach((file) => {
     const filePath = path.join(cwd, file);
     if (!fs.existsSync(filePath)) {
       return;
@@ -67,7 +80,7 @@ export async function packExtension(opts: CliOptions) {
   archive.finalize();
 }
 
-function checkPackage(pkg: any) {
+function checkPackageFields(pkg: any) {
   if (!pkg) {
     logger.error('package.json 文件格式错误');
     return false;

packages/hbuilderx-cli/src/types.ts

@@ -1,16 +1,15 @@
+/**
+ * cli 参数
+ */
 export interface CliOptions {
   /**
    * 监听文件变化
    */
   watch?: boolean;
   /**
-   * 打包插件
+   * 打包插件，根据 package.json 中的 files 字段打包，如果未设置，默认取 dist,resources,package.json,LICENSE 文件夹或文件。
    */
   pack?: boolean;
-  /**
-   * 打包插件文件，默认 dist、package.json、license
-   */
-  packFiles?: string[];
   /**
    * 当前工作目录/根目录
    */

packages/hbuilderx-cli/tsdown.config.ts

@@ -2,17 +2,27 @@ import { defineConfig } from 'tsdown';
 
 export default defineConfig((options) => {
   const isDev = !!options.watch;
-  return {
-    entry: ['src/index.ts'],
-    format: ['esm'],
-    target: ['node20'],
-    shims: true,
-    clean: true,
-    dts: false,
-    publint: true,
-    fixedExtension: false,
-    env: {
-      NODE_ENV: isDev ? 'development' : 'production',
+  return [
+    {
+      entry: ['src/index.ts'],
+      format: ['esm'],
+      target: ['node20'],
+      shims: true,
+      clean: false,
+      dts: false,
+      publint: true,
+      fixedExtension: false,
+      env: {
+        NODE_ENV: isDev ? 'development' : 'production',
+      },
     },
-  };
+    {
+      entry: ['src/types.ts'],
+      format: ['esm'],
+      clean: false,
+      dts: true,
+      publint: true,
+      fixedExtension: false,
+    },
+  ];
 });