vite-plugin-dts 1.2.1 → 1.3.0

package/dist/index.d.ts

@@ -9,7 +9,7 @@ interface PluginOptions {
     include?: string | string[];
     exclude?: string | string[];
     root?: string;
-    outputDir?: string;
+    outputDir?: string | string[];
     entryRoot?: string;
     compilerOptions?: ts.CompilerOptions | null;
     tsConfigFilePath?: string;

package/dist/index.js

@@ -444,7 +444,7 @@ function dtsPlugin(options = {}) {
   let logger;
   let project;
   let tsConfigPath;
-  let outputDir;
+  let outputDirs;
   let isBundle = false;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
   let hasJsVue = false;
@@ -468,7 +468,7 @@ function dtsPlugin(options = {}) {
       if (aliasesExclude.length > 0) {
         aliases = aliases.filter(({ find }) => !aliasesExclude.some((alias) => {
           var _a3;
-          return !alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a3 = find.match(alias)) == null ? void 0 : _a3[0] : find === alias);
+          return alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a3 = find.match(alias)) == null ? void 0 : _a3[0] : find === alias);
         }));
       }
     },
@@ -491,8 +491,8 @@ ${import_chalk.default.cyan("[vite:dts]")} You building not a library that may n
       }
       root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
-      outputDir = options.outputDir ? ensureAbsolute(options.outputDir, root) : ensureAbsolute(config.build.outDir, root);
-      if (!outputDir) {
+      outputDirs = options.outputDir ? ensureArray(options.outputDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(config.build.outDir, root)];
+      if (!outputDirs) {
         logger.error(import_chalk.default.red(`
 ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory, please check your vite config and plugin options.
 `));
@@ -547,7 +547,7 @@ ${import_chalk.default.cyan("[vite:dts]")} Can not resolve declaration directory
     },
     async closeBundle() {
       var _a2, _b2, _c, _d, _e, _f;
-      if (!outputDir || !project || isBundle)
+      if (!outputDirs || !project || isBundle)
         return;
       logger.info(import_chalk.default.green(`
 ${logPrefix} Start generate declaration files...`));
@@ -604,7 +604,7 @@ ${logPrefix} Start generate declaration files...`));
       }));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-        path: outputFile.getFilePath(),
+        path: (0, import_vite2.normalizePath)((0, import_path4.resolve)(root, outputFile.compilerObject.name)),
         content: outputFile.getText()
       }))).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
@@ -613,6 +613,7 @@ ${logPrefix} Start generate declaration files...`));
       }
       entryRoot = ensureAbsolute(entryRoot, root);
       const wroteFiles = /* @__PURE__ */ new Set();
+      const outputDir = outputDirs[0];
       await runParallel(import_os.default.cpus().length, outputFiles, async (outputFile) => {
         var _a3, _b3;
         let filePath = outputFile.path;
@@ -635,7 +636,7 @@ ${logPrefix} Start generate declaration files...`));
           }
         }
         await import_fs_extra.default.mkdir((0, import_path4.dirname)(filePath), { recursive: true });
-        await import_fs_extra.default.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        await import_fs_extra.default.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf-8");
         wroteFiles.add((0, import_vite2.normalizePath)(filePath));
       });
       bundleDebug("output");
@@ -671,17 +672,34 @@ ${logPrefix} Start generate declaration files...`));
             entryPath: typesPath,
             fileName: (0, import_path4.basename)(typesPath)
           });
-          wroteFiles.delete((0, import_vite2.normalizePath)(typesPath));
+          const wroteFile = (0, import_vite2.normalizePath)(typesPath);
+          wroteFiles.delete(wroteFile);
           await runParallel(import_os.default.cpus().length, Array.from(wroteFiles), (f) => import_fs_extra.default.unlink(f));
           removeDirIfEmpty(outputDir);
+          wroteFiles.clear();
+          wroteFiles.add(wroteFile);
           if (copyDtsFiles) {
             await runParallel(import_os.default.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              await import_fs_extra.default.writeFile((0, import_path4.resolve)(outputDir, (0, import_path4.basename)(path)), content, "utf8");
+              const filePath = (0, import_path4.resolve)(outputDir, (0, import_path4.basename)(path));
+              await import_fs_extra.default.writeFile(filePath, content, "utf-8");
+              wroteFiles.add((0, import_vite2.normalizePath)(filePath));
             });
           }
           bundleDebug("rollup");
         }
       }
+      if (outputDirs.length > 1) {
+        const dirs = outputDirs.slice(1);
+        await runParallel(import_os.default.cpus().length, Array.from(wroteFiles), async (wroteFile) => {
+          const relativePath = (0, import_path4.relative)(outputDir, wroteFile);
+          const content = await import_fs_extra.default.readFile(wroteFile, "utf-8");
+          await Promise.all(dirs.map(async (dir) => {
+            const filePath = (0, import_path4.resolve)(dir, relativePath);
+            await import_fs_extra.default.mkdir((0, import_path4.dirname)(filePath), { recursive: true });
+            await import_fs_extra.default.writeFile(filePath, content, "utf-8");
+          }));
+        });
+      }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;

package/dist/index.mjs

