@storm-software/workspace-tools 1.62.29 → 1.62.31

package/src/utils/index.js

@@ -347416,12 +347416,12 @@ var require_install_packages_task = __commonJS({
     var child_process_1 = require("child_process");
     var path_1 = require("path");
     var nx_1 = require_nx();
-    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments3 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments2 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments2(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments2(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -457050,7 +457050,6 @@ var pnpmVersion = "8.10.2";
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var import_node_path2 = require("node:path");
 var import_esbuild_decorators = __toESM(require_src());
-var import_devkit2 = __toESM(require_devkit());
 var import_get_custom_transformers_factory = __toESM(require_get_custom_transformers_factory());
 var import_normalize_options = __toESM(require_normalize_options());
 
@@ -457241,7 +457240,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const { writeInfo, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
+  const { writeInfo, writeTrace, 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];
@@ -457254,6 +457253,32 @@ var runTsupBuild = async (context, config, options8) => {
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
+  const dtsTsConfig = getNormalizedTsConfig(
+    workspaceRoot,
+    options8.outputPath,
+    createTypeScriptCompilationOptions(
+      (0, import_normalize_options.normalizeOptions)(
+        {
+          ...options8,
+          watch: false,
+          main: context.main,
+          transformers: []
+        },
+        workspaceRoot,
+        context.sourceRoot,
+        workspaceRoot
+      ),
+      context.projectName
+    )
+  );
+  writeTrace(
+    config,
+    `\u2699\uFE0F  TSC (Type Declarations) Build options:
+${Object.keys(dtsTsConfig.options).map(
+      (key2) => `${key2}: ${!dtsTsConfig.options[key2] || _isPrimitive(dtsTsConfig.options[key2]) ? dtsTsConfig.options[key2] : JSON.stringify(dtsTsConfig.options[key2])}`
+    ).join("\n")}
+`
+  );
   const getConfigOptions = {
     ...options8,
     entry: {
@@ -457271,24 +457296,7 @@ var runTsupBuild = async (context, config, options8) => {
         return ret;
       }, {})
     },
-    dtsTsConfig: getNormalizedTsConfig(
-      workspaceRoot,
-      options8.outputPath,
-      createTypeScriptCompilationOptions(
-        (0, import_normalize_options.normalizeOptions)(
-          {
-            ...options8,
-            watch: false,
-            main: context.main,
-            transformers: []
-          },
-          workspaceRoot,
-          context.sourceRoot,
-          workspaceRoot
-        ),
-        context.projectName
-      )
-    ),
+    dtsTsConfig,
     banner: options8.banner ? {
       js: `
 
@@ -457339,19 +457347,36 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       ...rawTsconfig.config,
       compilerOptions: {
         ...rawTsconfig.config?.compilerOptions,
-        tsBuildInfoFile: rawTsconfig.config?.compilerOptions?.incremental ? (0, import_devkit2.joinPathFragments)(outputPath, "tsconfig.tsbuildinfo") : void 0,
+        rootDir: workspaceRoot.replaceAll("\\", "/"),
+        baseUrl: workspaceRoot.replaceAll("\\", "/"),
         outDir: outputPath,
         noEmit: false,
         emitDeclarationOnly: true,
         declaration: true,
         declarationMap: true,
-        declarationDir: (0, import_node_path2.join)(workspaceRoot, "tmp", ".tsup", "declaration")
+        declarationDir: (0, import_node_path2.join)(workspaceRoot.replaceAll("\\", "/"), "tmp", ".tsup", "declaration")
       }
     },
     import_typescript.sys,
     (0, import_node_path2.dirname)(options8.tsConfig)
   );
-  parsedTsconfig.options.pathsBasePath = workspaceRoot;
+  parsedTsconfig.options.pathsBasePath = workspaceRoot.replaceAll("\\", "/");
+  if (parsedTsconfig.options.paths) {
+    parsedTsconfig.options.paths = Object.keys(parsedTsconfig.options.paths).reduce(
+      (ret, key2) => {
+        if (parsedTsconfig.options.paths?.[key2]) {
+          ret[key2] = parsedTsconfig.options.paths[key2]?.map(
+            (path13) => (0, import_node_path2.join)(workspaceRoot.replaceAll("\\", "/"), path13)
+          );
+        }
+        return ret;
+      },
+      {}
+    );
+  }
+  if (parsedTsconfig.options.incremental) {
+    parsedTsconfig.options.tsBuildInfoFile = (0, import_node_path2.join)(outputPath, "tsconfig.tsbuildinfo");
+  }
   return parsedTsconfig;
 }
 var build = async (options8, config) => {