bunup 0.16.22 → 0.16.24

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import {
   build,
   processLoadedConfigs,
   resolveBuildOptions
-} from "../shared/bunup-v98vwe9z.js";
+} from "../shared/bunup-rt9wtqx8.js";
 import {
   BunupBuildError,
   BunupCLIError,
@@ -26,7 +26,7 @@ import {
 import { loadConfig } from "coffi";
 import pc4 from "picocolors";
 // packages/bunup/package.json
-var version = "0.16.22";
+var version = "0.16.24";
 
 // packages/bunup/src/printer/print-build-report.ts
 import { promisify } from "util";

package/dist/index.js

@@ -1,7 +1,7 @@
 // @bun
 import {
   build
-} from "./shared/bunup-v98vwe9z.js";
+} from "./shared/bunup-rt9wtqx8.js";
 import"./shared/bunup-4epc480j.js";
 // packages/bunup/src/define.ts
 function defineConfig(options) {

package/dist/shared/{bunup-v98vwe9z.js → bunup-rt9wtqx8.js}

@@ -80,6 +80,70 @@ function ensureMinimumBunVersion() {
   ensureBunVersion(MINIMUM_BUN_VERSION);
 }
 
+// packages/bunup/src/utils/package.ts
+function getPackageExternalDeps(packageJson) {
+  if (!packageJson)
+    return [];
+  return Array.from(new Set([
+    ...Object.keys(packageJson.dependencies || {}),
+    ...Object.keys(packageJson.peerDependencies || {})
+  ]));
+}
+function getPackageAllDeps(packageJson) {
+  if (!packageJson)
+    return [];
+  return Array.from(new Set([
+    ...Object.keys(packageJson.dependencies || {}),
+    ...Object.keys(packageJson.devDependencies || {}),
+    ...Object.keys(packageJson.peerDependencies || {})
+  ]));
+}
+
+// packages/bunup/src/helpers/external.ts
+function getDepsPatterns(deps) {
+  return deps.map((dep) => new RegExp(`^${dep}($|\\/|\\\\)`));
+}
+function matchesPattern(path2, pattern) {
+  return typeof pattern === "string" ? pattern === path2 : pattern.test(path2);
+}
+function isExternalFromPackageJson(path2, options, packageJson) {
+  const packageExternalDepsPatterns = getDepsPatterns(getPackageExternalDeps(packageJson));
+  const packageAllDepsPatterns = getDepsPatterns(getPackageAllDeps(packageJson));
+  if (options.packages === "bundle") {
+    const explicitlyExternal = options.external?.some((pattern) => matchesPattern(path2, pattern));
+    return explicitlyExternal;
+  }
+  if (options.packages === "external") {
+    const explicitlyBundled = options.noExternal?.some((pattern) => matchesPattern(path2, pattern));
+    if (explicitlyBundled) {
+      return false;
+    }
+    return packageAllDepsPatterns.some((pattern) => pattern.test(path2));
+  }
+  const matchesExternalPattern = packageExternalDepsPatterns.some((pattern) => pattern.test(path2)) || options.external?.some((pattern) => matchesPattern(path2, pattern));
+  const isExcludedFromExternal = options.noExternal?.some((pattern) => matchesPattern(path2, pattern));
+  return matchesExternalPattern && !isExcludedFromExternal;
+}
+function getBundledDepsForDtsResolve(options, packageJson) {
+  if (options.packages === "bundle") {
+    const allDeps2 = getPackageAllDeps(packageJson);
+    const bundled = options.external?.length ? allDeps2.filter((dep) => !options.external.some((p) => matchesPattern(dep, p))) : allDeps2;
+    return bundled.length ? getDepsPatterns(bundled) : undefined;
+  }
+  if (options.packages === "external") {
+    return options.noExternal?.length ? [...options.noExternal] : undefined;
+  }
+  const externalDeps = new Set(getPackageExternalDeps(packageJson));
+  const allDeps = getPackageAllDeps(packageJson);
+  const devDeps = allDeps.filter((dep) => !externalDeps.has(dep));
+  const bundledDevDeps = options.external?.length ? devDeps.filter((dep) => !options.external.some((p) => matchesPattern(dep, p))) : devDeps;
+  const patterns = [
+    ...getDepsPatterns(bundledDevDeps),
+    ...options.noExternal ?? []
+  ];
+  return patterns.length ? patterns : undefined;
+}
+
 // packages/bunup/src/helpers/on-success.ts
 import { exec } from "tinyexec";
 import treeKill from "tree-kill";
@@ -163,41 +227,6 @@ export default classes;
   };
 }
 