@@ -426,7 +426,7 @@ function dtsPlugin(options = {}) {
   let logger;
   let project;
   let tsConfigPath;
-  let outputDir;
+  let outputDirs;
   let isBundle = false;
   const sourceDtsFiles = /* @__PURE__ */ new Set();
   let hasJsVue = false;
@@ -450,7 +450,7 @@ function dtsPlugin(options = {}) {
       if (aliasesExclude.length > 0) {
         aliases = aliases.filter(({ find }) => !aliasesExclude.some((alias) => {
           var _a3;
-          return !alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a3 = find.match(alias)) == null ? void 0 : _a3[0] : find === alias);
+          return alias && (isRegExp(find) ? find.toString() === alias.toString() : isRegExp(alias) ? (_a3 = find.match(alias)) == null ? void 0 : _a3[0] : find === alias);
         }));
       }
     },
@@ -473,8 +473,8 @@ ${chalk.cyan("[vite:dts]")} You building not a library that may not need to gene
       }
       root = ensureAbsolute((_b2 = options.root) != null ? _b2 : "", config.root);
       tsConfigPath = ensureAbsolute(tsConfigFilePath, root);
-      outputDir = options.outputDir ? ensureAbsolute(options.outputDir, root) : ensureAbsolute(config.build.outDir, root);
-      if (!outputDir) {
+      outputDirs = options.outputDir ? ensureArray(options.outputDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(config.build.outDir, root)];
+      if (!outputDirs) {
         logger.error(chalk.red(`
 ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check your vite config and plugin options.
 `));
@@ -529,7 +529,7 @@ ${chalk.cyan("[vite:dts]")} Can not resolve declaration directory, please check
     },
     async closeBundle() {
       var _a2, _b2, _c, _d, _e, _f;
-      if (!outputDir || !project || isBundle)
+      if (!outputDirs || !project || isBundle)
         return;
       logger.info(chalk.green(`
 ${logPrefix} Start generate declaration files...`));
@@ -586,7 +586,7 @@ ${logPrefix} Start generate declaration files...`));
       }));
       const service = project.getLanguageService();
       const outputFiles = project.getSourceFiles().map((sourceFile) => service.getEmitOutput(sourceFile, true).getOutputFiles().map((outputFile) => ({
-        path: outputFile.getFilePath(),
+        path: normalizePath2(resolve3(root, outputFile.compilerObject.name)),
         content: outputFile.getText()
       }))).flat().concat(dtsOutputFiles);
       bundleDebug("emit");
@@ -595,6 +595,7 @@ ${logPrefix} Start generate declaration files...`));
       }
       entryRoot = ensureAbsolute(entryRoot, root);
       const wroteFiles = /* @__PURE__ */ new Set();
+      const outputDir = outputDirs[0];
       await runParallel(os.cpus().length, outputFiles, async (outputFile) => {
         var _a3, _b3;
         let filePath = outputFile.path;
@@ -617,7 +618,7 @@ ${logPrefix} Start generate declaration files...`));
           }
         }
         await fs.mkdir(dirname3(filePath), { recursive: true });
-        await fs.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf8");
+        await fs.writeFile(filePath, cleanVueFileName ? content.replace(/['"](.+)\.vue['"]/g, '"$1"') : content, "utf-8");
         wroteFiles.add(normalizePath2(filePath));
       });
       bundleDebug("output");
@@ -653,17 +654,34 @@ ${logPrefix} Start generate declaration files...`));
             entryPath: typesPath,
             fileName: basename(typesPath)
           });
-          wroteFiles.delete(normalizePath2(typesPath));
+          const wroteFile = normalizePath2(typesPath);
+          wroteFiles.delete(wroteFile);
           await runParallel(os.cpus().length, Array.from(wroteFiles), (f) => fs.unlink(f));
           removeDirIfEmpty(outputDir);
+          wroteFiles.clear();
+          wroteFiles.add(wroteFile);
           if (copyDtsFiles) {
             await runParallel(os.cpus().length, dtsOutputFiles, async ({ path, content }) => {
-              await fs.writeFile(resolve3(outputDir, basename(path)), content, "utf8");
+              const filePath = resolve3(outputDir, basename(path));
+              await fs.writeFile(filePath, content, "utf-8");
+              wroteFiles.add(normalizePath2(filePath));
             });
           }
           bundleDebug("rollup");
         }
       }
+      if (outputDirs.length > 1) {
+        const dirs = outputDirs.slice(1);
+        await runParallel(os.cpus().length, Array.from(wroteFiles), async (wroteFile) => {
+          const relativePath = relative2(outputDir, wroteFile);
+          const content = await fs.readFile(wroteFile, "utf-8");
+          await Promise.all(dirs.map(async (dir) => {
+            const filePath = resolve3(dir, relativePath);
+            await fs.mkdir(dirname3(filePath), { recursive: true });
+            await fs.writeFile(filePath, content, "utf-8");
+          }));
+        });
+      }
       if (typeof afterBuild === "function") {
         const result = afterBuild();
         isPromise(result) && await result;

package/package.json

@@ -93,5 +93,5 @@
     "test:e2e": "cd example && cross-env DEBUG=\"vite-plugin-dts:bundle\" vite build"
   },
   "types": "dist/index.d.ts",
-  "version": "1.2.1"
+  "version": "1.3.0"
 }