@sanity/pkg-utils 6.7.1 → 6.8.0

package/dist/cli.cjs

@@ -3,7 +3,7 @@ var cac = require("cac");
 function _interopDefaultCompat(e) {
   return e && typeof e == "object" && "default" in e ? e : { default: e };
 }
-var cac__default = /* @__PURE__ */ _interopDefaultCompat(cac), version = "6.7.1";
+var cac__default = /* @__PURE__ */ _interopDefaultCompat(cac), version = "6.8.0";
 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() {

package/dist/index.js

@@ -8,7 +8,7 @@ import { z, ZodError } from "zod";
 import chalk from "chalk";
 import fs, { writeFile, readFile, readdir, lstat } from "node:fs/promises";
 import browserslist from "browserslist";
-import config from "@sanity/browserslist-config";
+import config$1 from "@sanity/browserslist-config";
 import ts from "typescript";
 import { errorMap } from "zod-validation-error";
 import { Observable, switchMap } from "rxjs";
@@ -81,7 +81,7 @@ async function loadConfig(options2) {
 function resolveConfigProperty(prop, initialValue) {
   return prop ? typeof prop == "function" ? prop(initialValue) : prop : initialValue;
 }
-const DEFAULT_BROWSERSLIST_QUERY = config;
+const DEFAULT_BROWSERSLIST_QUERY = config$1;
 function isRecord(value) {
   return !!value && !Array.isArray(value) && typeof value == "object";
 }
@@ -356,7 +356,7 @@ function parseExports(options2) {
     "package.json: `types` must be declared for the npm listing to show as a TypeScript module."
   ), strict && !pkg.exports["./package.json"] && errors.push('package.json: `exports["./package.json"] must be declared.');
   for (const [exportPath, exportEntry] of Object.entries(pkg.exports))
-    if (exportPath.endsWith(".json"))
+    if (exportPath.endsWith(".json") || typeof exportEntry == "string" && exportEntry.endsWith(".json"))
       exportPath === "./package.json" && exportEntry !== "./package.json" && errors.push('package.json: `exports["./package.json"] must be "./package.json".');
     else if (!(isRecord(exportEntry) && "svelte" in exportEntry))
       if (isRecord(exportEntry)) {
@@ -20939,7 +20939,34 @@ function printEsbuildMessage(log, msg) {
 async function isEmptyDirectory(dirPath) {
   return (await readdir(dirPath)).length === 0;
 }
-const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/i, defaultTemplate = async ({ cwd, logger, packagePath }) => {
+const overridableDefaults = {
+  endOfLine: "lf",
+  tabWidth: 2,
+  useTabs: !1
+}, config = {
+  ...overridableDefaults,
+  printWidth: 100,
+  semi: !1,
+  singleQuote: !0,
+  quoteProps: "consistent",
+  bracketSpacing: !1,
+  plugins: ["prettier-plugin-packagejson"],
+  overrides: [
+    {
+      files: ["*.json5"],
+      options: {
+        quoteProps: "preserve",
+        singleQuote: !1
+      }
+    },
+    {
+      files: ["*.yml"],
+      options: {
+        singleQuote: !1
+      }
+    }
+  ]
+}, RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/i, defaultTemplate = async ({ cwd, logger, packagePath }) => {
   const gitConfig = await parseGitConfig({ cwd, type: "global" });
   return {
     options: [
@@ -21021,23 +21048,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
       }
     ],
     async getFiles(options2, features) {
-      const { pkgName, repo } = options2, { fullName: name } = pkgName, author = [options2.authorName, options2.authorEmail && `<${options2.authorEmail}>`].filter(Boolean).join(" ") ?? void 0, prettierConfig = features.prettier ? {
-        bracketSpacing: !1,
-        plugins: ["prettier-plugin-packagejson"],
-        printWidth: 100,
-        quoteProps: "consistent",
-        semi: !1,
-        singleQuote: !0,
-        tabWidth: 2,
-        overrides: [
-          {
-            files: ["*.yml"],
-            options: {
-              singleQuote: !1
-            }
-          }
-        ]
-      } : void 0, pkgJson = {
+      const { pkgName, repo } = options2, { fullName: name } = pkgName, author = [options2.authorName, options2.authorEmail && `<${options2.authorEmail}>`].filter(Boolean).join(" ") ?? void 0, pkgJson = {
         name,
         version: "0.0.0",
         description: options2.description ?? void 0,
@@ -21074,7 +21085,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
         "lint-staged": features.prettier ? {
           "*": ["prettier --write --cache --ignore-unknown"]
         } : void 0,
-        // prettier: prettierConfig,
+        prettier: features.prettier ? "@sanity/prettier-config" : void 0,
         browserslist: "extends @sanity/browserslist-config",
         dependencies: {},
         devDependencies: {
@@ -21122,21 +21133,13 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
         etc
         node_modules
         `
-      }), features.prettier && (files.push({
+      }), features.prettier && files.push({
         name: ".prettierignore",
         contents: outdent`
           dist
           pnpm-lock.yaml
           `
-      }), files.push({
-        name: ".prettierrc",
-        contents: await format(
-          resolve(packagePath, ".prettierrc.json"),
-          JSON.stringify(prettierConfig, null, 2) + `
-`,
-          prettierConfig
-        )
-      })), repo && (pkgJson.repository = {
+      }), repo && (pkgJson.repository = {
         type: "git",
         url: `git+ssh://git@${repo.source}/${repo.owner}/${repo.name}.git`
       }, pkgJson.bugs = {
@@ -21238,7 +21241,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
             /** @type import('eslint').Linter.Config */
             module.exports = ${JSON.stringify(eslintConfig, null, 2)}
             `,
-            prettierConfig
+            config
           )
         });
       }
@@ -21278,7 +21281,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               }
             }
             `,
-          prettierConfig
+          config
         )
       }), files.push({
         name: "tsconfig.dist.json",
@@ -21296,7 +21299,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               }
             }
             `,
-          prettierConfig
+          config
         )
       }), files.push({
         name: "tsconfig.json",
@@ -21316,7 +21319,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               }
             }
             `,
-          prettierConfig
+          config
         )
       })), features.typescript ? (files.push({
         name: "package.config.ts",
@@ -21331,7 +21334,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               tsconfig: 'tsconfig.dist.json',
             })
             `,
-          prettierConfig
+          config
         )
       }), files.push({
         name: "src/index.ts",
@@ -21343,7 +21346,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               //
             }
             `,
-          prettierConfig
+          config
         )
       })) : (files.push({
         name: "package.config.js",
@@ -21361,7 +21364,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               },
             })
             `,
-          prettierConfig
+          config
         )
       }), files.push({
         name: "src/index.js",
@@ -21373,7 +21376,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
               //
             }
             `,
-          prettierConfig
+          config
         )
       }));
       try {
@@ -21391,7 +21394,7 @@ const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/
         contents: await format(
           resolve(packagePath, "package.json"),
           JSON.stringify(pkgJson, null, 2),
-          prettierConfig
+          config
         )
       }), files;
     }