@sanity/pkg-utils 2.3.12 → 2.3.13-canary.1

package/dist/_chunks/{watchAction-63c8a721.cjs.map → watchAction-a5721084.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"watchAction-63c8a721.cjs","sources":["../../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\nimport {handleError} from './handleError'\n\nexport async function watchAction(options: {strict?: boolean; tsconfig?: string}): Promise<void> {\n  try {\n    await watch({\n      cwd: process.cwd(),\n      strict: options.strict,\n      tsconfig: options.tsconfig,\n    })\n  } catch (err) {\n    handleError(err)\n  }\n}\n"],"names":["watchAction","options","watch","cwd","process","strict","tsconfig","err","handleError"],"mappings":";;;;AAGA,eAAsBA,YAAYC,OAA+D,EAAA;EAC3F,IAAA;IACF,MAAMC,WAAM,CAAA;MACVC,GAAA,EAAKC,QAAQD,GAAI,CAAA,CAAA;MACjBE,QAAQJ,OAAQ,CAAAI,MAAA;MAChBC,UAAUL,OAAQ,CAAAK;IAAA,CACnB,CAAA;WACMC,GAAK,EAAA;IACZC,WAAA,CAAAA,WAAA,CAAYD,GAAG,CAAA;EACjB;AACF;"}
+{"version":3,"file":"watchAction-a5721084.cjs","sources":["../../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\nimport {handleError} from './handleError'\n\nexport async function watchAction(options: {strict?: boolean; tsconfig?: string}): Promise<void> {\n  try {\n    await watch({\n      cwd: process.cwd(),\n      strict: options.strict,\n      tsconfig: options.tsconfig,\n    })\n  } catch (err) {\n    handleError(err)\n  }\n}\n"],"names":["watchAction","options","watch","cwd","process","strict","tsconfig","err","handleError"],"mappings":";;;;AAGA,eAAsBA,YAAYC,OAA+D,EAAA;EAC3F,IAAA;IACF,MAAMC,WAAM,CAAA;MACVC,GAAA,EAAKC,QAAQD,GAAI,CAAA,CAAA;MACjBE,QAAQJ,OAAQ,CAAAI,MAAA;MAChBC,UAAUL,OAAQ,CAAAK;IAAA,CACnB,CAAA;WACMC,GAAK,EAAA;IACZC,WAAA,CAAAA,WAAA,CAAYD,GAAG,CAAA;EACjB;AACF;"}

package/dist/cli.cjs

@@ -7,13 +7,13 @@ function _interopDefaultCompat(e) {
   };
 }
 var cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
-var version = "2.3.12";
+var version = "2.3.13-canary.1";
 const cli = cac__default.default();
 cli.command("", "Check").alias("check").option("--strict", "Strict mode").option("--tsconfig [tsconfig]", "[string] tsconfig.json").action(async options => {
   const {
     checkAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/checkAction-c3e5da35.cjs');
+    return require('./_chunks/checkAction-c39d7dbf.cjs');
   });
   return checkAction(options);
 });
@@ -21,7 +21,7 @@ cli.command("build", "Build package").option("--emitDeclarationOnly", "Emit d.ts
   const {
     buildAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/buildAction-e950d498.cjs');
+    return require('./_chunks/buildAction-dae78abb.cjs');
   });
   return buildAction(options);
 });
