@storm-software/workspace-tools 1.31.1 → 1.31.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.31.1](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.31.0...workspace-tools-v1.31.1) (2023-12-17)
+
+
+### Bug Fixes
+
+* **git-tools:** Update the env names to align with config parameters ([f7438f0](https://github.com/storm-software/storm-ops/commit/f7438f048d52a598bb11e742b1549153e58237c8))
+
 # [1.31.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.30.14...workspace-tools-v1.31.0) (2023-12-15)
 
 

package/index.js

@@ -117111,6 +117111,8 @@ ${Object.keys(options).map(
     if (!result.success) {
       throw new Error("The Build process failed trying to copy assets");
     }
+    const pathToPackageJson = (0, import_path3.join)(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_path3.join)(workspaceRoot, "package.json")
     );
@@ -117118,7 +117120,7 @@ ${Object.keys(options).map(
     if (workspacePackageJson?.dependencies) {
       options.external = Object.keys(workspacePackageJson?.dependencies).reduce(
         (ret, key) => {
-          if (!options.external.includes(key)) {
+          if (!ret.includes(key)) {
             ret.push(key);
           }
           return ret;
@@ -117126,16 +117128,18 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    let externalDependencies = options.external.reduce((acc, name) => {
-      const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
-      if (externalNode) {
-        acc.push({
-          name,
-          outputs: [],
-          node: externalNode
-        });
+    let externalDependencies = options.external.reduce((ret, name) => {
+      if (!packageJson?.devDependencies?.[name]) {
+        const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
+        if (externalNode) {
+          ret.push({
+            name,
+            outputs: [],
+            node: externalNode
+          });
+        }
       }
-      return acc;
+      return ret;
     }, []);
     const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
     const internalDependencies = [];
@@ -117148,12 +117152,12 @@ ${Object.keys(options).map(
           console.log(`\u26A1 Adding implicit dependency: ${key}`);
           const projectConfig = projectConfigs[key];
           if (projectConfig?.targets?.build) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
+            const projectPackageJson = (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);
+            if (projectPackageJson?.name && !options.external.includes(projectPackageJson.name)) {
+              ret.push(projectPackageJson.name);
+              internalDependencies.push(projectPackageJson.name);
             }
           }
           return ret;
@@ -117169,7 +117173,9 @@ ${Object.keys(options).map(
         const packageConfig = thirdPartyDependency.node.data;
         if (packageConfig?.packageName) {
           options.external.push(packageConfig.packageName);
-          externalDependencies.push(thirdPartyDependency);
+          if (!packageJson?.devDependencies?.[packageConfig.packageName]) {
+            externalDependencies.push(thirdPartyDependency);
+          }
         }
       }
     }
@@ -117230,14 +117236,12 @@ ${externalDependencies.map((dep) => {
     }, {});
     if (options.generatePackageJson !== false) {
       const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
-      const pathToPackageJson = (0, import_path3.join)(context.root, projectRoot, "package.json");
-      const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
       delete packageJson.dependencies;
       externalDependencies.forEach((externalDependency) => {
         const packageConfig = externalDependency.node.data;
         if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
-          if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
+          if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
             return;
           }
           packageJson.dependencies ??= {};
@@ -117245,8 +117249,10 @@ ${externalDependencies.map((dep) => {
         }
       });
       internalDependencies.forEach((packageName) => {
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = "latest";
+        if (!packageJson?.devDependencies?.[packageName]) {
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = "latest";
+        }
       });
       packageJson.type = "module";
       packageJson.exports ??= {