-// packages/bunup/src/utils/package.ts
-function getPackageDeps(packageJson) {
-  if (!packageJson)
-    return [];
-  return Array.from(new Set([
-    ...Object.keys(packageJson.dependencies || {}),
-    ...Object.keys(packageJson.peerDependencies || {})
-  ]));
-}
-
-// packages/bunup/src/helpers/external.ts
-function getPackageDepsPatterns(packageJson) {
-  return getPackageDeps(packageJson).map((dep) => new RegExp(`^${dep}($|\\/|\\\\)`));
-}
-function matchesPattern(path2, pattern) {
-  return typeof pattern === "string" ? pattern === path2 : pattern.test(path2);
-}
-function isExternalFromPackageJson(path2, options, packageJson) {
-  const packageDepsPatterns = getPackageDepsPatterns(packageJson);
-  if (options.packages === "bundle") {
-    const explicitlyExternal = options.external?.some((pattern) => matchesPattern(path2, pattern));
-    return explicitlyExternal;
-  }
-  if (options.packages === "external") {
-    const explicitlyBundled = options.noExternal?.some((pattern) => matchesPattern(path2, pattern));
-    if (explicitlyBundled) {
-      return false;
-    }
-    return packageDepsPatterns.some((pattern) => pattern.test(path2));
-  }
-  const matchesExternalPattern = packageDepsPatterns.some((pattern) => pattern.test(path2)) || options.external?.some((pattern) => matchesPattern(path2, pattern));
-  const isExcludedFromExternal = options.noExternal?.some((pattern) => matchesPattern(path2, pattern));
-  return matchesExternalPattern && !isExcludedFromExternal;
-}
-
 // packages/bunup/src/plugins/internal/external-option.ts
 function externalOptionPlugin(options, packageJson) {
   return {
@@ -500,7 +529,6 @@ async function build(userOptions, rootDir = process.cwd()) {
         env: resolvedEnv,
         ignoreDCEAnnotations: options.ignoreDCEAnnotations,
         emitDCEAnnotations: options.emitDCEAnnotations,
-        packages: options.packages,
         jsx: options.jsx,
         compile: options.compile,
         outdir: options.compile ? path4.resolve(rootDir, options.outDir) : undefined,
@@ -561,7 +589,9 @@ async function build(userOptions, rootDir = process.cwd()) {
   }
   if ((options.dts || options.dtsOnly) && !options.compile) {
     try {
-      const { entry, splitting, ...dtsOptions } = typeof options.dts === "object" ? options.dts : {};
+      const { entry, splitting, resolve: userDtsResolve, ...dtsOptions } = typeof options.dts === "object" ? options.dts : {};
+      const bundledDeps = getBundledDepsForDtsResolve(options, packageJson.data);
+      const dtsResolve = !bundledDeps?.length ? userDtsResolve : userDtsResolve === true ? true : [...bundledDeps, ...Array.isArray(userDtsResolve) ? userDtsResolve : []];
       const dtsResult = await generateDts(ensureArray(entry ?? entrypoints), {
         cwd: rootDir,
         preferredTsconfig: options.preferredTsconfig,
@@ -570,7 +600,8 @@ async function build(userOptions, rootDir = process.cwd()) {
           chunk: getDefaultChunkNaming(options.name)
         },
         root: options.sourceBase ? path4.resolve(rootDir, options.sourceBase) : undefined,
-        ...dtsOptions
+        ...dtsOptions,
+        resolve: dtsResolve
       });
       if (dtsResult.errors.length && !logger.isSilent()) {
         logIsolatedDeclarationErrors(dtsResult.errors);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bunup",
-	"version": "0.16.22",
+	"version": "0.16.24",
 	"description": "⚡ A blazing-fast build tool for your libraries built with Bun.",
 	"keywords": [
 		"bun",
@@ -50,8 +50,8 @@
 		"type-check": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@bunup/dts": "^0.14.50",
-		"@bunup/shared": "0.16.20",
+		"@bunup/dts": "^0.14.52",
+		"@bunup/shared": "0.16.23",
 		"chokidar": "^5.0.0",
 		"coffi": "^0.1.37",
 		"lightningcss": "^1.30.2",