@storm-software/workspace-tools 1.30.3 → 1.30.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.30.3",
+  "version": "1.30.4",
   "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

@@ -116938,18 +116938,14 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
 // packages/workspace-tools/src/utils/get-project-deps.ts
-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;
-    }, [])
-  );
-}
 function getExternalDependencies(projectName, graph) {
   const allDeps = graph.dependencies[projectName];
   return Array.from(
@@ -117349,16 +117345,25 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    let internalDependencies = [];
-    for (const internalDependency of getInternalDependencies(
-      context.projectName,
-      context.projectGraph
-    )) {
-      const packageConfig = internalDependency.node.data;
-      if (packageConfig?.packageName) {
-        options.external.push(packageConfig.packageName);
-        internalDependencies.push(internalDependency);
-      }
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
     }
     if (options.bundle === false) {
       for (const thirdPartyDependency of getExternalDependencies(
@@ -117373,7 +117378,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117406,13 +117411,9 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
-      internalDependencies.forEach((entry) => {
-        const packageConfig = entry.node.data;
-        if (packageConfig?.packageName) {
-          const { packageName, version } = packageConfig;
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = version ? version : "latest";
-        }
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
       });
       packageJson.type = "module";
       packageJson.exports ??= {

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

@@ -116969,18 +116969,14 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
 // packages/workspace-tools/src/utils/get-project-deps.ts
-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;
-    }, [])
-  );
-}
 function getExternalDependencies(projectName, graph) {
   const allDeps = graph.dependencies[projectName];
   return Array.from(
@@ -117380,16 +117376,25 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    let internalDependencies = [];
-    for (const internalDependency of getInternalDependencies(
-      context.projectName,
-      context.projectGraph
-    )) {
-      const packageConfig = internalDependency.node.data;
-      if (packageConfig?.packageName) {
-        options.external.push(packageConfig.packageName);
-        internalDependencies.push(internalDependency);
-      }
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
     }
     if (options.bundle === false) {
       for (const thirdPartyDependency of getExternalDependencies(
@@ -117404,7 +117409,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117437,13 +117442,9 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
-      internalDependencies.forEach((entry) => {
-        const packageConfig = entry.node.data;
-        if (packageConfig?.packageName) {
-          const { packageName, version } = packageConfig;
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = version ? version : "latest";
-        }
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
       });
       packageJson.type = "module";
       packageJson.exports ??= {

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

@@ -116969,18 +116969,14 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
 // packages/workspace-tools/src/utils/get-project-deps.ts
-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;
-    }, [])
-  );
-}
 function getExternalDependencies(projectName, graph) {
   const allDeps = graph.dependencies[projectName];
   return Array.from(
@@ -117380,16 +117376,25 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    let internalDependencies = [];
-    for (const internalDependency of getInternalDependencies(
-      context.projectName,
-      context.projectGraph
-    )) {
-      const packageConfig = internalDependency.node.data;
-      if (packageConfig?.packageName) {
-        options.external.push(packageConfig.packageName);
-        internalDependencies.push(internalDependency);
-      }
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
     }
     if (options.bundle === false) {
       for (const thirdPartyDependency of getExternalDependencies(
@@ -117404,7 +117409,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117437,13 +117442,9 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
-      internalDependencies.forEach((entry) => {
-        const packageConfig = entry.node.data;
-        if (packageConfig?.packageName) {
-          const { packageName, version } = packageConfig;
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = version ? version : "latest";
-        }
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
       });
       packageJson.type = "module";
       packageJson.exports ??= {

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

@@ -116969,18 +116969,14 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
 // packages/workspace-tools/src/utils/get-project-deps.ts
-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;
-    }, [])
-  );
-}
 function getExternalDependencies(projectName, graph) {
   const allDeps = graph.dependencies[projectName];
   return Array.from(
@@ -117380,16 +117376,25 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    let internalDependencies = [];
-    for (const internalDependency of getInternalDependencies(
-      context.projectName,
-      context.projectGraph
-    )) {
-      const packageConfig = internalDependency.node.data;
-      if (packageConfig?.packageName) {
-        options.external.push(packageConfig.packageName);
-        internalDependencies.push(internalDependency);
-      }
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
     }
     if (options.bundle === false) {
       for (const thirdPartyDependency of getExternalDependencies(
@@ -117404,7 +117409,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117437,13 +117442,9 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
-      internalDependencies.forEach((entry) => {
-        const packageConfig = entry.node.data;
-        if (packageConfig?.packageName) {
-          const { packageName, version } = packageConfig;
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = version ? version : "latest";
-        }
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
       });
       packageJson.type = "module";
       packageJson.exports ??= {

package/src/utils/index.js

@@ -30,6 +30,7 @@ __export(utils_exports, {
   getExtraDependencies: () => getExtraDependencies,
   getFileBanner: () => getFileBanner,
   getInternalDependencies: () => getInternalDependencies,
+  getProjectConfiguration: () => getProjectConfiguration,
   getProjectConfigurations: () => getProjectConfigurations,
   getWorkspaceRoot: () => getWorkspaceRoot,
   lintStagedVersion: () => lintStagedVersion,
@@ -263,6 +264,7 @@ var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrie
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
   getWorkspaceRoot()
 );
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
 
 // packages/workspace-tools/src/utils/get-project-deps.ts
 function getExtraDependencies(projectName, graph) {
@@ -418,6 +420,7 @@ var WorkspaceStorage = class {
   getExtraDependencies,
   getFileBanner,
   getInternalDependencies,
+  getProjectConfiguration,
   getProjectConfigurations,
   getWorkspaceRoot,
   lintStagedVersion,