@storm-software/workspace-tools 1.31.0 → 1.31.2

package/package.json

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

@@ -116872,6 +116872,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")
     );
@@ -116879,7 +116881,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;
@@ -116887,16 +116889,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 = [];
@@ -116909,12 +116913,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;
@@ -116930,7 +116934,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);
+          }
         }
       }
     }
@@ -116991,14 +116997,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 ??= {};
@@ -117006,8 +117010,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 ??= {

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

@@ -116903,6 +116903,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")
     );
@@ -116910,7 +116912,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;
@@ -116918,16 +116920,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 = [];
@@ -116940,12 +116944,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;
@@ -116961,7 +116965,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);
+          }
         }
       }
     }
@@ -117022,14 +117028,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 ??= {};
@@ -117037,8 +117041,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 ??= {

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

@@ -116903,6 +116903,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")
     );
@@ -116910,7 +116912,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;
@@ -116918,16 +116920,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 = [];
@@ -116940,12 +116944,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;
@@ -116961,7 +116965,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);
+          }
         }
       }
     }
@@ -117022,14 +117028,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 ??= {};
@@ -117037,8 +117041,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 ??= {

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

@@ -116903,6 +116903,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")
     );
@@ -116910,7 +116912,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;
@@ -116918,16 +116920,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 = [];
@@ -116940,12 +116944,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;
@@ -116961,7 +116965,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);
+          }
         }
       }
     }
@@ -117022,14 +117028,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 ??= {};
@@ -117037,8 +117041,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 ??= {

package/src/generators/preset/files/.env.template

@@ -13,13 +13,12 @@ SENTRY_PROPERTIES="apps/web/app"
 DEFAULT_LOCALE="en_US"
 DEFAULT_TIMEZONE="America/New_York"
 
-STORM_WORKSPACE_ROOT=
-STORM_REPO_OWNER="sullivanpj"
+STORM_OWNER="sullivanpj"
 STORM_WORKER="stormie-bot"
-STORM_REPO_ORG="<%= organization %>"
-STORM_REPO_NAME="<%= name %>"
-STORM_REPO_NAMESPACE="<%= namespace %>"
-STORM_REPO_URL="<%= repositoryUrl %>"
+STORM_ORGANIZATION="<%= organization %>"
+STORM_NAMESPACE="<%= name %>"
+STORM_NAMESPACESPACE="<%= namespace %>"
+STORM_REPOSITORY="<%= repositoryUrl %>"
 STORM_BRANCH="main"
 STORM_PRE_MAJOR=false
 

package/src/generators/preset/files/.github/workflows/build-release.yml.template

@@ -17,7 +17,7 @@ env:
   CI: true
   NX_VERBOSE_LOGGING: true
   STORM_WORKER: stormie-bot
-  STORM_REPO_URL: https://github.com/<%= organization %>/<%= name %>
+  STORM_REPOSITORY: ${{ github.repositoryUrl }}
   STORM_WORKSPACE_ROOT: ${{ github.workspace }}
   NX_BASE: ${{ github.base_ref }}
   NX_HEAD: ${{ github.head_ref }}
@@ -87,5 +87,5 @@ jobs:
           NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}
           STORM_WORKER: ${{ env.STORM_WORKER }}
           STORM_WORKSPACE_ROOT: ${{ github.workspace }}
-          STORM_REPO_URL: ${{ github.repositoryUrl }}
+          STORM_REPOSITORY: ${{ github.repositoryUrl }}
           TAG: ${{ inputs.tag }}

package/src/generators/preset/files/README.md.template

@@ -1,4 +1,4 @@
-<div align="center"><img src="https://pub-761b436209f44a4d886487c917806c08.r2.dev/logo-banner.png" width="100%" altText="storm-ops" /></div>
+<div align="center"><img src="https://pub-761b436209f44a4d886487c917806c08.r2.dev/logo-banner.png" width="100%" alt="Storm Software" /></div>
 
 <br />
 <div align="center">
@@ -174,7 +174,7 @@ Run `pnpm graph` to see a diagram of the dependencies of the Open System project
 
 Nx caches the output of any previously run command such as testing and building, so it can replay the cached results instead of rerunning it. Nx Cloud allows you to share the computation cache across everyone in your team and CI.
 
-<p align="center"><img src="https://pub-4661138852db4e5da99a6660fbf9b633.r2.dev/Nx Cloud - Dashboard.png" width="100%" altText="Nx Cloud - Dashboard" /></p>
+<p align="center"><img src="https://pub-4661138852db4e5da99a6660fbf9b633.r2.dev/Nx Cloud - Dashboard.png" width="100%" alt="Nx Cloud - Dashboard" /></p>
 
 ## Distributed Computation Caching & Distributed Task Execution
 
@@ -260,7 +260,7 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 <h1 align="center"></h1>
 <br />
 <div align="center">
-  <img src="https://pub-e71cff0f90204755bc910518d63cacf8.r2.dev/logo-opengraph.gif" width="100%"/>
+  <img src="https://pub-e71cff0f90204755bc910518d63cacf8.r2.dev/logo-opengraph.gif" width="100%" alt="Storm Software" />
 </div>
 <div align="center">
 <a href="https://stormsoftware.org" target="_blank">Website</a>  |  <a href="https://stormsoftware.org/contact" target="_blank">Contact</a>  |  <a href="https://linkedin.com/in/patrick-sullivan-865526b0" target="_blank">LinkedIn</a>  |  <a href="https://medium.com/@pat.joseph.sullivan" target="_blank">Medium</a>  | <a href="https://github.com/sullivanpj" target="_blank">GitHub</a>  |  <a href="https://keybase.io/sullivanp" target="_blank">OpenPGP Key</a>