@sanity/pkg-utils 6.10.1 → 6.10.2-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.10.1",
+  "version": "6.10.2-canary.1",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -146,7 +146,7 @@
     "typescript": "5.5.3",
     "vitest": "^1.6.0",
     "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "6.10.1"
+    "@sanity/pkg-utils": "6.10.2-canary.1"
   },
   "peerDependencies": {
     "typescript": "5.4.x || 5.5.x"

package/src/node/core/config/types.ts

@@ -179,7 +179,14 @@ export interface PkgConfigOptions {
   dist?: string
   exports?: PkgConfigProperty<PkgExports>
   extract?: {
-    bundledPackages?: string[]
+    /**
+     * Packages in `devDependencies` that are not in `external` are automatically added to the `bundledPackages` config.
+     * You can exclude a package from being bundled by using a callback:
+     * ```
+     * bundledPackages: (prev) => prev.filter(package => package !== 'sanity')
+     * ```
+     */
+    bundledPackages?: PkgConfigProperty<string[]>
     customTags?: TSDocCustomTag[]
     rules?: {
       'ae-forgotten-export'?: PkgRuleLevel

package/src/node/core/contexts/buildContext.ts

@@ -18,6 +18,7 @@ export interface BuildContext {
   emitDeclarationOnly: boolean
   exports: PkgExports | undefined
   external: string[]
+  bundledPackages: string[]
   files: BuildFile[]
   logger: Logger
   pkg: PackageJSON

package/src/node/resolveBuildContext.ts

@@ -116,6 +116,18 @@ export async function resolveBuildContext(options: {
     config && Array.isArray(config.external)
       ? [...parsedExternal, ...config.external]
       : resolveConfigProperty(config?.external, parsedExternal)
+  // Merge bundledPackages with dev deps, replace if it's a function
+  const externalWithTypes = new Set([pkg.name, ...external, ...external.map(transformPackageName)])
+  const bundledDependencies = [
+    ...(pkg.devDependencies ? Object.keys(pkg.devDependencies) : []),
+  ].filter(
+    // Do not bundle anything that is marked as external
+    (_) => !externalWithTypes.has(_),
+  )
+  const bundledPackages =
+    config && Array.isArray(config.extract?.bundledPackages)
+      ? [...bundledDependencies, ...config.extract.bundledPackages]
+      : resolveConfigProperty(config?.extract?.bundledPackages, bundledDependencies)
 
   const outputPaths = Object.values(exports)
     .flatMap((exportEntry) => {
@@ -170,6 +182,7 @@ export async function resolveBuildContext(options: {
     emitDeclarationOnly,
     exports,
     external,
+    bundledPackages,
     files: [],
     logger,
     pkg,
@@ -184,3 +197,18 @@ export async function resolveBuildContext(options: {
 
   return ctx
 }
+
+function transformPackageName(packageName: string): string {
+  if (packageName.startsWith('@types/')) {
+    // If it already starts with @types, return it as is
+    return packageName
+  } else if (packageName.startsWith('@')) {
+    // Handle scoped packages
+    const [scope, name] = packageName.split('/')
+
+    return `@types/${scope.slice(1)}__${name}`
+  } else {
+    // Handle regular packages
+    return `@types/${packageName}`
+  }
+}

package/src/node/tasks/dts/doExtract.ts

@@ -18,7 +18,7 @@ export async function doExtract(
   ctx: BuildContext,
   task: DtsTask | DtsWatchTask,
 ): Promise<DtsResult> {
-  const {config, cwd, files, logger, strict, ts} = ctx
+  const {config, cwd, files, logger, strict, ts, bundledPackages} = ctx
 
   if (!ts.config || !ts.configPath) {
     return {type: 'dts', messages: [], results: []}
@@ -48,7 +48,7 @@ export async function doExtract(
     const targetPaths = entry.targetPaths.map((targetPath) => path.resolve(cwd, targetPath))
     const filePaths = targetPaths.map((targetPath) => path.relative(outDir, targetPath))
     const result = await extractTypes({
-      bundledPackages: config?.extract?.bundledPackages || [],
+      bundledPackages: bundledPackages || [],
       customTags: config?.extract?.customTags,
       cwd,
       distPath: outDir,