@storm-software/workspace-tools 1.62.12 → 1.62.13

package/src/utils/index.js

@@ -452291,7 +452291,7 @@ ${outro}`;
       await promises3.mkdir(node_path.dirname(fileName), { recursive: true });
       return promises3.writeFile(fileName, outputFile.type === "asset" ? outputFile.source : outputFile.code);
     }
-    function defineConfig(options8) {
+    function defineConfig2(options8) {
       return options8;
     }
     exports2.blue = blue;
@@ -452300,7 +452300,7 @@ ${outro}`;
     exports2.createFilter = createFilter;
     exports2.cyan = cyan$1;
     exports2.cyan$1 = cyan;
-    exports2.defineConfig = defineConfig;
+    exports2.defineConfig = defineConfig2;
     exports2.ensureArray = ensureArray$1;
     exports2.getAugmentedNamespace = getAugmentedNamespace;
     exports2.getNewArray = getNewArray;
@@ -458869,7 +458869,7 @@ var require_dist6 = __commonJS({
         }
       };
     };
-    var defineConfig = (options8) => options8;
+    var defineConfig2 = (options8) => options8;
     var isTaskkillCmdProcessNotFoundError = (err) => {
       return process.platform === "win32" && "cmd" in err && "code" in err && typeof err.cmd === "string" && err.cmd.startsWith("taskkill") && err.code === 128;
     };
@@ -459174,7 +459174,7 @@ var require_dist6 = __commonJS({
       );
     }
     exports2.build = build2;
-    exports2.defineConfig = defineConfig;
+    exports2.defineConfig = defineConfig2;
   }
 });
 
@@ -466610,6 +466610,7 @@ async function resolveTSConfig(id = process.cwd(), options8 = {}) {
 }
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
+var import_tsup = __toESM(require_dist6());
 var applyDefaultOptions = (options8) => {
   options8.entry ??= "{sourceRoot}/index.ts";
   options8.outputPath ??= "dist/{projectRoot}";
@@ -466644,8 +466645,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const { writeInfo, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
-  const { build: tsup, defineConfig } = await Promise.resolve().then(() => __toESM(require_dist6()));
+  const { writeInfo, writeDebug, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
   const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
@@ -466658,6 +466658,13 @@ var runTsupBuild = async (context, config, options8) => {
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
+  let tsconfig = await readTSConfig(options8.tsConfig);
+  if (!tsconfig) {
+    tsconfig = await readTSConfig(context.projectRoot);
+    if (!tsconfig) {
+      throw new Error("No tsconfig file found");
+    }
+  }
   const getConfigOptions = {
     ...options8,
     entry: {
@@ -466672,8 +466679,8 @@ var runTsupBuild = async (context, config, options8) => {
       __STORM_CONFIG: JSON.stringify(stormEnv),
       ...stormEnv
     },
-    dtsTsConfig: await getNormalizedTsConfig(
-      context,
+    dtsTsConfig: getNormalizedTsConfig(
+      tsconfig,
       workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
@@ -466707,17 +466714,18 @@ ${options8.banner}
   };
   if (options8.getConfig) {
     writeInfo(config, "\u26A1 Running the Build process");
+    writeDebug(config, JSON.stringify(getConfigOptions));
     const getConfigFns = [options8.getConfig];
-    const tsupConfig = defineConfig(
+    const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
         (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction(tsupConfig)) {
       const tsupOptions = await Promise.resolve(tsupConfig({}));
-      await build(tsup, tsupOptions, config);
+      await build(tsupOptions, config);
     } else {
-      await build(tsup, tsupConfig, config);
+      await build(tsupConfig, config);
     }
   } else {
     writeWarning(
@@ -466726,14 +466734,7 @@ ${options8.banner}
     );
   }
 };
-async function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
-  let config = await readTSConfig(options8.tsConfig);
-  if (!config) {
-    config = await readTSConfig(context.projectRoot);
-    if (!config) {
-      throw new Error("No tsconfig file found");
-    }
-  }
+function getNormalizedTsConfig(config, workspaceRoot, outputPath, options8) {
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
@@ -466760,10 +466761,10 @@ async function getNormalizedTsConfig(context, workspaceRoot, outputPath, options
   }
   return tsConfig;
 }
-var build = async (tsup, options8, config) => {
+var build = async (options8, config) => {
   const { writeDebug } = await import("@storm-software/config-tools");
   if (Array.isArray(options8)) {
-    await Promise.all(options8.map((buildOptions) => build(tsup, buildOptions, config)));
+    await Promise.all(options8.map((buildOptions) => build(buildOptions, config)));
   } else {
     let tsupOptions = options8;
     if (_isFunction(tsupOptions)) {
@@ -466777,7 +466778,7 @@ ${!_isFunction(tsupOptions) ? Object.keys(tsupOptions).map(
       ).join("\n") : "<function>"}
 `
     );
-    await tsup(tsupOptions);
+    await (0, import_tsup.build)(tsupOptions);
   }
 };
 var _isPrimitive = (value) => {