@sanity/pkg-utils 2.3.3 → 2.3.4

package/dist/index.js

@@ -735,16 +735,17 @@ function resolveBuildTasks(ctx) {
       });
     }
     for (const bundle of bundles) {
+      const idx = bundles.indexOf(bundle);
       if (bundle.require) {
         addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
-          path: "__bundle__",
+          path: "__$$bundle_cjs_".concat(idx, "$$__"),
           source: bundle.source,
           output: bundle.require
         });
       }
       if (bundle.import) {
-        addRollupTaskEntry("commonjs", bundle.runtime || ctx.runtime, {
-          path: "__bundle__",
+        addRollupTaskEntry("esm", bundle.runtime || ctx.runtime, {
+          path: "__$$bundle_esm_".concat(idx, "$$__"),
           source: bundle.source,
           output: bundle.import
         });
@@ -1282,7 +1283,7 @@ function compileESMWrapper(mod, relativeImport) {
 function createConsoleSpy(options) {
   const {
     onRestored
-  } = options;
+  } = options || {};
   const original = {
     log: console.log,
     warn: console.warn,
@@ -1322,7 +1323,7 @@ function createConsoleSpy(options) {
       console.log = original.log;
       console.warn = original.warn;
       console.error = original.error;
-      onRestored(messages);
+      onRestored == null ? void 0 : onRestored(messages);
     }
   };
 }
@@ -1488,7 +1489,14 @@ function resolveRollupConfig(ctx, buildTask) {
   };
 }
 const rollupTask = {
-  name: (ctx, task) => ["Build javascript files...", "  format: ".concat(chalk.yellow(task.format)), "  target:", ...task.target.map(t => "    - ".concat(chalk.yellow(t))), "  entries:", ...task.entries.map(e => ["    - ", "".concat(chalk.cyan(path.join(ctx.pkg.name, e.path)), ": "), "".concat(chalk.yellow(e.source), " ").concat(chalk.gray("\u2192"), " ").concat(chalk.yellow(e.output))].join(""))].join("\n"),
+  name: (ctx, task) => {
+    const bundleEntries = task.entries.filter(e => e.path.includes("__$$bundle_"));
+    const entries = task.entries.filter(e => !e.path.includes("__$$bundle_"));
+    const targetLines = task.target.length ? ["  target:", ...task.target.map(t => "    - ".concat(chalk.yellow(t)))] : [];
+    const bundlesLines = bundleEntries.length ? ["  bundles:", ...bundleEntries.map(e => ["    - ", "".concat(chalk.yellow(e.source), " ").concat(chalk.gray("\u2192"), " ").concat(chalk.yellow(e.output))].join(""))] : [];
+    const entriesLines = entries.length ? ["  entries:", ...entries.map(e => ["    - ", "".concat(chalk.cyan(path.join(ctx.pkg.name, e.path)), ": "), "".concat(chalk.yellow(e.source), " ").concat(chalk.gray("\u2192"), " ").concat(chalk.yellow(e.output))].join(""))] : [];
+    return ["Build javascript files...", "  format: ".concat(chalk.yellow(task.format)), ...targetLines, ...bundlesLines, ...entriesLines].join("\n");
+  },
   exec: (ctx, task) => {
     return new Observable(observer => {
       execPromise(ctx, task).then(result => {
@@ -1825,76 +1833,89 @@ async function check(options) {
       logger.error("missing files");
       process.exit(1);
     }
-    const _paths = {
+    const exportPaths = {
       require: [],
       import: []
     };
     for (const exp of Object.values(ctx.exports || {})) {
       if (!exp._exported) continue;
-      if (exp.require) _paths.require.push(exp.require);
-      if (exp.import) _paths.import.push(exp.import);
-    }
-    const external = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.devDependencies || {}));
-    if (_paths.import.length) {
-      const code = _paths.import.map(id => "import('".concat(id, "')")).join("\n");
-      try {
-        const esbuildResult = await esbuild$1.build({
-          external,
-          stdin: {
-            contents: code,
-            loader: "js",
-            resolveDir: cwd
-          },
-          format: "esm",
-          bundle: true,
-          logLevel: "silent",
-          // otherwise output maps to stdout as we're using stdin
-          outfile: "/dev/null",
-          platform: "node"
-        });
-        if (esbuildResult.warnings.length > 0) {
-          logger.warn(...esbuildResult.warnings);
-        }
-      } catch (err) {
-        const {
-          errors
-        } = err;
-        for (const _err of errors) {
-          if (_err.location) {
-            logger.error(_err.detail || _err.text);
-            logger.error("".concat(_err.location.line, " | ").concat(_err.location.lineText));
-            logger.error("in", "./".concat(_err.location.file, ":").concat(_err.location.line, ":").concat(_err.location.column));
-          } else {
-            logger.error(_err.detail || _err.text);
-          }
-          logger.log();
-        }
-        process.exit(1);
-      }
+      if (exp.require) exportPaths.require.push(exp.require);
+      if (exp.import) exportPaths.import.push(exp.import);
+    }
+    const external = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})];
+    const consoleSpy = createConsoleSpy();
+    if (exportPaths.import.length) {
+      checkExports(exportPaths.import, {
+        cwd,
+        external,
+        format: "esm",
+        logger
+      });
     }
-    if (_paths.require.length) {
-      const code = _paths.require.map(id => "require('".concat(id, "')")).join("\n");
-      const esbuildResult = await esbuild$1.build({
+    if (exportPaths.require.length) {
+      checkExports(exportPaths.require, {
+        cwd,
         external,
-        stdin: {
-          contents: code,
-          loader: "js",
-          resolveDir: cwd
-        },
         format: "cjs",
-        bundle: true,
-        // otherwise output maps to stdout as we're using stdin
-        outfile: "/dev/null",
-        platform: "node"
+        logger
       });
-      if (esbuildResult.errors.length > 0) {
-        logger.error(esbuildResult.errors.join(", "));
-        process.exit(1);
+    }
+    consoleSpy.restore();
+  }
+}
+async function checkExports(exportPaths, options) {
+  const {
+    cwd,
+    external,
+    format,
+    logger
+  } = options;
+  const code = exportPaths.map(id => format ? "import('".concat(id, "');") : "require('".concat(id, "');")).join("\n");
+  try {
+    const esbuildResult = await esbuild$1.build({
+      bundle: true,
+      external,
+      format,
+      logLevel: "silent",
+      // otherwise output maps to stdout as we're using stdin
+      outfile: "/dev/null",
+      platform: "node",
+      stdin: {
+        contents: code,
+        loader: "js",
+        resolveDir: cwd
       }
-      if (esbuildResult.warnings.length > 0) {
-        logger.warn(...esbuildResult.warnings);
+    });
+    if (esbuildResult.errors.length > 0) {
+      for (const msg of esbuildResult.errors) {
+        printEsbuildMessage(logger.warn, msg);
+        logger.log();
       }
+      process.exit(1);
     }
+    const esbuildWarnings = esbuildResult.warnings.filter(msg => {
+      !(msg.detail || msg.text).includes("does not affect esbuild's own target setting");
+    });
+    for (const msg of esbuildWarnings) {
+      printEsbuildMessage(logger.warn, msg);
+      logger.log();
+    }
+  } catch (err) {
+    const {
+      errors
+    } = err;
+    for (const msg of errors) {
+      printEsbuildMessage(logger.error, msg);
+      logger.log();
+    }
+    process.exit(1);
+  }
+}
+function printEsbuildMessage(log, msg) {
+  if (msg.location) {
+    log(["".concat(msg.detail || msg.text, "\n"), "".concat(msg.location.line, " | ").concat(msg.location.lineText, "\n"), "in ./".concat(msg.location.file, ":").concat(msg.location.line, ":").concat(msg.location.column)].join(""));
+  } else {
+    log(msg.detail || msg.text);
   }
 }
 async function isEmptyDirectory(dirPath) {