vite-plugin-dts 3.6.2 → 3.6.4

package/dist/index.cjs

@@ -185,6 +185,27 @@ function findTypesPath(...pkgs) {
       return path;
   }
 }
+function setModuleResolution(options) {
+  if (options.moduleResolution)
+    return;
+  const module = typeof options.module === "number" ? options.module : options.target ?? ts__default.ScriptTarget.ES5 >= 2 ? ts__default.ModuleKind.ES2015 : ts__default.ModuleKind.CommonJS;
+  let moduleResolution;
+  switch (module) {
+    case ts__default.ModuleKind.CommonJS:
+      moduleResolution = ts__default.ModuleResolutionKind.Node10;
+      break;
+    case ts__default.ModuleKind.Node16:
+      moduleResolution = ts__default.ModuleResolutionKind.Node16;
+      break;
+    case ts__default.ModuleKind.NodeNext:
+      moduleResolution = ts__default.ModuleResolutionKind.NodeNext;
+      break;
+    default:
+      moduleResolution = ts__default.version.startsWith("5") ? ts__default.ModuleResolutionKind.Bundler : ts__default.ModuleResolutionKind.Classic;
+      break;
+  }
+  options.moduleResolution = moduleResolution;
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -446,6 +467,10 @@ const pureImportRE = /import\s?['"][^;\n]+?['"];?\n?/g;
 function removePureImport(content) {
   return content.replace(pureImportRE, "");
 }
+const asDefaultRE = /export\s*\{.*\w+\s*\bas\s+default\b.*\}\s*from\s*['"].+['"]/;
+function hasExportDefault(content) {
+  return content.includes("export default") || asDefaultRE.test(content);
+}
 
 const jsRE = /\.(m|c)?jsx?$/;
 const tsRE = /\.(m|c)?tsx?$/;
@@ -609,9 +634,6 @@ ${logPrefix} ${kolorist.yellow(
       configPath = tsconfigPath ? ensureAbsolute(tsconfigPath, root) : ts__default.findConfigFile(root, ts__default.sys.fileExists);
       const content = configPath ? languageCore.createParsedCommandLine(ts__default, ts__default.sys, configPath) : void 0;
       compilerOptions = {
-        // (#277) If user don't specify `moduleResolution` in top config file,
-        // declaration of Vue files will be inferred to `any` type.
-        moduleResolution: ts__default.ModuleResolutionKind.Node10,
         ...content?.options || {},
         ...options.compilerOptions || {},
         ...fixedCompilerOptions,
@@ -619,6 +641,9 @@ ${logPrefix} ${kolorist.yellow(
         declarationDir: "."
       };
       rawCompilerOptions = content?.raw.compilerOptions || {};
+      if (content?.fileNames.find((name) => name.endsWith(".vue"))) {
+        setModuleResolution(compilerOptions);
+      }
       if (!outDirs) {
         outDirs = options.outDir ? ensureArray(options.outDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(content?.raw.compilerOptions?.outDir || "dist", root)];
       }
@@ -673,7 +698,7 @@ ${logPrefix} ${kolorist.yellow(
       entryRoot = ensureAbsolute(entryRoot, root);
       const diagnostics = program.getDeclarationDiagnostics();
       if (diagnostics?.length) {
-        logger.error(ts__default.formatDiagnostics(diagnostics, host));
+        logger.error(ts__default.formatDiagnosticsWithColorAndContext(diagnostics, host));
       }
       if (typeof afterDiagnostic === "function") {
         await wrapPromise(afterDiagnostic(diagnostics));
@@ -867,13 +892,10 @@ ${logPrefix} ${kolorist.yellow(
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
           let content = `export * from '${fromPath}'
 `;
-          if (node_fs.existsSync(index)) {
-            const entryCodes = await promises.readFile(index, "utf-8");
-            if (entryCodes.includes("export default")) {
-              content += `import ${libName} from '${fromPath}'
+          if (node_fs.existsSync(index) && hasExportDefault(await promises.readFile(index, "utf-8"))) {
+            content += `import ${libName} from '${fromPath}'
 export default ${libName}
 `;
-            }
           }
           await writeOutput(cleanPath(path), content, outDir);
         }

package/dist/index.mjs

@@ -185,6 +185,27 @@ function findTypesPath(...pkgs) {
       return path;
   }
 }
+function setModuleResolution(options) {
+  if (options.moduleResolution)
+    return;
+  const module = typeof options.module === "number" ? options.module : options.target ?? ts.ScriptTarget.ES5 >= 2 ? ts.ModuleKind.ES2015 : ts.ModuleKind.CommonJS;
+  let moduleResolution;
+  switch (module) {
+    case ts.ModuleKind.CommonJS:
+      moduleResolution = ts.ModuleResolutionKind.Node10;
+      break;
+    case ts.ModuleKind.Node16:
+      moduleResolution = ts.ModuleResolutionKind.Node16;
+      break;
+    case ts.ModuleKind.NodeNext:
+      moduleResolution = ts.ModuleResolutionKind.NodeNext;
+      break;
+    default:
+      moduleResolution = ts.version.startsWith("5") ? ts.ModuleResolutionKind.Bundler : ts.ModuleResolutionKind.Classic;
+      break;
+  }
+  options.moduleResolution = moduleResolution;
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -446,6 +467,10 @@ const pureImportRE = /import\s?['"][^;\n]+?['"];?\n?/g;
 function removePureImport(content) {
   return content.replace(pureImportRE, "");
 }
+const asDefaultRE = /export\s*\{.*\w+\s*\bas\s+default\b.*\}\s*from\s*['"].+['"]/;
+function hasExportDefault(content) {
+  return content.includes("export default") || asDefaultRE.test(content);
+}
 
 const jsRE = /\.(m|c)?jsx?$/;
 const tsRE = /\.(m|c)?tsx?$/;
@@ -609,9 +634,6 @@ ${logPrefix} ${yellow(
       configPath = tsconfigPath ? ensureAbsolute(tsconfigPath, root) : ts.findConfigFile(root, ts.sys.fileExists);
       const content = configPath ? createParsedCommandLine(ts, ts.sys, configPath) : void 0;
       compilerOptions = {
-        // (#277) If user don't specify `moduleResolution` in top config file,
-        // declaration of Vue files will be inferred to `any` type.
-        moduleResolution: ts.ModuleResolutionKind.Node10,
         ...content?.options || {},
         ...options.compilerOptions || {},
         ...fixedCompilerOptions,
@@ -619,6 +641,9 @@ ${logPrefix} ${yellow(
         declarationDir: "."
       };
       rawCompilerOptions = content?.raw.compilerOptions || {};
+      if (content?.fileNames.find((name) => name.endsWith(".vue"))) {
+        setModuleResolution(compilerOptions);
+      }
       if (!outDirs) {
         outDirs = options.outDir ? ensureArray(options.outDir).map((d) => ensureAbsolute(d, root)) : [ensureAbsolute(content?.raw.compilerOptions?.outDir || "dist", root)];
       }
@@ -673,7 +698,7 @@ ${logPrefix} ${yellow(
       entryRoot = ensureAbsolute(entryRoot, root);
       const diagnostics = program.getDeclarationDiagnostics();
       if (diagnostics?.length) {
-        logger.error(ts.formatDiagnostics(diagnostics, host));
+        logger.error(ts.formatDiagnosticsWithColorAndContext(diagnostics, host));
       }
       if (typeof afterDiagnostic === "function") {
         await wrapPromise(afterDiagnostic(diagnostics));
@@ -867,13 +892,10 @@ ${logPrefix} ${yellow(
           fromPath = fullRelativeRE.test(fromPath) ? fromPath : `./${fromPath}`;
           let content = `export * from '${fromPath}'
 `;
-          if (existsSync(index)) {
-            const entryCodes = await readFile(index, "utf-8");
-            if (entryCodes.includes("export default")) {
-              content += `import ${libName} from '${fromPath}'
+          if (existsSync(index) && hasExportDefault(await readFile(index, "utf-8"))) {
+            content += `import ${libName} from '${fromPath}'
 export default ${libName}
 `;
-            }
           }
           await writeOutput(cleanPath(path), content, outDir);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",