rsbuild-plugin-dts 0.1.1 → 0.1.3

package/dist/dts.js

@@ -55,9 +55,16 @@ const calcBundledPackages = (options)=>{
     return Array.from(new Set(bundledPackages));
 };
 async function generateDts(data) {
-    const { bundle, dtsEmitPath, dtsEntry, tsconfigPath, tsConfigResult, name, cwd, build, isWatch, dtsExtension = '.d.ts', autoExternal = true, userExternals, banner, footer } = data;
+    const { bundle, dtsEntry, tsconfigPath, tsConfigResult, distPath, rootDistPath, cleanDistPath, name, cwd, build, isWatch, dtsExtension = '.d.ts', autoExternal = true, userExternals, banner, footer } = data;
     __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.logger.start(`Generating DTS... ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].gray(`(${name})`)}`);
     const { options: rawCompilerOptions, fileNames } = tsConfigResult;
+    const dtsEmitPath = distPath ?? rawCompilerOptions.declarationDir ?? rootDistPath;
+    // clean dts files
+    if (false !== cleanDistPath) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.cleanDtsFiles)(dtsEmitPath);
+    // clean .rslib temp folder
+    if (bundle) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.clearTempDeclarationDir)(cwd);
+    // clean tsbuildinfo file
+    if (rawCompilerOptions.composite || rawCompilerOptions.incremental || build) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.cleanTsBuildInfoFile)(tsconfigPath, rawCompilerOptions);
     // The longest common path of all non-declaration input files.
     // If composite is set, the default is instead the directory containing the tsconfig.json file.
     // see https://www.typescriptlang.org/tsconfig/#rootDir

package/dist/index.d.ts

@@ -23,10 +23,11 @@ export type DtsGenOptions = PluginDtsOptions & {
     cwd: string;
     isWatch: boolean;
     dtsEntry: DtsEntry;
-    dtsEmitPath: string;
     build?: boolean;
     tsconfigPath: string;
     tsConfigResult: ts.ParsedCommandLine;
+    rootDistPath: string;
+    cleanDistPath: NonNullable<RsbuildConfig['output']>['cleanDistPath'];
     userExternals?: NonNullable<RsbuildConfig['output']>['externals'];
 };
 export declare const PLUGIN_DTS_NAME = "rsbuild:dts";

package/dist/index.js

@@ -32,26 +32,19 @@ const pluginDts = (options = {})=>({
                     throw new Error();
                 }
                 const tsConfigResult = (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.loadTsconfig)(tsconfigPath);
-                const dtsEmitPath = options.distPath ?? tsConfigResult.options.declarationDir ?? config.output?.distPath?.root;
                 const jsExtension = (0, __WEBPACK_EXTERNAL_MODULE_node_path__.extname)(src_rslib_entry_filename);
                 const childProcess = (0, __WEBPACK_EXTERNAL_MODULE_node_child_process__.fork)((0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(src_rslib_entry_dirname, `./dts${jsExtension}`), [], {
                     stdio: 'inherit'
                 });
                 childProcesses.push(childProcess);
-                const { cleanDistPath } = config.output;
-                // clean dts files
-                if (false !== cleanDistPath) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.cleanDtsFiles)(dtsEmitPath);
-                // clean .rslib temp folder
-                if (options.bundle) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.clearTempDeclarationDir)(cwd);
-                // clean tsbuildinfo file
-                await (0, __WEBPACK_EXTERNAL_MODULE__utils_js__.cleanTsBuildInfoFile)(tsconfigPath, tsConfigResult);
                 const dtsGenOptions = {
                     ...options,
                     dtsEntry,
-                    dtsEmitPath,
+                    rootDistPath: config.output?.distPath?.root,
                     userExternals: config.output.externals,
                     tsconfigPath,
                     tsConfigResult,
+                    cleanDistPath: config.output.cleanDistPath,
                     name: environment.name,
                     cwd,
                     isWatch
@@ -85,7 +78,11 @@ const pluginDts = (options = {})=>({
                 order: 'post'
             });
             const killProcesses = ()=>{
-                for (const childProcess of childProcesses)if (!childProcess.killed) childProcess.kill();
+                for (const childProcess of childProcesses)if (!childProcess.killed) try {
+                    childProcess.kill();
+                // mute kill error, such as: kill EPERM error on windows
+                // https://github.com/nodejs/node/issues/51766
+                } catch (_err) {}
                 childProcesses = [];
             };
             api.onCloseBuild(killProcesses);

package/dist/utils.d.ts

@@ -16,4 +16,4 @@ export declare function processDtsFiles(bundle: boolean, dir: string, dtsExtensi
 export declare function processSourceEntry(bundle: boolean, entryConfig: NonNullable<RsbuildConfig['source']>['entry']): DtsEntry;
 export declare function calcLongestCommonPath(absPaths: string[]): Promise<string | null>;
 export declare function cleanDtsFiles(dir: string): Promise<void>;
-export declare function cleanTsBuildInfoFile(tsconfigPath: string, tsConfigResult: ts.ParsedCommandLine): Promise<void>;
+export declare function cleanTsBuildInfoFile(tsconfigPath: string, compilerOptions: ts.CompilerOptions): Promise<void>;

package/dist/utils.js

@@ -137,12 +137,12 @@ async function cleanDtsFiles(dir) {
             force: true
         })));
 }
-async function cleanTsBuildInfoFile(tsconfigPath, tsConfigResult) {
+async function cleanTsBuildInfoFile(tsconfigPath, compilerOptions) {
     const tsconfigDir = (0, __WEBPACK_EXTERNAL_MODULE_node_path__.dirname)(tsconfigPath);
-    const { outDir, rootDir, tsBuildInfoFile } = tsConfigResult.options;
+    const { outDir, rootDir, tsBuildInfoFile } = compilerOptions;
     let tsbuildInfoFilePath = `${(0, __WEBPACK_EXTERNAL_MODULE_node_path__.basename)(tsconfigPath, '.json')}${tsBuildInfoFile ?? '.tsbuildinfo'}`;
     if (outDir) tsbuildInfoFilePath = rootDir ? (0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(outDir, (0, __WEBPACK_EXTERNAL_MODULE_node_path__.relative)((0, __WEBPACK_EXTERNAL_MODULE_node_path__.resolve)(tsconfigDir, rootDir), tsconfigDir), tsbuildInfoFilePath) : (0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(outDir, tsbuildInfoFilePath);
-    await __WEBPACK_EXTERNAL_MODULE_node_fs_promises__["default"].rm(tsbuildInfoFilePath, {
+    if (await pathExists(tsbuildInfoFilePath)) await __WEBPACK_EXTERNAL_MODULE_node_fs_promises__["default"].rm(tsbuildInfoFilePath, {
         force: true
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Rsbuild plugin that supports emitting declaration files for TypeScript.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -31,8 +31,8 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.48.0",
-    "@rsbuild/core": "~1.1.6",
-    "rslib": "npm:@rslib/core@0.1.0",
+    "@rsbuild/core": "~1.1.8",
+    "rslib": "npm:@rslib/core@0.1.2",
     "typescript": "^5.6.3",
     "@rslib/tsconfig": "0.0.1"
   },