@sanity/pkg-utils 6.13.3-canary.4 → 6.13.4

package/dist/index.js

@@ -112,16 +112,6 @@ const pkgSchema = z.object({
               require: z.optional(z.string())
             })
           ),
-          "react-compiler": z.optional(
-            // z.union([
-            // @TODO add support for a string shortcut
-            // z.string(),
-            z.object({
-              source: z.optional(z.string()),
-              default: z.string()
-            })
-            // ]),
-          ),
           node: z.optional(
             z.object({
               source: z.optional(z.string()),
@@ -248,12 +238,7 @@ function getTargetPaths(_type, expOrBundle) {
     expOrBundle.node.import.replace(fileEnding, type === "module" ? dtsEnding : mtsEnding)
   ), expOrBundle.node?.require && set.add(
     expOrBundle.node.require.replace(fileEnding, type === "commonjs" ? dtsEnding : ctsEnding)
-  )), expOrBundle["react-compiler"]?.source || expOrBundle["react-compiler"]?.default && set.add(
-    expOrBundle["react-compiler"].default.replace(
-      fileEnding,
-      type === "module" ? dtsEnding : mtsEnding
-    )
-  )), Array.from(set);
+  ))), Array.from(set);
 }
 function isPkgExport$1(exp) {
   return exp?.browser || exp?.node || exp?.default;
@@ -624,8 +609,6 @@ async function resolveBuildContext(options) {
     exportEntry.browser?.require,
     exportEntry.node?.source && exportEntry.node.import,
     exportEntry.node?.source && exportEntry.node.require
-    // @TODO implement this
-    // exportEntry['react-compiler']?.source && exportEntry['react-compiler']?.default,
   ].filter(Boolean)).map((p) => path.resolve(cwd, p)), commonDistPath = findCommonDirPath(outputPaths);
   if (commonDistPath === cwd)
     throw new Error(
@@ -674,13 +657,7 @@ function resolveBuildTasks(ctx) {
   ), dtsTask2 = {
     type: "build:dts",
     entries: []
-  }, rollupTasks = {}, rollupLegacyTasks = {}, rollupReactCompilerTask2 = {
-    type: "build:react-compiler",
-    runtime: "browser",
-    format: "esm",
-    entries: [],
-    target: target.browser
-  };
+  }, rollupTasks = {}, rollupLegacyTasks = {};
   function addRollupTaskEntry(format2, runtime, entry) {
     const buildId = `${format2}:${runtime}`;
     rollupTasks[buildId] ? rollupTasks[buildId].entries.push(entry) : rollupTasks[buildId] = {
@@ -704,9 +681,6 @@ function resolveBuildTasks(ctx) {
       target: target[runtime]
     };
   }
-  function addRollupReactCompilerTaskEntry(entry) {
-    rollupReactCompilerTask2.entries.push(entry);
-  }
   for (const exp of exports) {
     const importId = path.join(pkg.name, exp._path);
     exp.source?.endsWith(".ts") && dtsTask2.entries.push({
@@ -769,15 +743,7 @@ function resolveBuildTasks(ctx) {
         output
       });
     }
-    for (const exp of exports) {
-      const output = exp["react-compiler"]?.default;
-      output && addRollupReactCompilerTaskEntry({
-        path: exp._path,
-        source: exp["react-compiler"]?.source || exp.source,
-        output
-      });
-    }
-    if (rollupReactCompilerTask2.entries.length && tasks.push(rollupReactCompilerTask2), config2?.legacyExports)
+    if (config2?.legacyExports)
       for (const exp of exports) {
         const runtime = exp.browser?.import ? "browser" : ctx.runtime, output = exp.browser?.import || exp.import;
         if (!output) continue;
@@ -907,23 +873,27 @@ function createApiExtractorConfig(options) {
     mainEntryPointFilePath,
     tsconfig,
     tsconfigPath
-  } = options;
-  return {
+  } = options, workaroundModulePreserve = tsconfig.options.module === ts.ModuleKind.Preserve, workaroundPaths = !!tsconfig.options.paths, overrideTsconfig = {
+    extends: tsconfigPath,
+    compilerOptions: {}
+  };
+  return workaroundModulePreserve && Object.assign(overrideTsconfig.compilerOptions, {
+    // Set the equivalent options to `module: 'Preserve'`
+    // https://github.com/microsoft/TypeScript/pull/56785/files?file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.symbols&file-filters%5B%5D=.ts&file-filters%5B%5D=.types&show-viewed-files=true#diff-31d3c12bafea26bc9e8c8a77920c41af0c593206442add70c45a06c063767445
+    module: "ESNext",
+    moduleResolution: "Bundler",
+    esModuleInterop: !0,
+    resolveJsonModule: !0
+  }), workaroundPaths && Object.assign(overrideTsconfig.compilerOptions, {
+    // An empty object replaces whatever is in the original tsconfig file
+    paths: {}
+  }), {
     apiReport: {
       enabled: !1,
       reportFileName: "<unscopedPackageName>.api.md"
     },
     bundledPackages,
-    // If `paths` are used for self-referencing imports (e.g. the module is named `sanity`, and the `sanity/structure` export is also importing from `sanity/router`),
-    compiler: tsconfig.options.paths ? {
-      overrideTsconfig: {
-        extends: tsconfigPath,
-        compilerOptions: {
-          // An empty object replaces whatever is in the original tsconfig file
-          paths: {}
-        }
-      }
-    } : { tsconfigFilePath: tsconfigPath },
+    compiler: workaroundModulePreserve || workaroundPaths ? { overrideTsconfig } : { tsconfigFilePath: tsconfigPath },
     docModel: {
       enabled: !1,
       apiJsonFilePath: path.resolve(distPath, `${exportPath}.api.json`)
@@ -1288,7 +1258,7 @@ function createConsoleSpy(options) {
   };
 }
 function resolveRollupConfig(ctx, buildTask) {
-  const { format: format2, runtime, target } = buildTask, { config: config2, cwd, exports: _exports, external, distPath, logger, pkg, ts: ts2 } = ctx, isLegacyExports = buildTask.type === "build:legacy", isReactCompiler = buildTask.type === "build:react-compiler", outputExt = isLegacyExports ? pkgExtMap.legacy : pkgExtMap[pkg.type || "commonjs"][format2], minify = config2?.minify ?? !1, outDir = path.relative(cwd, distPath), pathAliases = Object.fromEntries(
+  const { format: format2, runtime, target } = buildTask, { config: config2, cwd, exports: _exports, external, distPath, logger, pkg, ts: ts2 } = ctx, isLegacyExports = buildTask.type === "build:legacy", outputExt = isLegacyExports ? pkgExtMap.legacy : pkgExtMap[pkg.type || "commonjs"][format2], minify = config2?.minify ?? !1, outDir = path.relative(cwd, distPath), pathAliases = Object.fromEntries(
     Object.entries(ts2.config?.options.paths || {}).map(([key, val]) => [key, path.resolve(cwd, ts2.config?.options.baseUrl || ".", val[0])])
   ), entries = buildTask.entries.map((entry) => ({
     ...entry,
@@ -1323,7 +1293,7 @@ function resolveRollupConfig(ctx, buildTask) {
     }),
     commonjs(),
     json(),
-    (isReactCompiler || config2?.babel?.reactCompiler || config2?.babel?.styledComponents) && babel({
+    (config2?.babel?.reactCompiler || config2?.babel?.styledComponents) && babel({
       babelrc: !1,
       presets: ["@babel/preset-typescript"],
       babelHelpers: "bundled",
@@ -1344,7 +1314,7 @@ function resolveRollupConfig(ctx, buildTask) {
             ...typeof config2.babel.styledComponents == "object" ? config2.babel.styledComponents : {}
           }
         ],
-        (isReactCompiler || config2?.babel?.reactCompiler) && [
+        config2?.babel?.reactCompiler && [
           "babel-plugin-react-compiler",
           config2?.reactCompilerOptions || {}
         ]
@@ -1382,7 +1352,7 @@ function resolveRollupConfig(ctx, buildTask) {
         preserve_annotations: !0
       }
     })
-  ].filter(Boolean), userPlugins = config2?.rollup?.plugins, plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : resolveConfigProperty(config2?.rollup?.plugins, defaultPlugins), hashChunkFileNames = config2?.rollup?.hashChunkFileNames ?? !1, chunkFileNames = `${isReactCompiler ? "_compiled" : isLegacyExports ? "_legacy" : hashChunkFileNames ? "_chunks" : "_chunks-[format]"}/${hashChunkFileNames ? "[name]-[hash]" : "[name]"}${outputExt}`, entryFileNames = isLegacyExports ? "[name].js" : `[name]${outputExt}`;
+  ].filter(Boolean), userPlugins = config2?.rollup?.plugins, plugins = Array.isArray(userPlugins) ? defaultPlugins.concat(userPlugins) : resolveConfigProperty(config2?.rollup?.plugins, defaultPlugins), hashChunkFileNames = config2?.rollup?.hashChunkFileNames ?? !1, chunkFileNames = `${isLegacyExports ? "_legacy" : hashChunkFileNames ? "_chunks" : "_chunks-[format]"}/${hashChunkFileNames ? "[name]-[hash]" : "[name]"}${outputExt}`, entryFileNames = isLegacyExports ? "[name].js" : `[name]${outputExt}`;
   return {
     inputOptions: {
       context: cwd,
@@ -1453,65 +1423,6 @@ const rollupLegacyTask = {
       ...targetLines,
       ...entriesLines
     ].join(`
-`);
-  },
-  exec: (ctx, task) => new Observable((observer) => {
-    execPromise$2(ctx, task).then((result) => {
-      observer.next(result), observer.complete();
-    }).catch((err) => observer.error(err));
-  }),
-  complete: () => {
-  },
-  error: (_ctx, _task, err) => {
-    console.error(err);
-  }
-};
-async function execPromise$2(ctx, task) {
-  const { distPath, files, logger } = ctx, outDir = path.relative(ctx.cwd, distPath), consoleSpy = createConsoleSpy({
-    onRestored: (messages) => {
-      for (const msg of messages) {
-        const text = String(msg.args[0]);
-        msg.code !== "CIRCULAR_DEPENDENCY" && (text.startsWith("Dynamic import can only") || text.startsWith("Sourcemap is likely to be incorrect") || (msg.type === "log" && logger.info(...msg.args), msg.type === "warn" && logger.warn(...msg.args), msg.type === "error" && logger.error(...msg.args)));
-      }
-    }
-  });
-  try {
-    const { inputOptions, outputOptions } = resolveRollupConfig(ctx, task), bundle = await rollup({
-      ...inputOptions,
-      onwarn(warning) {
-        consoleSpy.messages.push({
-          type: "warn",
-          code: warning.code,
-          args: [warning.message]
-        });
-      }
-    }), { output } = await bundle.generate(outputOptions);
-    for (const chunkOrAsset of output)
-      chunkOrAsset.type === "asset" ? files.push({
-        type: "asset",
-        path: path.resolve(outDir, chunkOrAsset.fileName)
-      }) : files.push({
-        type: "chunk",
-        path: path.resolve(outDir, chunkOrAsset.fileName)
-      });
-    await bundle.write(outputOptions), await bundle.close(), consoleSpy.restore();
-  } catch (err) {
-    throw consoleSpy.restore(), err;
-  }
-}
-const rollupReactCompilerTask = {
-  name: (ctx, task) => {
-    const entries = task.entries.filter((e) => !e.path.includes("__$$bundle_")), targetLines = task.target.length ? ["  target:", ...task.target.map((t) => `    - ${chalk.yellow(t)}`)] : [], entriesLines = entries.length ? [
-      "  entries:",
-      ...entries.map(
-        (e) => [
-          "    - ",
-          `${chalk.cyan(path.join(ctx.pkg.name, e.path))}: `,
-          `${chalk.yellow(e.source)} ${chalk.gray("\u2192")} ${chalk.yellow(e.output)}`
-        ].join("")
-      )
-    ] : [];
-    return ["Build react compiler exports...", ...targetLines, ...entriesLines].join(`
 `);
   },
   exec: (ctx, task) => new Observable((observer) => {
@@ -1671,8 +1582,7 @@ const rollupWatchTask = {
 }, buildTaskHandlers = {
   "build:dts": dtsTask,
   "build:js": rollupTask,
-  "build:legacy": rollupLegacyTask,
-  "build:react-compiler": rollupReactCompilerTask
+  "build:legacy": rollupLegacyTask
 }, watchTaskHandlers = {
   "watch:dts": dtsWatchTask,
   "watch:js": rollupWatchTask
@@ -2449,7 +2359,6 @@ export {
   resolveBuildTasks,
   resolveConfigProperty,
   rollupLegacyTask,
-  rollupReactCompilerTask,
   rollupTask,
   rollupWatchTask,
   strictOptions,