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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.10.2-canary.0",
+  "version": "6.10.2",
   "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.2-canary.0"
+    "@sanity/pkg-utils": "6.10.2"
   },
   "peerDependencies": {
     "typescript": "5.4.x || 5.5.x"

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

@@ -180,7 +180,7 @@ export interface PkgConfigOptions {
   exports?: PkgConfigProperty<PkgExports>
   extract?: {
     /**
-     * Packages in `external` are automatically added to the `bundledPackages` config.
+     * 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')

package/src/node/resolveBuildContext.ts

@@ -117,9 +117,13 @@ export async function resolveBuildContext(options: {
       ? [...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((_) => !parsedExternal.includes(_) && _ !== pkg.name)
+  ].filter(
+    // Do not bundle anything that is marked as external
+    (_) => !externalWithTypes.has(_),
+  )
   const bundledPackages =
     config && Array.isArray(config.extract?.bundledPackages)
       ? [...bundledDependencies, ...config.extract.bundledPackages]
@@ -193,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}`
+  }
+}