vite-plugin-dts 4.1.0 → 4.2.0

package/dist/index.cjs

@@ -10,78 +10,19 @@ const languageCore = require('@vue/language-core');
 const typescript = require('@volar/typescript');
 const ts = require('typescript');
 const localPkg = require('local-pkg');
-const vueTsc = require('vue-tsc');
 const pluginutils = require('@rollup/pluginutils');
 const debug = require('debug');
 const kolorist = require('kolorist');
 const apiExtractor = require('@microsoft/api-extractor');
-const node_module = require('node:module');
 const compareVersions = require('compare-versions');
 const MagicString = require('magic-string');
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const ts__default = /*#__PURE__*/_interopDefaultCompat(ts);
 const debug__default = /*#__PURE__*/_interopDefaultCompat(debug);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 
-let hasVue = false;
-try {
-  hasVue = !!(localPkg.getPackageInfoSync("vue") ?? localPkg.getPackageInfoSync("svelte", { paths: [localPkg.resolveModule("svelte") || process.cwd()] }));
-} catch (e) {
-}
-const _createProgram = !hasVue ? ts__default.createProgram : typescript.proxyCreateProgram(ts__default, ts__default.createProgram, (ts2, options) => {
-  const { configFilePath } = options.options;
-  const vueOptions = typeof configFilePath === "string" ? languageCore.createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : languageCore.resolveVueCompilerOptions({});
-  if (options.host) {
-    const writeFile = options.host.writeFile.bind(options.host);
-    options.host.writeFile = (fileName, contents, ...args) => {
-      return writeFile(fileName, vueTsc.removeEmitGlobalTypes(contents), ...args);
-    };
-  }
-  const vueLanguagePlugin = languageCore.createVueLanguagePlugin2(
-    ts2,
-    (id) => id,
-    languageCore.createRootFileChecker(
-      void 0,
-      () => options.rootNames.map((rootName) => rootName.replace(/\\/g, "/")),
-      options.host?.useCaseSensitiveFileNames?.() ?? false
-    ),
-    options.options,
-    vueOptions
-  );
-  return [vueLanguagePlugin];
-});
-const createProgram = !hasVue ? ts__default.createProgram : (options) => {
-  const program = _createProgram(options);
-  const emit = program.emit;
-  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
-    if (writeFile) {
-      return emit(
-        targetSourceFile,
-        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
-          if (fileName.endsWith(".d.ts")) {
-            data = vueTsc.removeEmitGlobalTypes(data);
-          }
-          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
-        },
-        cancellationToken,
-        emitOnlyDtsFiles,
-        customTransformers
-      );
-    }
-    return emit(
-      targetSourceFile,
-      writeFile,
-      cancellationToken,
-      emitOnlyDtsFiles,
-      customTransformers
-    );
-  };
-  return program;
-};
-
 const windowsSlashRE = /\\+/g;
 function slash(p) {
   return p.replace(windowsSlashRE, "/");
@@ -205,25 +146,9 @@ function getTsConfig(tsConfigPath, readFileSync) {
   Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
-function getTsLibFolder({ root, entryRoot }) {
-  let libFolder;
-  try {
-    libFolder = normalizePath(node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))).resolve("typescript")).replace(
-      /node_modules\/typescript.*/,
-      "node_modules/typescript"
-    );
-  } catch {
-    libFolder = resolve(root, "node_modules/typescript");
-    if (!node_fs.existsSync(libFolder)) {
-      if (root !== entryRoot) {
-        libFolder = resolve(entryRoot, "node_modules/typescript");
-        if (!node_fs.existsSync(libFolder))
-          libFolder = void 0;
-      }
-      libFolder = void 0;
-    }
-  }
-  return libFolder;
+function getTsLibFolder() {
+  const libFolder = tryGetPackageInfo("typescript")?.rootPath;
+  return libFolder && normalizePath(libFolder);
 }
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 function base64Encode(number) {
@@ -346,6 +271,51 @@ function parseTsAliases(basePath, paths) {
   }
   return result;
 }
