@sanity/pkg-utils 5.1.3-canary.0 → 5.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "5.1.3-canary.0",
+  "version": "5.1.4",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -59,7 +59,7 @@
   },
   "browserslist": "extends @sanity/browserslist-config",
   "dependencies": {
-    "@babel/core": "^7.24.1",
+    "@babel/core": "^7.24.3",
     "@babel/types": "^7.24.0",
     "@microsoft/api-extractor": "7.43.0",
     "@microsoft/tsdoc-config": "^0.16.2",
@@ -132,7 +132,7 @@
     "typescript": "5.4.2",
     "vitest": "^1.4.0",
     "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "5.1.3-canary.0"
+    "@sanity/pkg-utils": "5.1.4"
   },
   "peerDependencies": {
     "typescript": "5.4.2"

package/src/node/build.ts

@@ -1,4 +1,4 @@
-import {getPkgExtMap, loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig, loadPkgWithReporting} from './core'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveBuildTasks} from './resolveBuildTasks'
@@ -36,14 +36,12 @@ export async function build(options: {
   const pkg = await loadPkgWithReporting({cwd, logger, strict})
 
   const config = await loadConfig({cwd})
-  const extMap = getPkgExtMap()
   const tsconfig = tsconfigOption || config?.tsconfig || 'tsconfig.json'
 
   const ctx = await resolveBuildContext({
     config,
     cwd,
     emitDeclarationOnly,
-    extMap,
     logger,
     pkg,
     strict,

package/src/node/check.ts

@@ -2,7 +2,7 @@ import esbuild, {type BuildFailure} from 'esbuild'
 import path from 'path'
 
 import {createConsoleSpy} from './consoleSpy'
-import {getPkgExtMap, loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig, loadPkgWithReporting} from './core'
 import {fileExists} from './fileExists'
 import {createLogger, type Logger} from './logger'
 import {printPackageTree} from './printPackageTree'
@@ -19,9 +19,8 @@ export async function check(options: {
 
   const pkg = await loadPkgWithReporting({cwd, logger, strict})
   const config = await loadConfig({cwd})
-  const extMap = getPkgExtMap()
   const tsconfig = tsconfigOption || config?.tsconfig || 'tsconfig.json'
-  const ctx = await resolveBuildContext({config, cwd, extMap, logger, pkg, strict, tsconfig})
+  const ctx = await resolveBuildContext({config, cwd, logger, pkg, strict, tsconfig})
 
   printPackageTree(ctx)
 

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

@@ -1,8 +1,8 @@
-import ts from 'typescript'
+import type ts from 'typescript'
 
-import {Logger} from '../../logger'
-import {PkgConfigOptions, PkgExports, PkgRuntime} from '../config'
-import {PackageJSON, PkgExtMap} from '../pkg'
+import type {Logger} from '../../logger'
+import type {PkgConfigOptions, PkgExports, PkgRuntime} from '../config'
+import type {PackageJSON} from '../pkg'
 
 /** @internal */
 export interface BuildFile {
@@ -17,7 +17,6 @@ export interface BuildContext {
   distPath: string
   emitDeclarationOnly: boolean
   exports: PkgExports | undefined
-  extMap: PkgExtMap
   external: string[]
   files: BuildFile[]
   logger: Logger

package/src/node/core/pkg/parseExports.ts

@@ -1,18 +1,16 @@
-import {fileEnding, legacyEnding} from '../../tasks/dts/getTargetPaths'
+import {legacyEnding} from '../../tasks/dts/getTargetPaths'
 import type {PkgExport} from '../config'
 import {isRecord} from '../isRecord'
-import type {PkgExtMap} from './pkgExt'
 import type {PackageJSON} from './types'
 import {validateExports} from './validateExports'
 
 /** @internal */
 export function parseExports(options: {
-  extMap: PkgExtMap
   pkg: PackageJSON
   strict: boolean
   legacyExports: boolean
 }): (PkgExport & {_path: string})[] {
-  const {extMap, pkg, strict, legacyExports} = options
+  const {pkg, strict, legacyExports} = options
 
   const rootExport: PkgExport & {_path: string} = {
     _exported: true,
@@ -70,7 +68,6 @@ export function parseExports(options: {
             )
           }
 
-          // @TODO do not run this check when legacyExports is true
           if (legacyExports) {
             const indexLegacyExport = (
               exportEntry.browser?.import ||
@@ -78,7 +75,7 @@ export function parseExports(options: {
               exportEntry.browser?.require ||
               exportEntry.require ||
               ''
-            ).replace(fileEnding, legacyEnding)
+            ).replace(/(\.esm)?\.[mc]?js$/, legacyEnding)
 
             if (indexLegacyExport !== rootExport.import) {
               errors.push(
@@ -121,7 +118,7 @@ export function parseExports(options: {
 
   const _exports = [rootExport, ...extraExports]
 
-  errors.push(...validateExports(_exports, {extMap, pkg}))
+  errors.push(...validateExports(_exports, {pkg}))
 
   if (errors.length) {
     throw new Error('\n- ' + errors.join('\n- '))

package/src/node/core/pkg/pkgExt.ts

@@ -23,11 +23,3 @@ export const pkgExtMap: PkgExtMap = {
   // package.config.legacyExports: true
   legacy: legacyEnding,
 }
-
-/**
- * @deprecated use `pkgExtMap` instead
- * @internal
- */
-export function getPkgExtMap(): PkgExtMap {
-  return pkgExtMap
-}

package/src/node/core/pkg/validateExports.ts

@@ -1,12 +1,12 @@
 import type {PkgExport} from '../config'
-import type {PkgExtMap} from './pkgExt'
+import {pkgExtMap as extMap} from './pkgExt'
 import type {PackageJSON} from './types'
 
 export function validateExports(
   _exports: (PkgExport & {_path: string})[],
-  options: {extMap: PkgExtMap; pkg: PackageJSON},
+  options: {pkg: PackageJSON},
 ): string[] {
-  const {extMap, pkg} = options
+  const {pkg} = options
   const ext = extMap[pkg.type || 'commonjs']
 
   const errors: string[] = []

package/src/node/resolveBuildContext.ts

@@ -2,19 +2,18 @@ import browserslistToEsbuild from 'browserslist-to-esbuild'
 import path from 'path'
 
 import {
-  BuildContext,
+  type BuildContext,
   DEFAULT_BROWSERSLIST_QUERY,
   loadTSConfig,
-  PackageJSON,
+  type PackageJSON,
   parseExports,
-  PkgConfigOptions,
-  PkgExports,
-  PkgExtMap,
-  PkgRuntime,
+  type PkgConfigOptions,
+  type PkgExports,
+  type PkgRuntime,
   resolveConfigProperty,
 } from './core'
 import {findCommonDirPath, pathContains} from './core/findCommonPath'
-import {Logger} from './logger'
+import type {Logger} from './logger'
 import {resolveBrowserTarget} from './resolveBrowserTarget'
 import {resolveNodeTarget} from './resolveNodeTarget'
 
@@ -22,7 +21,6 @@ export async function resolveBuildContext(options: {
   config?: PkgConfigOptions
   cwd: string
   emitDeclarationOnly?: boolean
-  extMap: PkgExtMap
   logger: Logger
   pkg: PackageJSON
   strict: boolean
@@ -32,7 +30,6 @@ export async function resolveBuildContext(options: {
     config,
     cwd,
     emitDeclarationOnly = false,
-    extMap,
     logger,
     pkg,
     strict,
@@ -77,7 +74,6 @@ export async function resolveBuildContext(options: {
   }
 
   const parsedExports = parseExports({
-    extMap,
     pkg,
     strict,
     legacyExports: config?.legacyExports ?? false,
@@ -151,7 +147,6 @@ export async function resolveBuildContext(options: {
     emitDeclarationOnly,
     exports,
     external,
-    extMap,
     files: [],
     logger,
     pkg,

package/src/node/tasks/rollup/resolveRollupConfig.ts

@@ -85,11 +85,9 @@ export function resolveRollupConfig(
       entries: {...pathAliases},
     }),
     nodeResolve({
-      // mainFields: ['module', 'jsnext', 'main'],
       browser: runtime === 'browser',
-      // exportConditions: [runtime === 'node' ? 'node' : 'browser'],
       extensions: ['.cjs', '.mjs', '.js', '.jsx', '.json', '.node'],
-      preferBuiltins: true, // runtime === 'node',
+      preferBuiltins: true,
     }),
     commonjs(),
     json(),
@@ -109,7 +107,7 @@ export function resolveRollupConfig(
     Array.isArray(config?.babel?.plugins) &&
       getBabelOutputPlugin({
         babelrc: false,
-        plugins: config?.babel?.plugins,
+        plugins: config.babel.plugins,
       }),
     minify &&
       terser({
@@ -137,13 +135,6 @@ export function resolveRollupConfig(
     ? defaultPlugins.concat(userPlugins)
     : resolveConfigProperty(config?.rollup?.plugins, defaultPlugins)
 
-  // When using legacyExports then we need to hash the chunk file names to avoid chunks overwriting each other
-  if (config?.rollup?.hashChunkFileNames === false && config.legacyExports) {
-    throw new TypeError(
-      "when `legacyExports: true` you can't set `rollup.hashChunkFileNames: false` – this would cause chunks to overwrite each other. Please remove the `hashChunkFileNames` option or set it to `true",
-    )
-  }
-
   const hashChunkFileNames = config?.rollup?.hashChunkFileNames ?? false
   const chunksFolder = isLegacyExports
     ? '_legacy'

package/src/node/watch.ts

@@ -1,7 +1,7 @@
 import path from 'path'
 import {switchMap} from 'rxjs'
 
-import {getPkgExtMap, loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig, loadPkgWithReporting} from './core'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveWatchTasks} from './resolveWatchTasks'
@@ -32,10 +32,9 @@ export async function watch(options: {
 
       const pkg = await loadPkgWithReporting({cwd, logger, strict})
       const config = await loadConfig({cwd})
-      const extMap = getPkgExtMap()
       const tsconfig = tsconfigOption || config?.tsconfig || 'tsconfig.json'
 
-      return resolveBuildContext({config, cwd, extMap, logger, pkg, strict, tsconfig})
+      return resolveBuildContext({config, cwd, logger, pkg, strict, tsconfig})
     }),
   )