@sanity/pkg-utils 6.10.0 → 6.10.2-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.10.0",
+  "version": "6.10.2-canary.0",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -86,13 +86,13 @@
     "cac": "^6.7.14",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
-    "esbuild": "^0.21.5",
+    "esbuild": "^0.23.0",
     "esbuild-register": "^3.5.0",
     "find-config": "^1.0.0",
     "get-latest-version": "^5.1.0",
     "git-url-parse": "^14.0.0",
     "globby": "^11.1.0",
-    "jsonc-parser": "^3.2.1",
+    "jsonc-parser": "^3.3.1",
     "mkdirp": "^3.0.1",
     "outdent": "^0.8.0",
     "parse-git-config": "^3.0.0",
@@ -106,7 +106,7 @@
     "rollup-plugin-esbuild": "^6.1.1",
     "rxjs": "^7.8.1",
     "treeify": "^1.1.0",
-    "uuid": "^9.0.1",
+    "uuid": "^10.0.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.3.0"
   },
@@ -124,9 +124,9 @@
     "@types/rimraf": "^3.0.2",
     "@types/semver": "^7.5.8",
     "@types/treeify": "^1.0.3",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "browserslist-to-esbuild": "2.1.1",
     "commitizen": "^4.3.0",
     "cpx": "^1.5.0",
@@ -135,7 +135,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-simple-import-sort": "^12.1.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "husky": "^8.0.3",
     "lint-staged": "^15.0.2",
     "npm-run-all2": "^6.2.0",
@@ -143,13 +143,13 @@
     "rollup-plugin-visualizer": "^5.12.0",
     "semver": "^7.6.0",
     "ts-node": "^10.9.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "^1.6.0",
     "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "6.10.0"
+    "@sanity/pkg-utils": "6.10.2-canary.0"
   },
   "peerDependencies": {
-    "typescript": "5.4.x"
+    "typescript": "5.4.x || 5.5.x"
   },
   "engines": {
     "node": ">=18.17.0"

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

@@ -179,7 +179,14 @@ export interface PkgConfigOptions {
   dist?: string
   exports?: PkgConfigProperty<PkgExports>
   extract?: {
-    bundledPackages?: string[]
+    /**
+     * Packages 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,14 @@ 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 bundledDependencies = [
+    ...(pkg.devDependencies ? Object.keys(pkg.devDependencies) : []),
+  ].filter((_) => !parsedExternal.includes(_) && _ !== pkg.name)
+  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 +178,7 @@ export async function resolveBuildContext(options: {
     emitDeclarationOnly,
     exports,
     external,
+    bundledPackages,
     files: [],
     logger,
     pkg,

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,