@sanity/pkg-utils 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "Sanity.io <hello@sanity.io>",
   "license": "MIT",
   "description": "Simple utilities for modern npm packages.",
@@ -48,6 +48,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@sanity/tsdoc-to-portable-text": "^0.4.1",
+    "browserslist": "^4.21.3",
     "cac": "^6.7.12",
     "chalk": "^4.1.2",
     "esbuild": "^0.15.5",

package/src/build/_parseBrowserslistVersions.ts

@@ -0,0 +1,60 @@
+import browserslist from 'browserslist'
+
+export interface _PackageTargetVersions {
+  chrome: string[]
+  ff: string[]
+  edge: string[]
+  iosSaf: string[]
+  saf: string[]
+  opera: string[]
+  node: string[]
+}
+
+function _sortAsNumber(a: string, b: string) {
+  const aVersion = Number(a)
+  const bVersion = Number(b)
+
+  return aVersion - bVersion
+}
+
+export function _parseBrowserslistVersions(query: string[]): _PackageTargetVersions {
+  const result = browserslist(query)
+
+  const entries = result.map((key) => {
+    const [name, version] = key.split(' ')
+
+    return {name, version: version.split('-')[0].split('.')[0]}
+  })
+
+  const andChr = entries.filter((b) => b.name === 'and_chr')
+  const andFf = entries.filter((b) => b.name === 'and_ff')
+  const chrome = entries.filter((b) => b.name === 'chrome')
+  const edge = entries.filter((b) => b.name === 'edge')
+  const ff = entries.filter((b) => b.name === 'firefox')
+  const iosSaf = entries.filter((b) => b.name === 'ios_saf')
+  const saf = entries.filter((b) => b.name === 'safari')
+  const opera = entries.filter((b) => b.name === 'opera')
+  const node = entries.filter((b) => b.name === 'node')
+
+  // versions
+  const versions: _PackageTargetVersions = {
+    chrome: andChr.concat(chrome).map((b) => b.version),
+    ff: andFf.concat(ff).map((b) => b.version),
+    edge: edge.map((b) => b.version),
+    iosSaf: iosSaf.map((b) => b.version),
+    saf: saf.map((b) => b.version),
+    opera: opera.map((b) => b.version),
+    node: node.map((b) => b.version),
+  }
+
+  // sort
+  versions.chrome.sort(_sortAsNumber)
+  versions.ff.sort(_sortAsNumber)
+  versions.edge.sort(_sortAsNumber)
+  versions.iosSaf.sort(_sortAsNumber)
+  versions.saf.sort(_sortAsNumber)
+  versions.opera.sort(_sortAsNumber)
+  versions.node.sort(_sortAsNumber)
+
+  return versions
+}

package/src/build/_parseNodeTarget.ts

@@ -0,0 +1,15 @@
+import {_PackageTargetVersions} from './_parseBrowserslistVersions'
+
+export function _parseNodeTarget(versions: _PackageTargetVersions): string[] | undefined {
+  const target: string[] = []
+
+  if (versions.node.length) {
+    target.push(`node${versions.node[0]}`)
+  }
+
+  if (target.length === 0) {
+    return undefined
+  }
+
+  return target
+}

package/src/build/_parseTasks.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-import {PackageSubPathExportEntry, _DEFAULTS} from '../core'
+import {PackageSubPathExportEntry} from '../core'
 import {_BuildContext} from './_types'
 import {_BuildTask, _DtsTask, _RollupTask} from './tasks'
 
