vite-plugin-dts 3.5.2 → 3.5.4

package/dist/index.cjs

@@ -175,6 +175,16 @@ function toCapitalCase(value) {
     ""
   );
 }
+function fileTypesPath(...pkgs) {
+  let path;
+  for (const pkg of pkgs) {
+    if (typeof pkg !== "object")
+      continue;
+    path = pkg.types || pkg.typings || pkg.exports?.["."]?.types || pkg.exports?.["./"]?.types;
+    if (path)
+      return path;
+  }
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -616,11 +626,17 @@ ${logPrefix} ${kolorist.yellow(
           });
         }
       }
-      include = ensureArray(options.include ?? content?.raw.include ?? "**/*").map(normalizeGlob);
-      exclude = ensureArray(options.exclude ?? content?.raw.exclude ?? "node_modules/**").map(
-        normalizeGlob
-      );
-      filter = pluginutils.createFilter(include, exclude, { resolve: root });
+      const computeGlobs = (rootGlobs, tsGlobs, defaultGlob) => {
+        if (rootGlobs?.length) {
+          return ensureArray(rootGlobs).map((glob) => normalizeGlob(ensureAbsolute(glob, root)));
+        }
+        return ensureArray(tsGlobs?.length ? tsGlobs : defaultGlob).map(
+          (glob) => normalizeGlob(ensureAbsolute(glob, configPath ? node_path.dirname(configPath) : root))
+        );
+      };
+      include = computeGlobs(options.include, content?.raw.include, "**/*");
+      exclude = computeGlobs(options.exclude, content?.raw.exclude, "node_modules/**");
+      filter = pluginutils.createFilter(include, exclude);
       const rootNames = Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath);
       host = ts__default.createCompilerHost(compilerOptions, true);
       program = vueTsc.createProgram({ host, rootNames, options: compilerOptions });
@@ -802,7 +818,7 @@ ${logPrefix} Start generate declaration files...`));
         } catch (e) {
         }
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
+        const types = fileTypesPath(pkg.publishConfig, pkg);
         const multiple = entryNames.length > 1;
         let typesPath = types ? resolve(root, types) : resolve(outDir, indexName);
         if (!multiple && !dtsRE.test(typesPath)) {

package/dist/index.d.ts

@@ -115,15 +115,15 @@ interface PluginOptions {
      */
     staticImport?: boolean;
     /**
-     * Override `include` glob
+     * Override `include` glob (relative to root)
      *
-     * Defaults to `include` property of tsconfig.json
+     * Defaults to `include` property of tsconfig.json (relative to tsconfig.json located)
      */
     include?: string | string[];
     /**
      * Override `exclude` glob
      *
-     * Defaults to `exclude` property of tsconfig.json or `'node_module/**'` if not supplied.
+     * Defaults to `exclude` property of tsconfig.json or `'node_modules/**'` if not supplied.
      */
     exclude?: string | string[];
     /**

package/dist/index.mjs

@@ -175,6 +175,16 @@ function toCapitalCase(value) {
     ""
   );
 }
+function fileTypesPath(...pkgs) {
+  let path;
+  for (const pkg of pkgs) {
+    if (typeof pkg !== "object")
+      continue;
+    path = pkg.types || pkg.typings || pkg.exports?.["."]?.types || pkg.exports?.["./"]?.types;
+    if (path)
+      return path;
+  }
+}
 
 const dtsRE$1 = /\.d\.tsx?$/;
 function rollupDeclarationFiles({
@@ -616,11 +626,17 @@ ${logPrefix} ${yellow(
           });
         }
       }
-      include = ensureArray(options.include ?? content?.raw.include ?? "**/*").map(normalizeGlob);
-      exclude = ensureArray(options.exclude ?? content?.raw.exclude ?? "node_modules/**").map(
-        normalizeGlob
-      );
-      filter = createFilter(include, exclude, { resolve: root });
+      const computeGlobs = (rootGlobs, tsGlobs, defaultGlob) => {
+        if (rootGlobs?.length) {
+          return ensureArray(rootGlobs).map((glob) => normalizeGlob(ensureAbsolute(glob, root)));
+        }
+        return ensureArray(tsGlobs?.length ? tsGlobs : defaultGlob).map(
+          (glob) => normalizeGlob(ensureAbsolute(glob, configPath ? dirname(configPath) : root))
+        );
+      };
+      include = computeGlobs(options.include, content?.raw.include, "**/*");
+      exclude = computeGlobs(options.exclude, content?.raw.exclude, "node_modules/**");
+      filter = createFilter(include, exclude);
       const rootNames = Object.values(entries).map((entry) => ensureAbsolute(entry, root)).concat(content?.fileNames.filter(filter) || []).map(normalizePath);
       host = ts.createCompilerHost(compilerOptions, true);
       program = createProgram({ host, rootNames, options: compilerOptions });
@@ -802,7 +818,7 @@ ${logPrefix} Start generate declaration files...`));
         } catch (e) {
         }
         const entryNames = Object.keys(entries);
-        const types = pkg.types || pkg.typings || pkg.publishConfig?.types || pkg.publishConfig?.typings || (pkg.exports?.["."] || pkg.exports?.["./"])?.types;
+        const types = fileTypesPath(pkg.publishConfig, pkg);
         const multiple = entryNames.length > 1;
         let typesPath = types ? resolve(root, types) : resolve(outDir, indexName);
         if (!multiple && !dtsRE.test(typesPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "type": "module",
   "license": "MIT",
   "author": "qmhc",
@@ -53,7 +53,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@microsoft/api-extractor": "^7.36.3",
+    "@microsoft/api-extractor": "^7.36.4",
     "@rollup/pluginutils": "^5.0.2",
     "@vue/language-core": "^1.8.8",
     "debug": "^4.3.4",
@@ -61,10 +61,10 @@
     "vue-tsc": "^1.8.8"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.7",
+    "@commitlint/cli": "^17.7.1",
     "@types/debug": "^4.1.8",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^20.4.5",
+    "@types/node": "^20.4.10",
     "@types/prompts": "^2.4.4",
     "@types/semver": "^7.5.0",
     "@vexip-ui/commitlint-config": "^0.2.0",
@@ -73,7 +73,7 @@
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^11.0.3",
     "conventional-changelog-cli": "^3.0.0",
-    "eslint": "^8.46.0",
+    "eslint": "^8.47.0",
     "execa": "^7.2.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
@@ -86,10 +86,10 @@
     "rimraf": "^5.0.1",
     "semver": "^7.5.4",
     "tsx": "^3.12.7",
-    "typescript": "5.0.4",
+    "typescript": "5.1.6",
     "unbuild": "^1.2.1",
-    "vite": "^4.4.7",
-    "vitest": "^0.33.0"
+    "vite": "^4.4.9",
+    "vitest": "^0.34.1"
   },
   "peerDependencies": {
     "typescript": "*",
@@ -99,5 +99,10 @@
     "vite": {
       "optional": true
     }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@microsoft/api-extractor@7.36.4": "patches/@microsoft__api-extractor@7.36.4.patch"
+    }
   }
 }