@storm-software/workspace-tools 1.31.1 → 1.31.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.31.1",
+  "version": "1.31.3",
   "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);
+          }
         }
       }
     }
@@ -116956,7 +116962,7 @@ ${externalDependencies.map((dep) => {
     if (options.entry) {
       entryPoints.push(options.entry);
     }
-    if (options.emitOnAll !== false) {
+    if (options.emitOnAll === true) {
       entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
@@ -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 ??= {
@@ -117275,7 +117281,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.emitOnAll ??= true;
+  options.emitOnAll ??= false;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

package/src/executors/tsup/schema.json

@@ -74,7 +74,7 @@
     "emitOnAll": {
       "type": "boolean",
       "description": "Should each file contained in the package be emitted individually.",
-      "default": true
+      "default": false
     },
     "generatePackageJson": {
       "type": "boolean",

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);
+          }
         }
       }
     }
@@ -116987,7 +116993,7 @@ ${externalDependencies.map((dep) => {
     if (options.entry) {
       entryPoints.push(options.entry);
     }
-    if (options.emitOnAll !== false) {
+    if (options.emitOnAll === true) {
       entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
@@ -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 ??= {
@@ -117306,7 +117312,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.emitOnAll ??= true;
+  options.emitOnAll ??= false;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

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);
+          }
         }
       }
     }
@@ -116987,7 +116993,7 @@ ${externalDependencies.map((dep) => {
     if (options.entry) {
       entryPoints.push(options.entry);
     }
-    if (options.emitOnAll !== false) {
+    if (options.emitOnAll === true) {
       entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
@@ -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 ??= {
@@ -117306,7 +117312,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.emitOnAll ??= true;
+  options.emitOnAll ??= false;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

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);
+          }
         }
       }
     }
@@ -116987,7 +116993,7 @@ ${externalDependencies.map((dep) => {
     if (options.entry) {
       entryPoints.push(options.entry);
     }
-    if (options.emitOnAll !== false) {
+    if (options.emitOnAll === true) {
       entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
@@ -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 ??= {
@@ -117306,7 +117312,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.emitOnAll ??= true;
+  options.emitOnAll ??= false;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;