@@ -49,11 +49,11 @@ export function _parseTasks(ctx: _BuildContext): _BuildTask[] {
     }
 
     if (runtime === 'node') {
-      target.push(...(config?.target?.node || _DEFAULTS.target.node))
+      target.push(...ctx.target.node)
     }
 
     if (runtime === 'web') {
-      target.push(...(config?.target?.web || _DEFAULTS.target.web))
+      target.push(...ctx.target.web)
     }
 
     for (const f of format) {

package/src/build/_parseWebTarget.ts

@@ -0,0 +1,35 @@
+import {_PackageTargetVersions} from './_parseBrowserslistVersions'
+
+export function _parseWebTarget(versions: _PackageTargetVersions): string[] | undefined {
+  const target: string[] = []
+
+  if (versions.chrome.length) {
+    target.push(`chrome${versions.chrome[0]}`)
+  }
+
+  if (versions.ff.length) {
+    target.push(`firefox${versions.ff[0]}`)
+  }
+
+  if (versions.edge.length) {
+    target.push(`edge${versions.edge[0]}`)
+  }
+
+  if (versions.iosSaf.length) {
+    target.push(`ios${versions.iosSaf[0]}`)
+  }
+
+  if (versions.saf.length) {
+    target.push(`safari${versions.saf[0]}`)
+  }
+
+  if (versions.opera.length) {
+    target.push(`opera${versions.opera[0]}`)
+  }
+
+  if (target.length === 0) {
+    return undefined
+  }
+
+  return target
+}

package/src/build/_types.ts

@@ -21,5 +21,6 @@ export interface _BuildContext {
   dist: string
   pkg: _PackageJSON
   src: string
+  target: {node: string[]; web: string[]}
   tsconfig?: string
 }

package/src/build/build.ts

@@ -2,8 +2,18 @@
 
 import path from 'path'
 import chalk from 'chalk'
-import {PackageExports, _loadConfig, _loadPkg, _parseExports, _resolveConfigProperty} from '../core'
+import {
+  PackageExports,
+  _DEFAULTS,
+  _loadConfig,
+  _loadPkg,
+  _parseExports,
+  _resolveConfigProperty,
+} from '../core'
+import {_parseBrowserslistVersions} from './_parseBrowserslistVersions'
+import {_parseNodeTarget} from './_parseNodeTarget'
 import {_parseTasks} from './_parseTasks'
+import {_parseWebTarget} from './_parseWebTarget'
 import {_BuildContext} from './_types'
 import {_dtsTask, _extractTask, _rollupTask} from './tasks'
 
@@ -25,18 +35,16 @@ export async function build(options: {
     return {...acc, [exportPath]: exportEntry}
   }, {})
 
-  const exports = config?.exports
-    ? _resolveConfigProperty(config.exports, parsedExports)
-    : parsedExports
+  const exports = _resolveConfigProperty(config?.exports, parsedExports)
 
-  const initialExternal = [
+  const parsedExternal = [
     ...(pkg.dependencies ? Object.keys(pkg.dependencies) : []),
     ...(pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : []),
   ]
 
-  const external = config?.external
-    ? _resolveConfigProperty(config.external, initialExternal)
-    : initialExternal
+  const external = _resolveConfigProperty(config?.external, parsedExternal)
+
+  const targetVersions = _parseBrowserslistVersions(pkg.browserslist || _DEFAULTS.browserslist)
 
   const srcPath = path.resolve(cwd, config?.src || 'src')
   const distPath = path.resolve(cwd, config?.dist || 'dist')
@@ -51,11 +59,14 @@ export async function build(options: {
     dist: path.relative(cwd, distPath),
     pkg,
     src: path.relative(cwd, srcPath),
+    target: {
+      node: _parseNodeTarget(targetVersions) || _DEFAULTS.target.node,
+      web: _parseWebTarget(targetVersions) || _DEFAULTS.target.web,
+    },
     tsconfig,
   }
 
   console.log(chalk.gray('cwd       '), context.cwd)
-  // console.log('external ', context.external)
   console.log(chalk.gray('src       '), context.src)
   console.log(chalk.gray('dist      '), context.dist)
   console.log(chalk.gray('tsconfig  '), context.tsconfig)

package/src/core/_defaults.ts

@@ -2,8 +2,10 @@
  * @internal
  */
 export const _DEFAULTS = {
-  target: {
-    node: ['node12'],
-    web: ['chrome58', 'edge16', 'firefox54', 'opera44', 'safari11'],
-  },
+  browserslist: [
+    '> 0.2% and supports es6-module and supports es6-module-dynamic-import',
+    'not dead',
+    'not IE 11',
+    'maintained node versions',
+  ],
 }

package/src/core/config/_resolveConfigProperty.ts

@@ -3,7 +3,9 @@ import {ConfigProperty, ConfigPropertyResolver} from './types'
 /**
  * @internal
  */
-export function _resolveConfigProperty<T>(prop: ConfigProperty<T>, initialValue: T): T {
+export function _resolveConfigProperty<T>(prop: ConfigProperty<T> | undefined, initialValue: T): T {
+  if (!prop) return initialValue
+
   if (typeof prop === 'function') {
     return (prop as ConfigPropertyResolver<T>)(initialValue)
   }

package/src/core/config/types.ts

@@ -49,8 +49,4 @@ export interface PkgConfigOptions {
    * Directory of source files.
    */
   src?: string
-  target?: {
-    node?: string[]
-    web?: string[]
-  }
 }

package/src/core/pkg/_types.ts

@@ -15,4 +15,5 @@ export interface _PackageJSON {
   source?: string
   module?: string
   types?: string
+  browserslist?: string[]
 }