+function tryGetPackageInfo(name) {
+  try {
+    return localPkg.getPackageInfoSync(name) ?? localPkg.getPackageInfoSync(name, { paths: [localPkg.resolveModule(name) || process.cwd()] });
+  } catch (e) {
+  }
+}
+
+const hasVue = !!tryGetPackageInfo("vue");
+const _createProgram = !hasVue ? ts__default.createProgram : typescript.proxyCreateProgram(ts__default, ts__default.createProgram, (ts2, options) => {
+  const { configFilePath } = options.options;
+  const vueOptions = typeof configFilePath === "string" ? languageCore.createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : languageCore.resolveVueCompilerOptions({});
+  const vueLanguagePlugin = languageCore.createVueLanguagePlugin(
+    ts2,
+    options.options,
+    vueOptions,
+    (id) => id
+  );
+  return [vueLanguagePlugin];
+});
+const createProgram = !hasVue ? ts__default.createProgram : (options) => {
+  const program = _createProgram(options);
+  const emit = program.emit;
+  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+    if (writeFile) {
+      return emit(
+        targetSourceFile,
+        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+          if (fileName.endsWith(".d.ts")) ;
+          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
+        },
+        cancellationToken,
+        emitOnlyDtsFiles,
+        customTransformers
+      );
+    }
+    return emit(
+      targetSourceFile,
+      writeFile,
+      cancellationToken,
+      emitOnlyDtsFiles,
+      customTransformers
+    );
+  };
+  return program;
+};
 
 const dtsRE$1 = /\.d\.(m|c)?tsx?$/;
 function rollupDeclarationFiles({
@@ -359,7 +329,7 @@ function rollupDeclarationFiles({
   rollupConfig = {},
   rollupOptions = {}
 }) {
-  const configObjectFullPath = node_path.resolve(root, "api-extractor.json");
+  const configObjectFullPath = resolve(root, "api-extractor.json");
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
@@ -389,7 +359,7 @@ function rollupDeclarationFiles({
       },
       dtsRollup: {
         enabled: true,
-        publicTrimmedFilePath: node_path.resolve(outDir, fileName)
+        publicTrimmedFilePath: resolve(outDir, fileName)
       },
       tsdocMetadata: {
         enabled: false,
@@ -416,7 +386,7 @@ function rollupDeclarationFiles({
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
-    typescriptCompilerFolder: libFolder ? node_path.resolve(libFolder) : void 0,
+    typescriptCompilerFolder: libFolder,
     ...rollupOptions
   });
 }
@@ -451,7 +421,7 @@ function querySvelteVersion() {
   if (typeof lowerVersion === "boolean")
     return;
   try {
-    const version = localPkg.getPackageInfoSync("svelte")?.version ?? localPkg.getPackageInfoSync("svelte", { paths: [localPkg.resolveModule("svelte") || process.cwd()] })?.version;
+    const version = tryGetPackageInfo("svelte")?.version;
     lowerVersion = version ? compareVersions.compare(version, "4.0.0", "<") : false;
   } catch (e) {
     lowerVersion = false;
@@ -491,7 +461,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content: vueTsc.removeEmitGlobalTypes(content) });
+          outputs.push({ path, content });
         },
         void 0,
         true
@@ -1224,7 +1194,7 @@ ${content}`;
               outDir,
               entryPath: path,
               fileName: node_path.basename(path),
-              libFolder: getTsLibFolder({ root, entryRoot }),
+              libFolder: getTsLibFolder(),
               rollupConfig,
               rollupOptions
             });

package/dist/index.mjs

@@ -9,75 +9,17 @@ import { relative, posix, resolve as resolve$1, isAbsolute, dirname, normalize,
 import { existsSync, readdirSync, lstatSync, rmdirSync } from 'node:fs';
 import { readFile, mkdir, writeFile, unlink } from 'node:fs/promises';
 import { cpus } from 'node:os';
-import { createParsedCommandLine, resolveVueCompilerOptions, createVueLanguagePlugin2, createRootFileChecker } from '@vue/language-core';
+import { createParsedCommandLine, resolveVueCompilerOptions, createVueLanguagePlugin } from '@vue/language-core';
 import { proxyCreateProgram } from '@volar/typescript';
 import ts from 'typescript';
 import { getPackageInfoSync, resolveModule } from 'local-pkg';
-import { removeEmitGlobalTypes } from 'vue-tsc';
 import { createFilter } from '@rollup/pluginutils';
 import debug from 'debug';
 import { cyan, yellow, green } from 'kolorist';
 import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
-import { createRequire } from 'node:module';
 import { compare } from 'compare-versions';
 import MagicString from 'magic-string';
 
-let hasVue = false;
-try {
-  hasVue = !!(getPackageInfoSync("vue") ?? getPackageInfoSync("svelte", { paths: [resolveModule("svelte") || process.cwd()] }));
-} catch (e) {
-}
-const _createProgram = !hasVue ? ts.createProgram : proxyCreateProgram(ts, ts.createProgram, (ts2, options) => {
-  const { configFilePath } = options.options;
-  const vueOptions = typeof configFilePath === "string" ? createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : resolveVueCompilerOptions({});
-  if (options.host) {
-    const writeFile = options.host.writeFile.bind(options.host);
-    options.host.writeFile = (fileName, contents, ...args) => {
-      return writeFile(fileName, removeEmitGlobalTypes(contents), ...args);
-    };
-  }
-  const vueLanguagePlugin = createVueLanguagePlugin2(
-    ts2,
-    (id) => id,
-    createRootFileChecker(
-      void 0,
-      () => options.rootNames.map((rootName) => rootName.replace(/\\/g, "/")),
-      options.host?.useCaseSensitiveFileNames?.() ?? false
-    ),
-    options.options,
-    vueOptions
-  );
-  return [vueLanguagePlugin];
-});
-const createProgram = !hasVue ? ts.createProgram : (options) => {
-  const program = _createProgram(options);
-  const emit = program.emit;
-  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
-    if (writeFile) {
-      return emit(
-        targetSourceFile,
-        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
-          if (fileName.endsWith(".d.ts")) {
-            data = removeEmitGlobalTypes(data);
-          }
-          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
-        },
-        cancellationToken,
-        emitOnlyDtsFiles,
-        customTransformers
-      );
-    }
-    return emit(
-      targetSourceFile,
-      writeFile,
-      cancellationToken,
-      emitOnlyDtsFiles,
-      customTransformers
-    );
-  };
-  return program;
-};
-
 const windowsSlashRE = /\\+/g;
 function slash(p) {
   return p.replace(windowsSlashRE, "/");
@@ -201,25 +143,9 @@ function getTsConfig(tsConfigPath, readFileSync) {
   Object.assign(tsConfig.compilerOptions, baseConfig.compilerOptions);
   return tsConfig;
 }
-function getTsLibFolder({ root, entryRoot }) {
-  let libFolder;
-  try {
-    libFolder = normalizePath(createRequire(import.meta.url).resolve("typescript")).replace(
-      /node_modules\/typescript.*/,
-      "node_modules/typescript"
-    );
-  } catch {
-    libFolder = resolve(root, "node_modules/typescript");
-    if (!existsSync(libFolder)) {
-      if (root !== entryRoot) {
-        libFolder = resolve(entryRoot, "node_modules/typescript");
-        if (!existsSync(libFolder))
-          libFolder = void 0;
-      }
-      libFolder = void 0;
-    }
-  }
-  return libFolder;
+function getTsLibFolder() {
+  const libFolder = tryGetPackageInfo("typescript")?.rootPath;
+  return libFolder && normalizePath(libFolder);
 }
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 function base64Encode(number) {
@@ -342,6 +268,51 @@ function parseTsAliases(basePath, paths) {
   }
   return result;
 }
+function tryGetPackageInfo(name) {
+  try {
+    return getPackageInfoSync(name) ?? getPackageInfoSync(name, { paths: [resolveModule(name) || process.cwd()] });
+  } catch (e) {
+  }
+}
+
+const hasVue = !!tryGetPackageInfo("vue");
+const _createProgram = !hasVue ? ts.createProgram : proxyCreateProgram(ts, ts.createProgram, (ts2, options) => {
+  const { configFilePath } = options.options;
+  const vueOptions = typeof configFilePath === "string" ? createParsedCommandLine(ts2, ts2.sys, configFilePath.replace(/\\/g, "/")).vueOptions : resolveVueCompilerOptions({});
+  const vueLanguagePlugin = createVueLanguagePlugin(
+    ts2,
+    options.options,
+    vueOptions,
+    (id) => id
+  );
+  return [vueLanguagePlugin];
+});
+const createProgram = !hasVue ? ts.createProgram : (options) => {
+  const program = _createProgram(options);
+  const emit = program.emit;
+  program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+    if (writeFile) {
+      return emit(
+        targetSourceFile,
+        (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+          if (fileName.endsWith(".d.ts")) ;
+          return writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
+        },
+        cancellationToken,
+        emitOnlyDtsFiles,
+        customTransformers
+      );
+    }
+    return emit(
+      targetSourceFile,
+      writeFile,
+      cancellationToken,
+      emitOnlyDtsFiles,
+      customTransformers
+    );
+  };
+  return program;
+};
 
 const dtsRE$1 = /\.d\.(m|c)?tsx?$/;
 function rollupDeclarationFiles({
@@ -355,7 +326,7 @@ function rollupDeclarationFiles({
   rollupConfig = {},
   rollupOptions = {}
 }) {
-  const configObjectFullPath = resolve$1(root, "api-extractor.json");
+  const configObjectFullPath = resolve(root, "api-extractor.json");
   if (!dtsRE$1.test(fileName)) {
     fileName += ".d.ts";
   }
@@ -385,7 +356,7 @@ function rollupDeclarationFiles({
       },
       dtsRollup: {
         enabled: true,
-        publicTrimmedFilePath: resolve$1(outDir, fileName)
+        publicTrimmedFilePath: resolve(outDir, fileName)
       },
       tsdocMetadata: {
         enabled: false,
@@ -412,7 +383,7 @@ function rollupDeclarationFiles({
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
-    typescriptCompilerFolder: libFolder ? resolve$1(libFolder) : void 0,
+    typescriptCompilerFolder: libFolder,
     ...rollupOptions
   });
 }
@@ -447,7 +418,7 @@ function querySvelteVersion() {
   if (typeof lowerVersion === "boolean")
     return;
   try {
-    const version = getPackageInfoSync("svelte")?.version ?? getPackageInfoSync("svelte", { paths: [resolveModule("svelte") || process.cwd()] })?.version;
+    const version = tryGetPackageInfo("svelte")?.version;
     lowerVersion = version ? compare(version, "4.0.0", "<") : false;
   } catch (e) {
     lowerVersion = false;
@@ -487,7 +458,7 @@ function VueResolver() {
       program.emit(
         sourceFile,
         (path, content) => {
-          outputs.push({ path, content: removeEmitGlobalTypes(content) });
+          outputs.push({ path, content });
         },
         void 0,
         true
@@ -1220,7 +1191,7 @@ ${content}`;
               outDir,
               entryPath: path,
               fileName: basename(path),
-              libFolder: getTsLibFolder({ root, entryRoot }),
+              libFolder: getTsLibFolder(),
               rollupConfig,
               rollupOptions
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dts",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "type": "module",
   "packageManager": "pnpm@9.9.0",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "dev": "unbuild --stub",
     "_postinstall": "is-ci || husky install",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx \"{src,tests}/**\"",
-    "precommit": "lint-staged -c ./.husky/.lintstagedrc -q",
+    "precommit": "lint-staged -c ./.husky/.lintstagedrc -q --allow-empty",
     "prepublishOnly": "pinst --disable",
     "prettier": "pretty-quick --staged && pnpm run lint",
     "postpublish": "pinst --enable",
@@ -58,16 +58,15 @@
     "url": "https://github.com/qmhc/vite-plugin-dts/issues"
   },
   "dependencies": {
-    "@microsoft/api-extractor": "7.47.4",
+    "@microsoft/api-extractor": "7.47.7",
     "@rollup/pluginutils": "^5.1.0",
-    "@volar/typescript": "^2.3.4",
-    "@vue/language-core": "2.0.29",
+    "@volar/typescript": "^2.4.4",
+    "@vue/language-core": "2.1.6",
     "compare-versions": "^6.1.1",
     "debug": "^4.3.6",
     "kolorist": "^1.8.0",
     "local-pkg": "^0.5.0",
-    "magic-string": "^0.30.11",
-    "vue-tsc": "2.0.29"
+    "magic-string": "^0.30.11"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",