@storm-software/workspace-tools 1.62.38 → 1.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.62.38",
+  "version": "1.63.0",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/src/executors/tsup/executor.js

@@ -452968,6 +452968,17 @@ function getExtraDependencies(projectName, graph) {
   }
   return Array.from(deps.values());
 }
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName] ?? [];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var import_node_path2 = require("node:path");
@@ -453279,7 +453290,7 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       }
     },
     import_typescript.sys,
-    workspaceRoot
+    (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = correctPaths(workspaceRoot);
   if (parsedTsconfig.options.paths) {
@@ -453467,6 +453478,22 @@ ${Object.keys(options8).map(
       return ret;
     }, options8.external);
   }
+  for (const internalDependency of getInternalDependencies(
+    context.projectName,
+    context.projectGraph
+  )) {
+    if (internalDependency?.name && config?.externalPackagePatterns?.some(
+      (pattern) => internalDependency.name.includes(pattern)
+    ) && !externalDependencies?.some(
+      (externalDependency) => externalDependency.name === internalDependency.name
+    )) {
+      externalDependencies.push({
+        name: internalDependency.name,
+        outputs: [],
+        node: internalDependency
+      });
+    }
+  }
   for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
@@ -453540,9 +453567,12 @@ ${externalDependencies.map((dep) => {
       }
     }
     for (const packageName of internalDependencies) {
-      if (!packageJson?.devDependencies?.[packageName]) {
-        packageJson.dependencies ??= {};
+      packageJson.dependencies ??= {};
+      if (!packageJson.dependencies[packageName]) {
         packageJson.dependencies[packageName] = "latest";
+        if (!options8.external.includes(packageName)) {
+          options8.external.push(packageName);
+        }
       }
     }
     const distPaths = ["dist/"];

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

@@ -447095,7 +447095,7 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       }
     },
     import_typescript.sys,
-    workspaceRoot
+    (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = correctPaths(workspaceRoot);
   if (parsedTsconfig.options.paths) {
@@ -453388,6 +453388,17 @@ function getExtraDependencies(projectName, graph) {
   }
   return Array.from(deps.values());
 }
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName] ?? [];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function tsupExecutorFn(options8, context, config) {
@@ -453506,6 +453517,22 @@ ${Object.keys(options8).map(
       return ret;
     }, options8.external);
   }
+  for (const internalDependency of getInternalDependencies(
+    context.projectName,
+    context.projectGraph
+  )) {
+    if (internalDependency?.name && config?.externalPackagePatterns?.some(
+      (pattern) => internalDependency.name.includes(pattern)
+    ) && !externalDependencies?.some(
+      (externalDependency) => externalDependency.name === internalDependency.name
+    )) {
+      externalDependencies.push({
+        name: internalDependency.name,
+        outputs: [],
+        node: internalDependency
+      });
+    }
+  }
   for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
@@ -453579,9 +453606,12 @@ ${externalDependencies.map((dep) => {
       }
     }
     for (const packageName of internalDependencies) {
-      if (!packageJson?.devDependencies?.[packageName]) {
-        packageJson.dependencies ??= {};
+      packageJson.dependencies ??= {};
+      if (!packageJson.dependencies[packageName]) {
         packageJson.dependencies[packageName] = "latest";
+        if (!options8.external.includes(packageName)) {
+          options8.external.push(packageName);
+        }
       }
     }
     const distPaths = ["dist/"];

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

@@ -447095,7 +447095,7 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       }
     },
     import_typescript.sys,
-    workspaceRoot
+    (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = correctPaths(workspaceRoot);
   if (parsedTsconfig.options.paths) {
@@ -453388,6 +453388,17 @@ function getExtraDependencies(projectName, graph) {
   }
   return Array.from(deps.values());
 }
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName] ?? [];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function tsupExecutorFn(options8, context, config) {
@@ -453506,6 +453517,22 @@ ${Object.keys(options8).map(
       return ret;
     }, options8.external);
   }
+  for (const internalDependency of getInternalDependencies(
+    context.projectName,
+    context.projectGraph
+  )) {
+    if (internalDependency?.name && config?.externalPackagePatterns?.some(
+      (pattern) => internalDependency.name.includes(pattern)
+    ) && !externalDependencies?.some(
+      (externalDependency) => externalDependency.name === internalDependency.name
+    )) {
+      externalDependencies.push({
+        name: internalDependency.name,
+        outputs: [],
+        node: internalDependency
+      });
+    }
+  }
   for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
@@ -453579,9 +453606,12 @@ ${externalDependencies.map((dep) => {
       }
     }
     for (const packageName of internalDependencies) {
-      if (!packageJson?.devDependencies?.[packageName]) {
-        packageJson.dependencies ??= {};
+      packageJson.dependencies ??= {};
+      if (!packageJson.dependencies[packageName]) {
         packageJson.dependencies[packageName] = "latest";
+        if (!options8.external.includes(packageName)) {
+          options8.external.push(packageName);
+        }
       }
     }
     const distPaths = ["dist/"];

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

@@ -447095,7 +447095,7 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       }
     },
     import_typescript.sys,
-    workspaceRoot
+    (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = correctPaths(workspaceRoot);
   if (parsedTsconfig.options.paths) {
@@ -453388,6 +453388,17 @@ function getExtraDependencies(projectName, graph) {
   }
   return Array.from(deps.values());
 }
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName] ?? [];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function tsupExecutorFn(options8, context, config) {
@@ -453506,6 +453517,22 @@ ${Object.keys(options8).map(
       return ret;
     }, options8.external);
   }
+  for (const internalDependency of getInternalDependencies(
+    context.projectName,
+    context.projectGraph
+  )) {
+    if (internalDependency?.name && config?.externalPackagePatterns?.some(
+      (pattern) => internalDependency.name.includes(pattern)
+    ) && !externalDependencies?.some(
+      (externalDependency) => externalDependency.name === internalDependency.name
+    )) {
+      externalDependencies.push({
+        name: internalDependency.name,
+        outputs: [],
+        node: internalDependency
+      });
+    }
+  }
   for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
@@ -453579,9 +453606,12 @@ ${externalDependencies.map((dep) => {
       }
     }
     for (const packageName of internalDependencies) {
-      if (!packageJson?.devDependencies?.[packageName]) {
-        packageJson.dependencies ??= {};
+      packageJson.dependencies ??= {};
+      if (!packageJson.dependencies[packageName]) {
         packageJson.dependencies[packageName] = "latest";
+        if (!options8.external.includes(packageName)) {
+          options8.external.push(packageName);
+        }
       }
     }
     const distPaths = ["dist/"];

package/src/utils/index.js

@@ -457357,7 +457357,7 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       }
     },
     import_typescript.sys,
-    workspaceRoot
+    (0, import_node_path2.dirname)(options8.tsConfig)
   );
   parsedTsconfig.options.pathsBasePath = correctPaths(workspaceRoot);
   if (parsedTsconfig.options.paths) {