@sanity/pkg-utils 3.3.9-canary.0 → 4.1.0

package/dist/index.js

@@ -3,6 +3,7 @@ import path$1, { relative, resolve, dirname } from 'path';
 import pkgUp from 'pkg-up';
 import findConfig from 'find-config';
 import fs$1, { statSync } from 'fs';
+import config from '@sanity/browserslist-config';
 import fs, { writeFile, readFile, readdir, lstat } from 'fs/promises';
 import { z, ZodError } from 'zod';
 import chalk from 'chalk';
@@ -101,12 +102,7 @@ function resolveConfigProperty(prop, initialValue) {
   return prop;
 }
 
-const DEFAULT_BROWSERSLIST_QUERY = [
-  "> 0.2% and supports es6-module and supports es6-module-dynamic-import",
-  "not dead",
-  "not IE 11",
-  "maintained node versions"
-];
+const DEFAULT_BROWSERSLIST_QUERY = config;
 
 function isRecord(value) {
   return Boolean(value) && !Array.isArray(value) && typeof value === "object";
@@ -156,7 +152,7 @@ const pkgSchema = z.object({
       ])
     )
   ),
-  browserslist: z.optional(z.array(z.string()))
+  browserslist: z.optional(z.union([z.string(), z.array(z.string())]))
 });
 function validatePkg(input) {
   return pkgSchema.parse(input);
@@ -517,6 +513,99 @@ function createLogger() {
   };
 }
 
+// convert the browserslist field in package.json to
+// esbuild compatible array of browsers
+function browserslistToEsbuild(browserslistConfig, options = {}) {
+  if (!browserslistConfig) {
+    // the path from where the script is run
+    const path = process.cwd();
+
+    // read config if none is passed
+    browserslistConfig = browserslist.loadConfig({ path, ...options });
+  }
+
+  const SUPPORTED_ESBUILD_TARGETS = [
+    'es',
+    'chrome',
+    'edge',
+    'firefox',
+    'ios',
+    'node',
+    'safari',
+    'opera',
+    'ie',
+  ];
+
+  // https://github.com/eBay/browserslist-config/issues/16#issuecomment-863870093
+  const UNSUPPORTED = ['android 4'];
+
+  const replaces = {
+    ios_saf: 'ios',
+    android: 'chrome',
+  };
+
+  const separator = ' ';
+
+  return (
+    browserslist(browserslistConfig, options)
+      // filter out the unsupported ones
+      .filter((b) => !UNSUPPORTED.some((u) => b.startsWith(u)))
+      // replaces safari TP with latest safari version
+      .map((b) => {
+        if (b === 'safari TP') {
+          return browserslist('last 1 safari version')[0]
+        }
+
+        return b
+      })
+      // transform into ['chrome', '88']
+      .map((b) => b.split(separator))
+      // replace the similar browser
+      .map((b) => {
+        if (replaces[b[0]]) {
+          b[0] = replaces[b[0]];
+        }
+
+        return b
+      })
+      // 11.0-12.0 --> 11.0
+      .map((b) => {
+        if (b[1].includes('-')) {
+          b[1] = b[1].slice(0, b[1].indexOf('-'));
+        }
+
+        return b
+      })
+      // 11.0 --> 11
+      .map((b) => {
+        if (b[1].endsWith('.0')) {
+          b[1] = b[1].slice(0, -2);
+        }
+
+        return b
+      })
+      // removes invalid versions that will break esbuild
+      // https://github.com/evanw/esbuild/blob/35c0d65b9d4f29a26176404d2890d1b499634e9f/compat-table/src/caniuse.ts#L119-L122
+      .filter((b) => /^\d+(\.\d+)*$/.test(b[1]))
+      // only get the targets supported by esbuild
+      .filter((b) => SUPPORTED_ESBUILD_TARGETS.includes(b[0]))
+      // only get the oldest version, assuming that the older version
+      // is last in the array
+      .reduce((acc, b) => {
+        const existingIndex = acc.findIndex((br) => br[0] === b[0]);
+
+        if (existingIndex !== -1) {
+          acc[existingIndex][1] = b[1];
+        } else {
+          acc.push(b);
+        }
+        return acc
+      }, [])
+      // remove separator
+      .map((b) => b.join(''))
+  )
+}
+
 function pathContains(containerPath, itemPath) {
   return !path$1.relative(containerPath, itemPath).startsWith("..");
 }
@@ -544,65 +633,10 @@ function findCommonDirPath(filePaths) {
   return ret;
 }
 
-function sortAsNumber(a, b) {
-  const aVersion = Number(a);
-  const bVersion = Number(b);
-  return aVersion - bVersion;
-}
-function resolveBrowserslistVersions(query) {
-  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");
-  const versions = {
-    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)
-  };
-  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;
-}
-
 function resolveBrowserTarget(versions) {
-  const target = [];
-  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]}`);
-  }
+  const target = versions.filter(
+    (version) => version.startsWith("chrome") || version.startsWith("edge") || version.startsWith("firefox") || version.startsWith("ios") || version.startsWith("safari") || version.startsWith("opera")
+  );
   if (target.length === 0) {
     return void 0;
   }
@@ -610,10 +644,7 @@ function resolveBrowserTarget(versions) {
 }
 
 function resolveNodeTarget(versions) {
-  const target = [];
-  if (versions.node.length) {
-    target.push(`node${versions.node[0]}`);
-  }
+  const target = versions.filter((version) => version.startsWith("node"));
   if (target.length === 0) {
     return void 0;
   }
@@ -632,7 +663,14 @@ async function resolveBuildContext(options) {
     tsconfig: tsconfigPath
   } = options;
   const tsconfig = await loadTSConfig({ cwd, tsconfigPath });
-  const targetVersions = resolveBrowserslistVersions(pkg.browserslist || DEFAULT_BROWSERSLIST_QUERY);
+  let browserslist = pkg.browserslist;
+  if (!browserslist) {
+    logger.warn(
+      'Could not detect a `browserslist` property in `package.json`, using default configuration. Add `"browserslist": "extends @sanity/browserslist-config"` to silence this warning.'
+    );
+    browserslist = DEFAULT_BROWSERSLIST_QUERY;
+  }
+  const targetVersions = browserslistToEsbuild(browserslist);
   const nodeTarget = resolveNodeTarget(targetVersions);
   const webTarget = resolveBrowserTarget(targetVersions);
   if (!nodeTarget) {