@storm-software/workspace-tools 1.62.29 → 1.62.30

package/src/executors/tsup-neutral/executor.js

@@ -325036,12 +325036,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: joinPathFragments5 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments4 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments5(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments4(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments5(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments4(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -444495,7 +444495,7 @@ var require_project_name_and_root_utils = __commonJS({
     var nx_1 = require_nx();
     var get_workspace_layout_1 = require_get_workspace_layout();
     var names_1 = require_names();
-    var { joinPathFragments: joinPathFragments5, logger, normalizePath, output, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments4, logger, normalizePath, output, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
     async function determineProjectNameAndRootOptions(tree, options8) {
       if (!options8.projectNameAndRootFormat && (process.env.NX_INTERACTIVE !== "true" || !isTTY())) {
         options8.projectNameAndRootFormat = "derived";
@@ -444622,14 +444622,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (options8.directory === relativeCwd || options8.directory.startsWith(`${relativeCwd}/`)) {
           projectRoot = options8.directory;
         } else {
-          projectRoot = joinPathFragments5(relativeCwd, options8.directory);
+          projectRoot = joinPathFragments4(relativeCwd, options8.directory);
         }
       } else if (options8.rootProject) {
         projectRoot = ".";
       } else {
         projectRoot = relativeCwd;
         if (!relativeCwd.endsWith(options8.name)) {
-          projectRoot = joinPathFragments5(relativeCwd, options8.name);
+          projectRoot = joinPathFragments4(relativeCwd, options8.name);
         }
       }
       let importPath = void 0;
@@ -444662,7 +444662,7 @@ var require_project_name_and_root_utils = __commonJS({
       const projectSimpleName = name;
       let projectRoot = projectDirectoryWithoutLayout;
       if (projectDirectoryWithoutLayout !== ".") {
-        projectRoot = joinPathFragments5(layoutDirectory, projectRoot);
+        projectRoot = joinPathFragments4(layoutDirectory, projectRoot);
       }
       let importPath;
       if (options8.projectType === "library") {
@@ -446772,7 +446772,6 @@ ${commentStart} ----------------------------------------------------------------
 // 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());
 
@@ -446979,7 +446978,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];
@@ -446992,6 +446991,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: {
@@ -447009,24 +447034,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: `
 
@@ -447077,7 +447085,8 @@ 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,
+        baseUrl: workspaceRoot,
         outDir: outputPath,
         noEmit: false,
         emitDeclarationOnly: true,
@@ -447090,6 +447099,22 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
     (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = workspaceRoot;
+  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(
+            (path14) => (0, import_node_path2.join)(workspaceRoot, path14)
+          );
+        }
+        return ret;
+      },
+      {}
+    );
+  }
+  if (parsedTsconfig.options.incremental) {
+    parsedTsconfig.options.tsBuildInfoFile = (0, import_node_path2.join)(outputPath, "tsconfig.tsbuildinfo");
+  }
   return parsedTsconfig;
 }
 var build = async (options8, config) => {
@@ -447141,7 +447166,7 @@ var createTypeScriptCompilationOptions = (normalizedOptions, projectName) => {
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_node_fs = require("node:fs");
-var import_devkit3 = __toESM(require_devkit());
+var import_devkit2 = __toESM(require_devkit());
 var import_js = __toESM(require_src6());
 var import_fs_extra = __toESM(require_lib5());
 
@@ -453427,9 +453452,9 @@ ${Object.keys(options8).map(
   if (!result.success) {
     throw new Error("The Build process failed trying to copy assets");
   }
-  const pathToPackageJson = (0, import_devkit3.joinPathFragments)(context.root, projectRoot, "package.json");
-  const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit3.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-  const workspacePackageJson = (0, import_devkit3.readJsonFile)((0, import_devkit3.joinPathFragments)(workspaceRoot, "package.json"));
+  const pathToPackageJson = (0, import_devkit2.joinPathFragments)(context.root, projectRoot, "package.json");
+  const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
+  const workspacePackageJson = (0, import_devkit2.readJsonFile)((0, import_devkit2.joinPathFragments)(workspaceRoot, "package.json"));
   options8.external = options8.external || [];
   if (workspacePackageJson?.dependencies) {
     options8.external = Object.keys(workspacePackageJson?.dependencies).reduce(
@@ -453470,7 +453495,7 @@ ${Object.keys(options8).map(
       writeDebug(config, `\u26A1 Adding implicit dependency: ${key2}`);
       const projectConfig = projectConfigs[key2];
       if (projectConfig?.targets?.build) {
-        const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
+        const projectPackageJson = (0, import_devkit2.readJsonFile)(projectConfig.targets?.build.options.project);
         if (projectPackageJson?.name && !options8.external?.includes(projectPackageJson.name)) {
           ret.push(projectPackageJson.name);
           internalDependencies.push(projectPackageJson.name);
@@ -453507,34 +453532,34 @@ ${externalDependencies.map((dep) => {
     entryPoints.push(...options8.additionalEntryPoints);
   }
   if (options8.emitOnAll === true) {
-    entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
+    entryPoints = globSync((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
     }).reduce((ret, filePath) => {
       let formattedPath = workspaceRoot.replaceAll("\\", "/");
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit3.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+      let propertyKey = (0, import_devkit2.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
       if (propertyKey) {
         while (propertyKey.startsWith("/")) {
           propertyKey = propertyKey.substring(1);
         }
         writeDebug(
           config,
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!ret.includes(propertyKey)) {
-          ret.push((0, import_devkit3.joinPathFragments)(filePath.path, filePath.name));
+          ret.push((0, import_devkit2.joinPathFragments)(filePath.path, filePath.name));
         }
       }
       return ret;
     }, entryPoints);
   }
   if (options8.generatePackageJson !== false) {
-    const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     if (options8.bundle === false) {
       packageJson.dependencies = void 0;
       for (const externalDependency of externalDependencies) {
@@ -453587,16 +453612,16 @@ ${externalDependencies.map((dep) => {
         }
         packageJson.exports[`./${formattedEntryPoint}`] = {
           import: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           },
           require: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
           },
           default: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           }
         };
       }
@@ -453620,7 +453645,7 @@ ${externalDependencies.map((dep) => {
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
         }
-        packageJson.source ??= `${(0, import_devkit3.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
+        packageJson.source ??= `${(0, import_devkit2.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
       }
       packageJson.files ??= ["dist/**/*"];
       if (options8.includeSrc === true && !packageJson.files.includes("src")) {
@@ -453637,8 +453662,8 @@ ${externalDependencies.map((dep) => {
     packageJson.license ??= workspacePackageJson.license;
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit3.joinPathFragments)("packages", context.projectName);
-    const packageJsonPath = (0, import_devkit3.joinPathFragments)(context.root, options8.outputPath, "package.json");
+    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit2.joinPathFragments)("packages", context.projectName);
+    const packageJsonPath = (0, import_devkit2.joinPathFragments)(context.root, options8.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs.writeFileSync)(packageJsonPath, JSON.stringify(packageJson));
   } else {
@@ -453646,10 +453671,10 @@ ${externalDependencies.map((dep) => {
   }
   if (options8.includeSrc === true) {
     const files = globSync([
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
     ]);
     options8.verbose = options8.verbose || getLogLevel(config?.logLevel) >= LogLevel.DEBUG;
     await Promise.allSettled(
@@ -453706,7 +453731,7 @@ var _isFunction3 = (value) => {
 };
 
 // packages/workspace-tools/src/executors/tsup-neutral/get-config.ts
-var import_devkit4 = __toESM(require_devkit());
+var import_devkit3 = __toESM(require_devkit());
 var neutralConfig = ({
   entry,
   outDir,
@@ -453734,7 +453759,7 @@ var neutralConfig = ({
   minify = false,
   getTransform
 }) => {
-  const outputPath = (0, import_devkit4.joinPathFragments)(outDir, "dist");
+  const outputPath = (0, import_devkit3.joinPathFragments)(outDir, "dist");
   const options8 = {
     name: "neutral",
     entry,

package/src/executors/tsup-node/executor.js

@@ -325036,12 +325036,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: joinPathFragments5 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments4 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments5(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments4(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments5(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments4(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -444495,7 +444495,7 @@ var require_project_name_and_root_utils = __commonJS({
     var nx_1 = require_nx();
     var get_workspace_layout_1 = require_get_workspace_layout();
     var names_1 = require_names();
-    var { joinPathFragments: joinPathFragments5, logger, normalizePath, output, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments4, logger, normalizePath, output, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
     async function determineProjectNameAndRootOptions(tree, options8) {
       if (!options8.projectNameAndRootFormat && (process.env.NX_INTERACTIVE !== "true" || !isTTY())) {
         options8.projectNameAndRootFormat = "derived";
@@ -444622,14 +444622,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (options8.directory === relativeCwd || options8.directory.startsWith(`${relativeCwd}/`)) {
           projectRoot = options8.directory;
         } else {
-          projectRoot = joinPathFragments5(relativeCwd, options8.directory);
+          projectRoot = joinPathFragments4(relativeCwd, options8.directory);
         }
       } else if (options8.rootProject) {
         projectRoot = ".";
       } else {
         projectRoot = relativeCwd;
         if (!relativeCwd.endsWith(options8.name)) {
-          projectRoot = joinPathFragments5(relativeCwd, options8.name);
+          projectRoot = joinPathFragments4(relativeCwd, options8.name);
         }
       }
       let importPath = void 0;
@@ -444662,7 +444662,7 @@ var require_project_name_and_root_utils = __commonJS({
       const projectSimpleName = name;
       let projectRoot = projectDirectoryWithoutLayout;
       if (projectDirectoryWithoutLayout !== ".") {
-        projectRoot = joinPathFragments5(layoutDirectory, projectRoot);
+        projectRoot = joinPathFragments4(layoutDirectory, projectRoot);
       }
       let importPath;
       if (options8.projectType === "library") {
@@ -446772,7 +446772,6 @@ ${commentStart} ----------------------------------------------------------------
 // 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());
 
@@ -446979,7 +446978,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];
@@ -446992,6 +446991,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: {
@@ -447009,24 +447034,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: `
 
@@ -447077,7 +447085,8 @@ 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,
+        baseUrl: workspaceRoot,
         outDir: outputPath,
         noEmit: false,
         emitDeclarationOnly: true,
@@ -447090,6 +447099,22 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
     (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = workspaceRoot;
+  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(
+            (path14) => (0, import_node_path2.join)(workspaceRoot, path14)
+          );
+        }
+        return ret;
+      },
+      {}
+    );
+  }
+  if (parsedTsconfig.options.incremental) {
+    parsedTsconfig.options.tsBuildInfoFile = (0, import_node_path2.join)(outputPath, "tsconfig.tsbuildinfo");
+  }
   return parsedTsconfig;
 }
 var build = async (options8, config) => {
@@ -447141,7 +447166,7 @@ var createTypeScriptCompilationOptions = (normalizedOptions, projectName) => {
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_node_fs = require("node:fs");
-var import_devkit3 = __toESM(require_devkit());
+var import_devkit2 = __toESM(require_devkit());
 var import_js = __toESM(require_src6());
 var import_fs_extra = __toESM(require_lib5());
 
@@ -453427,9 +453452,9 @@ ${Object.keys(options8).map(
   if (!result.success) {
     throw new Error("The Build process failed trying to copy assets");
   }
-  const pathToPackageJson = (0, import_devkit3.joinPathFragments)(context.root, projectRoot, "package.json");
-  const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit3.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-  const workspacePackageJson = (0, import_devkit3.readJsonFile)((0, import_devkit3.joinPathFragments)(workspaceRoot, "package.json"));
+  const pathToPackageJson = (0, import_devkit2.joinPathFragments)(context.root, projectRoot, "package.json");
+  const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
+  const workspacePackageJson = (0, import_devkit2.readJsonFile)((0, import_devkit2.joinPathFragments)(workspaceRoot, "package.json"));
   options8.external = options8.external || [];
   if (workspacePackageJson?.dependencies) {
     options8.external = Object.keys(workspacePackageJson?.dependencies).reduce(
@@ -453470,7 +453495,7 @@ ${Object.keys(options8).map(
       writeDebug(config, `\u26A1 Adding implicit dependency: ${key2}`);
       const projectConfig = projectConfigs[key2];
       if (projectConfig?.targets?.build) {
-        const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
+        const projectPackageJson = (0, import_devkit2.readJsonFile)(projectConfig.targets?.build.options.project);
         if (projectPackageJson?.name && !options8.external?.includes(projectPackageJson.name)) {
           ret.push(projectPackageJson.name);
           internalDependencies.push(projectPackageJson.name);
@@ -453507,34 +453532,34 @@ ${externalDependencies.map((dep) => {
     entryPoints.push(...options8.additionalEntryPoints);
   }
   if (options8.emitOnAll === true) {
-    entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
+    entryPoints = globSync((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
     }).reduce((ret, filePath) => {
       let formattedPath = workspaceRoot.replaceAll("\\", "/");
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit3.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+      let propertyKey = (0, import_devkit2.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
       if (propertyKey) {
         while (propertyKey.startsWith("/")) {
           propertyKey = propertyKey.substring(1);
         }
         writeDebug(
           config,
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!ret.includes(propertyKey)) {
-          ret.push((0, import_devkit3.joinPathFragments)(filePath.path, filePath.name));
+          ret.push((0, import_devkit2.joinPathFragments)(filePath.path, filePath.name));
         }
       }
       return ret;
     }, entryPoints);
   }
   if (options8.generatePackageJson !== false) {
-    const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     if (options8.bundle === false) {
       packageJson.dependencies = void 0;
       for (const externalDependency of externalDependencies) {
@@ -453587,16 +453612,16 @@ ${externalDependencies.map((dep) => {
         }
         packageJson.exports[`./${formattedEntryPoint}`] = {
           import: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           },
           require: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
           },
           default: {
-            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit2.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           }
         };
       }
@@ -453620,7 +453645,7 @@ ${externalDependencies.map((dep) => {
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
         }
-        packageJson.source ??= `${(0, import_devkit3.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
+        packageJson.source ??= `${(0, import_devkit2.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
       }
       packageJson.files ??= ["dist/**/*"];
       if (options8.includeSrc === true && !packageJson.files.includes("src")) {
@@ -453637,8 +453662,8 @@ ${externalDependencies.map((dep) => {
     packageJson.license ??= workspacePackageJson.license;
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit3.joinPathFragments)("packages", context.projectName);
-    const packageJsonPath = (0, import_devkit3.joinPathFragments)(context.root, options8.outputPath, "package.json");
+    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit2.joinPathFragments)("packages", context.projectName);
+    const packageJsonPath = (0, import_devkit2.joinPathFragments)(context.root, options8.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs.writeFileSync)(packageJsonPath, JSON.stringify(packageJson));
   } else {
@@ -453646,10 +453671,10 @@ ${externalDependencies.map((dep) => {
   }
   if (options8.includeSrc === true) {
     const files = globSync([
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
-      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
+      (0, import_devkit2.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
     ]);
     options8.verbose = options8.verbose || getLogLevel(config?.logLevel) >= LogLevel.DEBUG;
     await Promise.allSettled(
@@ -453706,7 +453731,7 @@ var _isFunction3 = (value) => {
 };
 
 // packages/workspace-tools/src/executors/tsup-node/get-config.ts
-var import_devkit4 = __toESM(require_devkit());
+var import_devkit3 = __toESM(require_devkit());
 function nodeConfig({
   entry,
   outDir,
@@ -453747,7 +453772,7 @@ function nodeConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_devkit4.joinPathFragments)(outDir, "dist"),
+    outDir: (0, import_devkit3.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile,
     shims,
@@ -453764,7 +453789,7 @@ function nodeConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: (0, import_devkit4.joinPathFragments)(outDir, "dist")
+          outDir: (0, import_devkit3.joinPathFragments)(outDir, "dist")
         }
       }
     },