fe-stack 0.0.10 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fe-stack",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "共享的配置文件集合，用于 Vite、Tailwind、Biome、Prettier 和 TypeScript",
   "type": "module",
   "exports": {
@@ -21,6 +21,7 @@
     "tsconfig.node.json",
     "vite.config.base.js",
     "vite.config.base.d.ts",
+    "vite-plugin-rollup-dts.ts",
     "README.md"
   ],
   "keywords": [
@@ -49,9 +50,9 @@
     "@vitejs/plugin-vue": "^6.0.3",
     "@vue/tsconfig": "^0.7.0",
     "unplugin-auto-import": "^20.3.0",
-    "unplugin-dts": "1.0.0-beta.6",
     "unplugin-vue-components": "^30.0.0",
-    "unplugin-vue-router": "^0.19.2"
+    "unplugin-vue-router": "^0.19.2",
+    "vite-plugin-dts": "^4.5.4"
   },
   "peerDependencies": {
     "@biomejs/biome": "^2.3.11",

package/vite-plugin-rollup-dts.ts

@@ -0,0 +1,246 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { Extractor, ExtractorConfig } from '@microsoft/api-extractor';
+import type { Plugin, ResolvedConfig } from 'vite';
+
+interface Entry {
+  name: string;
+  mainEntryPoint: string;
+  output: string;
+}
+
+interface RollupDtsPluginOptions {
+  /** 手动指定入口，如果不指定则从 vite config 的 build.lib.entry 自动获取 */
+  entries?: Entry[];
+  tsconfigPath?: string;
+}
+
+const baseConfig = {
+  $schema:
+    'https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json',
+  projectFolder: '.',
+  apiReport: { enabled: false },
+  docModel: { enabled: false },
+  tsdocMetadata: { enabled: false },
+  dtsRollup: { enabled: true },
+  messages: {
+    compilerMessageReporting: { default: { logLevel: 'warning' as const } },
+    extractorMessageReporting: {
+      default: { logLevel: 'warning' as const },
+      'ae-missing-release-tag': { logLevel: 'none' as const },
+      'ae-unresolved-link': { logLevel: 'none' as const },
+    },
+    tsdocMessageReporting: { default: { logLevel: 'none' as const } },
+  },
+};
+
+function cleanupIntermediateFiles(dir: string, keepFiles: string[]) {
+  if (!fs.existsSync(dir)) return;
+
+  const items = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const item of items) {
+    const fullPath = path.join(dir, item.name);
+
+    if (item.isDirectory()) {
+      const hasKeepFile = keepFiles.some(
+        (f) => f.startsWith(fullPath + path.sep) || f === fullPath,
+      );
+      if (hasKeepFile) {
+        cleanupIntermediateFiles(fullPath, keepFiles);
+        const remaining = fs.readdirSync(fullPath);
+        if (remaining.length === 0) {
+          fs.rmdirSync(fullPath);
+        }
+      } else {
+        const allDts = fs
+          .readdirSync(fullPath, { recursive: true })
+          .every((f) => {
+            if (typeof f !== 'string') return true;
+            const fp = path.join(fullPath, f);
+            return fs.statSync(fp).isDirectory() || f.endsWith('.d.ts');
+          });
+        if (allDts) {
+          fs.rmSync(fullPath, { recursive: true });
+        }
+      }
+    } else if (item.name.endsWith('.d.ts') && !keepFiles.includes(fullPath)) {
+      fs.unlinkSync(fullPath);
+    }
+  }
+}
+
+/**
+ * 从 vite config 的 build.lib.entry 自动生成 entries
+ */
+function getEntriesFromConfig(config: ResolvedConfig): Entry[] {
+  const lib = config.build?.lib;
+  if (!lib) return [];
+
+  const outDir = config.build?.outDir || 'dist';
+  const entry = lib.entry;
+
+  // entry 可以是 string | string[] | Record<string, string>
+  if (typeof entry === 'string') {
+    return [
+      {
+        name: 'index',
+        mainEntryPoint: `./${outDir}/index.d.ts`,
+        output: `./${outDir}/index.d.ts`,
+      },
+    ];
+  }
+
+  if (Array.isArray(entry)) {
+    return entry.map((_, i) => ({
+      name: i === 0 ? 'index' : `entry${i}`,
+      mainEntryPoint: `./${outDir}/${i === 0 ? 'index' : `entry${i}`}.d.ts`,
+      output: `./${outDir}/${i === 0 ? 'index' : `entry${i}`}.d.ts`,
+    }));
+  }
+
+  // Record<string, string>
+  return Object.keys(entry).map((name) => ({
+    name,
+    mainEntryPoint: `./${outDir}/${name}.d.ts`,
+    output: `./${outDir}/${name}.d.ts`,
+  }));
+}
+
+export function rollupDtsPlugin(options: RollupDtsPluginOptions = {}): Plugin {
+  const { tsconfigPath = './tsconfig.json' } = options;
+  let resolvedConfig: ResolvedConfig;
+  let entries: Entry[] = [];
+
+  return {
+    name: 'vite-plugin-rollup-dts',
+    apply: 'build',
+    enforce: 'post',
+
+    configResolved(config) {
+      resolvedConfig = config;
+      // 如果手动指定了 entries，使用手动配置；否则从 config 自动生成
+      entries = options.entries || getEntriesFromConfig(config);
+    },
+
+    async closeBundle() {
+      if (entries.length === 0) {
+        console.log('[rollup-dts] No entries found, skipping...');
+        return;
+      }
+
+      const projectFolder = process.cwd();
+      const results: { entry: Entry; success: boolean }[] = [];
+
+      console.log('\n[rollup-dts] Starting to bundle declaration files...');
+
+      for (const entry of entries) {
+        const mainEntryPointFilePath = path.resolve(
+          projectFolder,
+          entry.mainEntryPoint,
+        );
+
+        if (!fs.existsSync(mainEntryPointFilePath)) {
+          console.warn(
+            `[rollup-dts] ⚠️  Skipping ${entry.name}: ${entry.mainEntryPoint} not found`,
+          );
+          continue;
+        }
+
+        console.log(`[rollup-dts] 📦 Rolling up types for: ${entry.name}`);
+
+        const config = {
+          ...baseConfig,
+          compiler: {
+            tsconfigFilePath: `<projectFolder>/${tsconfigPath}`,
+          },
+          mainEntryPointFilePath: `<projectFolder>/${entry.mainEntryPoint}`,
+          dtsRollup: {
+            enabled: true,
+            untrimmedFilePath: `<projectFolder>/${entry.output}`,
+          },
+        };
+
+        // 用安全的文件名（将 / 替换为 -）
+        const safeName = entry.name.replace(/\//g, '-');
+        const tempConfigPath = path.resolve(
+          projectFolder,
+          `api-extractor.${safeName}.tmp.json`,
+        );
+        fs.writeFileSync(tempConfigPath, JSON.stringify(config, null, 2));
+
+        let success = false;
+        try {
+          const extractorConfig =
+            ExtractorConfig.loadFileAndPrepare(tempConfigPath);
+          const extractorResult = Extractor.invoke(extractorConfig, {
+            localBuild: true,
+            showVerboseMessages: false,
+          });
+
+          if (extractorResult.succeeded) {
+            console.log(
+              `[rollup-dts] ✅ ${entry.name}: types rolled up successfully`,
+            );
+            success = true;
+          } else {
+            console.warn(
+              `[rollup-dts] ⚠️  ${entry.name}: API Extractor completed with warnings/errors`,
+            );
+            if (fs.existsSync(path.resolve(projectFolder, entry.output))) {
+              success = true;
+            }
+          }
+        } catch (error) {
+          console.warn(
+            `[rollup-dts] ⚠️  ${entry.name}: Error during rollup, keeping original .d.ts files`,
+          );
+          console.warn(`   ${error instanceof Error ? error.message : error}`);
+        } finally {
+          if (fs.existsSync(tempConfigPath)) {
+            fs.unlinkSync(tempConfigPath);
+          }
+        }
+
+        results.push({ entry, success });
+      }
+
+      // Determine which directories to keep
+      const dirsToKeep = new Set<string>();
+
+      for (const { entry, success } of results) {
+        if (!success) {
+          const entryDir = path.dirname(
+            path.resolve(projectFolder, entry.mainEntryPoint),
+          );
+          dirsToKeep.add(entryDir);
+          console.log(
+            `[rollup-dts] 📁 Keeping directory structure for: ${entry.name}`,
+          );
+        }
+      }
+
+      // Clean up only if all entries succeeded
+      if (dirsToKeep.size === 0) {
+        console.log('[rollup-dts] 🧹 Cleaning up intermediate files...');
+        const outDir = resolvedConfig?.build?.outDir || 'dist';
+        const distDir = path.resolve(projectFolder, outDir);
+        cleanupIntermediateFiles(
+          distDir,
+          entries.map((e) => path.resolve(projectFolder, e.output)),
+        );
+      } else {
+        console.log(
+          '[rollup-dts] ⚠️  Some entries failed, keeping intermediate files',
+        );
+      }
+
+      console.log('[rollup-dts] 📊 Summary:');
+      for (const { entry, success } of results) {
+        console.log(`   ${success ? '✅' : '❌'} ${entry.name}`);
+      }
+    },
+  };
+}
+
+export default rollupDtsPlugin;

package/vite.config.base.d.ts

@@ -1,16 +1,16 @@
-import type { PluginOptions as DtsPluginOptions } from 'unplugin-dts';
 import type { UserConfig } from 'vite';
+import type { PluginOptions as DtsPluginOptions } from 'vite-plugin-dts';
 
 export interface CreateBaseConfigOptions {
   /**
    * 构建模式
    * - 'app': Vue 应用模式，包含 Vue Router、Auto Import 等
-   * - 'lib': 库打包模式，配置 unplugin-dts/vite
+   * - 'lib': 库打包模式，配置 vite-plugin-dts
    */
   mode?: 'app' | 'lib';
 
   /**
-   * unplugin-dts/vite 配置（仅 lib 模式）
+   * vite-plugin-dts 配置（仅 lib 模式）
    * 会与默认配置合并，可以覆盖 include、exclude 等选项
    */
   dtsConfig?: Partial<DtsPluginOptions>;

package/vite.config.base.js

@@ -2,17 +2,18 @@ import path from 'node:path';
 import tailwindcss from '@tailwindcss/vite';
 import vue from '@vitejs/plugin-vue';
 import AutoImport from 'unplugin-auto-import/vite';
-import dts from 'unplugin-dts/vite';
 import Components from 'unplugin-vue-components/vite';
 import VueRouter from 'unplugin-vue-router/vite';
 import { defineConfig, mergeConfig } from 'vite';
+import dts from 'vite-plugin-dts';
+import { rollupDtsPlugin } from './scripts/vite-plugin-rollup-dts';
 
 /**
  * @typedef {import('vite').UserConfig} UserConfig
- * @typedef {import('unplugin-dts').PluginOptions} DtsPluginOptions
+ * @typedef {import('vite-plugin-dts').PluginOptions} DtsPluginOptions
  * @typedef {Object} CreateBaseConfigOptions
  * @property {'app' | 'lib'} [mode] - 构建模式：'app' 为 Vue 应用，'lib' 为库打包
- * @property {Partial<DtsPluginOptions>} [dtsConfig] - unplugin-dts 配置（仅 lib 模式），会与默认配置合并
+ * @property {Partial<DtsPluginOptions>} [dtsConfig] - vite-plugin-dts 配置（仅 lib 模式），会与默认配置合并
  * @property {UserConfig} [viteConfig] - 额外的 Vite 配置，会与基础配置合并
  */
 
@@ -80,10 +81,13 @@ export function createBaseConfig(dirname, options = {}) {
       dts({
         include: ['src/**/*.ts'],
         root: dirname,
-        bundleTypes: false,
         ...dtsConfig,
+        rollupTypes: false,
       }),
     );
+    if (dts.rollupTypes) {
+      baseConfig.plugins.push(rollupDtsPlugin());
+    }
   }
 
   // 使用 mergeConfig 合并用户自定义配置