@@ -29,7 +29,7 @@ cli.command("init [path]", "Initialize package").action(async p => {
   const {
     initAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/initAction-2abd8576.cjs');
+    return require('./_chunks/initAction-48ce747a.cjs');
   });
   return initAction({
     path: p
@@ -39,7 +39,7 @@ cli.command("watch", "Watch package").option("--strict", "Strict mode").option("
   const {
     watchAction
   } = await Promise.resolve().then(function () {
-    return require('./_chunks/watchAction-63c8a721.cjs');
+    return require('./_chunks/watchAction-a5721084.cjs');
   });
   return watchAction(options);
 });

package/dist/index.cjs

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var build = require('./_chunks/build-11470607.cjs');
-var check = require('./_chunks/check-0665cb35.cjs');
-var consoleSpy = require('./_chunks/consoleSpy-d738cb9f.cjs');
-var logger = require('./_chunks/logger-c593f06b.cjs');
-var init = require('./_chunks/init-2377e6e5.cjs');
-var index = require('./_chunks/index-70f8931a.cjs');
-var watch = require('./_chunks/watch-d390d5e4.cjs');
+var build = require('./_chunks/build-fabfa3af.cjs');
+var check = require('./_chunks/check-332a2bb9.cjs');
+var consoleSpy = require('./_chunks/consoleSpy-686c350b.cjs');
+var logger = require('./_chunks/logger-718e11be.cjs');
+var init = require('./_chunks/init-e45c0c31.cjs');
+var index = require('./_chunks/index-1811ae9f.cjs');
+var watch = require('./_chunks/watch-4e565bee.cjs');
 function defineConfig(configOptions) {
   return configOptions;
 }

package/dist/index.d.ts

@@ -218,14 +218,16 @@ export declare interface PackageJSON {
         types?: string
         browser?: {
           source: string
-          require?: string
           import?: string
+          require?: string
         }
         node?: {
           source?: string
-          require?: string
+          module?: string
           import?: string
+          require?: string
         }
+        module?: string
         import?: string
         require?: string
         default: string
@@ -326,6 +328,11 @@ export declare interface PkgConfigOptions {
    * Build package with support for legacy exports (writes root `<export>.js` files)
    */
   legacyExports?: boolean
+  /**
+   * Preserves module directives, such as `'use client'`
+   * @alpha
+   */
+  preserveModuleDirectives?: boolean
   minify?: boolean
   /** @alpha */
   rollup?: {

package/dist/index.js

@@ -32,6 +32,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
 import esbuild from 'rollup-plugin-esbuild';
+import preserveDirectives from 'rollup-plugin-preserve-directives';
 import esbuild$1 from 'esbuild';
 import treeify from 'treeify';
 import prettyBytes from 'pretty-bytes';
@@ -125,18 +126,20 @@ const pkgSchema = z.object({
   exports: z.optional(z.record(z.union([z.custom(val => /^\.\/.*\.json$/.test(val)), z.object({
     types: z.optional(z.string()),
     source: z.string(),
-    require: z.optional(z.string()),
     browser: z.optional(z.object({
       source: z.string(),
-      require: z.optional(z.string()),
-      import: z.optional(z.string())
+      import: z.optional(z.string()),
+      require: z.optional(z.string())
     })),
     node: z.optional(z.object({
       source: z.optional(z.string()),
-      require: z.optional(z.string()),
-      import: z.optional(z.string())
+      module: z.optional(z.string()),
+      import: z.optional(z.string()),
+      require: z.optional(z.string())
     })),
+    module: z.optional(z.string()),
     import: z.optional(z.string()),
+    require: z.optional(z.string()),
     default: z.string()
   })]))),
   browserslist: z.optional(z.array(z.string()))
@@ -188,6 +191,7 @@ async function loadPkgWithReporting(options) {
     const pkg = await loadPkg({
       cwd
     });
+    let shouldError = false;
     if (pkg.exports) {
       const _exports = Object.entries(pkg.exports);
       for (const [expPath, exp] of _exports) {
@@ -196,22 +200,61 @@ async function loadPkgWithReporting(options) {
         }
         const keys = Object.keys(exp);
         if (!assertFirst("types", keys)) {
-          logger.warn("exports[\"".concat(expPath, "\"]: the `types` property should be the first property"));
-        }
-        if (!assertOrder("require", "import", keys)) {
-          logger.warn("exports[\"".concat(expPath, "\"]: the `require` property should come before the `import` property"));
+          shouldError = true;
+          logger.error("exports[\"".concat(expPath, "\"]: the `types` property should be the first property"));
         }
-        if (!assertOrder("require", "node", keys)) {
-          logger.warn("exports[\"".concat(expPath, "\"]: the `require` property should come before the `node` property"));
-        }
-        if (!assertOrder("node", "import", keys)) {
-          logger.warn("exports[\"".concat(expPath, "\"]: the `node` property should come before `import` property"));
+        if (exp.node) {
+          const nodeKeys = Object.keys(exp.node);
+          if (!assertOrder("module", "import", nodeKeys)) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node.module` property should come before the `node.import` property"));
+          }
+          if (!assertOrder("import", "require", nodeKeys)) {
+            logger.warn("exports[\"".concat(expPath, "\"]: the `node.import` property should come before the `node.require` property"));
+          }
+          if (!assertOrder("module", "require", nodeKeys)) {
+            logger.warn("exports[\"".concat(expPath, "\"]: the `node.module` property should come before `node.require` property"));
+          }
+          if (exp.import && exp.node.import && !assertOrder("node", "import", keys)) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node` property should come before the `import` property"));
+          }
+          if (exp.module && exp.node.module && !assertOrder("node", "module", keys)) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node` property should come before the `module` property"));
+          }
+          if (exp.node.import && !exp.node.require && !exp.node.module) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node.module` property should be added so bundlers don't unintentionally try to bundle `node.import`"));
+          }
+          if (exp.node.import && !exp.node.require && exp.node.module && exp.import && exp.node.module !== exp.import) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node.module` property should match `import`"));
+          }
+          if (exp.require && exp.node.require && exp.require === exp.node.require) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node.require` property isn't necessary as it's identical to `require`"));
+          } else if (exp.require && exp.node.require && !assertOrder("node", "require", keys)) {
+            shouldError = true;
+            logger.error("exports[\"".concat(expPath, "\"]: the `node` property should come before the `require` property"));
+          }
+        } else {
+          if (!assertOrder("import", "require", keys)) {
+            logger.warn("exports[\"".concat(expPath, "\"]: the `import` property should come before the `require` property"));
+          }
+          if (!assertOrder("module", "import", keys)) {
+            logger.warn("exports[\"".concat(expPath, "\"]: the `module` property should come before `import` property"));
+          }
         }
         if (!assertLast("default", keys)) {
-          logger.warn("exports[\"".concat(expPath, "\"]: the `default` property should be the last property"));
+          shouldError = true;
+          logger.error("exports[\"".concat(expPath, "\"]: the `default` property should be the last property"));
         }
       }
     }
+    if (shouldError) {
+      process.exit(1);
+    }
     return pkg;
   } catch (err) {
     if (err instanceof ZodError) {
@@ -765,12 +808,12 @@ function resolveBuildTasks(ctx) {
   }
   const nodeReexportCjsEntries = [];
   for (const exp of exports) {
-    if (exp.node && !exp.node.source && exp.node.import && exp.node.require && (exp.node.import.endsWith(".cjs.js") || exp.node.import.endsWith(".cjs.mjs"))) {
+    if (exp.node && !exp.node.source && exp.node.import && (exp.node.require || exp.require) && (exp.node.import.endsWith(".cjs.js") || exp.node.import.endsWith(".cjs.mjs"))) {
       const importId = path.join(pkg.name, exp._path);
       nodeReexportCjsEntries.push({
         importId,
         import: exp.node.import,
-        require: exp.node.require
+        require: exp.node.require || exp.require
       });
     }
   }
@@ -1415,10 +1458,10 @@ function resolveRollupConfig(ctx, buildTask) {
       modules: false
     }]]
   }), minify && terser({
-    compress: {
+    compress: (config == null ? void 0 : config.preserveModuleDirectives) ? {
       // Needed until https://github.com/terser/terser/issues/1320 is fixed
       directives: false
-    },
+    } : true,
     output: {
       comments: (_node, comment) => {
         const text = comment.value;
@@ -1429,7 +1472,9 @@ function resolveRollupConfig(ctx, buildTask) {
         return false;
       }
     }
-  })].filter(Boolean);
+  }),
+  // Allows marking export files with `'use client'` at the top
+  (config == null ? void 0 : config.preserveModuleDirectives) && preserveDirectives()].filter(Boolean);
   const userPlugins = (_c = config == null ? void 0 : config.rollup) == null ? void 0 : _c.plugins;
   const plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : resolveConfigProperty((_d = config == null ? void 0 : config.rollup) == null ? void 0 : _d.plugins, defaultPlugins);
   return {
@@ -1486,7 +1531,8 @@ function resolveRollupConfig(ctx, buildTask) {
       interop: "compat",
       minifyInternalExports: minify,
       sourcemap: (_ref11 = config == null ? void 0 : config.sourcemap) !== null && _ref11 !== void 0 ? _ref11 : true,
-      hoistTransitiveImports: false
+      hoistTransitiveImports: false,
+      preserveModules: (config == null ? void 0 : config.preserveModuleDirectives) ? true : false
     }
   };
 }
@@ -1552,6 +1598,19 @@ async function execPromise(ctx, task) {
     const bundle = await rollup({
       ...inputOptions,
       onwarn(warning) {
+        var _a;
+        if (
+        // Ignore the directive warning until the preserveDirectives plugin does it automatically: https://github.com/Ephem/rollup-plugin-preserve-directives#rollup-plugin-preserve-directives-warning
+        warning.message.includes('Module level directives cause errors when bundled, "use client" in')) {
+          if (!((_a = ctx.config) == null ? void 0 : _a.preserveModuleDirectives)) {
+            consoleSpy.messages.push({
+              type: "warn",
+              code: warning.code,
+              args: ["".concat(warning.message, " You can preserve it by setting \"preserveModuleDirectives: true\" in your \"package.config.ts\"")]
+            });
+          }
+          return;
+        }
         consoleSpy.messages.push({
           type: "warn",
           code: warning.code,