@storm-software/workspace-tools 1.52.10 → 1.52.12

package/package.json

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

package/src/executors/npm-publish/executor.js

@@ -19799,9 +19799,7 @@ function runExecutor(options, context) {
   const packageTxt = packageName === context.projectName ? `package "${packageName}"` : `package "${packageName}" from project "${context.projectName}"`;
   if (projectPackageJson.private === true) {
     console.warn(`Skipped ${packageTxt}, because it has \`"private": true\` in ${packageJsonPath}`);
-    return {
-      success: true
-    };
+    return new Promise((resolve) => resolve({ success: true }));
   }
   const npmPublishCommandSegments = ["npm publish --json"];
   const npmViewCommandSegments = [`npm view ${packageName} versions dist-tags --json`];
@@ -19838,9 +19836,7 @@ function runExecutor(options, context) {
         console.warn(
           `Skipped ${packageTxt} because v${currentVersion} already exists in ${registry} with tag "${tag}"`
         );
-        return {
-          success: true
-        };
+        return new Promise((resolve) => resolve({ success: true }));
       }
       if (resultJson.versions.includes(currentVersion)) {
         try {
@@ -19868,9 +19864,7 @@ function runExecutor(options, context) {
 `
             );
           }
-          return {
-            success: true
-          };
+          return new Promise((resolve) => resolve({ success: true }));
         } catch (err) {
           try {
             const stdoutData = JSON.parse(err.stdout?.toString() || "{}");
@@ -19886,18 +19880,14 @@ function runExecutor(options, context) {
                 console.error("npm dist-tag add stdout:");
                 console.error(JSON.stringify(stdoutData, null, 2));
               }
-              return {
-                success: false
-              };
+              return new Promise((resolve) => resolve({ success: false }));
             }
           } catch (err2) {
             console.error(
               "Something unexpected went wrong when processing the npm dist-tag add output\n",
               err2
             );
-            return {
-              success: false
-            };
+            return new Promise((resolve) => resolve({ success: false }));
           }
         }
       }
@@ -19908,9 +19898,7 @@ function runExecutor(options, context) {
           "Something unexpected went wrong when checking for existing dist-tags.\n",
           err
         );
-        return {
-          success: false
-        };
+        return new Promise((resolve) => resolve({ success: false }));
       }
     }
   }
@@ -19937,9 +19925,7 @@ function runExecutor(options, context) {
     } else {
       console.log(`Published to ${registry} with tag "${tag}"`);
     }
-    return {
-      success: true
-    };
+    return new Promise((resolve) => resolve({ success: true }));
   } catch (err) {
     try {
       const stdoutData = JSON.parse(err.stdout?.toString() || "{}");
@@ -19954,17 +19940,13 @@ function runExecutor(options, context) {
         console.error("npm publish stdout:");
         console.error(JSON.stringify(stdoutData, null, 2));
       }
-      return {
-        success: false
-      };
+      return new Promise((resolve) => resolve({ success: false }));
     } catch (err2) {
       console.error(
         "Something unexpected went wrong when processing the npm publish output\n",
         err2
       );
-      return {
-        success: false
-      };
+      return new Promise((resolve) => resolve({ success: false }));
     }
   }
 }

package/src/executors/tsup/executor.js

@@ -115486,7 +115486,6 @@ var runTsupBuild = async (context, config, options) => {
   const getConfigOptions = {
     ...options,
     main: context.main,
-    entry: { [removeExtension(context.main).replace(context.sourceRoot, "")]: context.main },
     define: {
       __STORM_CONFIG: JSON.stringify(stormEnv)
     },
@@ -115800,17 +115799,19 @@ ${externalDependencies.map((dep) => {
   }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
-    packageJson.dependencies = void 0;
-    for (const externalDependency of externalDependencies) {
-      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] && !packageJson?.devDependencies?.[packageName]) {
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
-        }
-        if (!options.external.includes(packageName)) {
-          options.external.push(packageName);
+    if (options.bundle === false) {
+      packageJson.dependencies = void 0;
+      for (const externalDependency of externalDependencies) {
+        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] && !packageJson?.devDependencies?.[packageName]) {
+            packageJson.dependencies ??= {};
+            packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
+          }
+          if (!options.external.includes(packageName)) {
+            options.external.push(packageName);
+          }
         }
       }
     }

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

@@ -109241,11 +109241,6 @@ var outExtension = ({ format: format2 }) => {
   };
 };
 
-// packages/workspace-tools/src/utils/file-path-utils.ts
-var removeExtension = (filePath) => {
-  return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
-};
-
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
@@ -109295,7 +109290,6 @@ var runTsupBuild = async (context, config, options) => {
   const getConfigOptions = {
     ...options,
     main: context.main,
-    entry: { [removeExtension(context.main).replace(context.sourceRoot, "")]: context.main },
     define: {
       __STORM_CONFIG: JSON.stringify(stormEnv)
     },
@@ -115617,6 +115611,11 @@ glob.glob = glob;
 var import_fileutils = require("nx/src/utils/fileutils");
 var import_prettier = require("prettier");
 
+// packages/workspace-tools/src/utils/file-path-utils.ts
+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)(getWorkspaceRoot());
@@ -115830,17 +115829,19 @@ ${externalDependencies.map((dep) => {
   }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
-    packageJson.dependencies = void 0;
-    for (const externalDependency of externalDependencies) {
-      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] && !packageJson?.devDependencies?.[packageName]) {
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
-        }
-        if (!options.external.includes(packageName)) {
-          options.external.push(packageName);
+    if (options.bundle === false) {
+      packageJson.dependencies = void 0;
+      for (const externalDependency of externalDependencies) {
+        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] && !packageJson?.devDependencies?.[packageName]) {
+            packageJson.dependencies ??= {};
+            packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
+          }
+          if (!options.external.includes(packageName)) {
+            options.external.push(packageName);
+          }
         }
       }
     }

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

@@ -109241,11 +109241,6 @@ var outExtension = ({ format: format2 }) => {
   };
 };
 
-// packages/workspace-tools/src/utils/file-path-utils.ts
-var removeExtension = (filePath) => {
-  return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
-};
-
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
@@ -109295,7 +109290,6 @@ var runTsupBuild = async (context, config, options) => {
   const getConfigOptions = {
     ...options,
     main: context.main,
-    entry: { [removeExtension(context.main).replace(context.sourceRoot, "")]: context.main },
     define: {
       __STORM_CONFIG: JSON.stringify(stormEnv)
     },
@@ -115617,6 +115611,11 @@ glob.glob = glob;
 var import_fileutils = require("nx/src/utils/fileutils");
 var import_prettier = require("prettier");
 
+// packages/workspace-tools/src/utils/file-path-utils.ts
+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)(getWorkspaceRoot());
@@ -115830,17 +115829,19 @@ ${externalDependencies.map((dep) => {
   }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
-    packageJson.dependencies = void 0;
-    for (const externalDependency of externalDependencies) {
-      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] && !packageJson?.devDependencies?.[packageName]) {
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
-        }
-        if (!options.external.includes(packageName)) {
-          options.external.push(packageName);
+    if (options.bundle === false) {
+      packageJson.dependencies = void 0;
+      for (const externalDependency of externalDependencies) {
+        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] && !packageJson?.devDependencies?.[packageName]) {
+            packageJson.dependencies ??= {};
+            packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
+          }
+          if (!options.external.includes(packageName)) {
+            options.external.push(packageName);
+          }
         }
       }
     }

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

@@ -109241,11 +109241,6 @@ var outExtension = ({ format: format2 }) => {
   };
 };
 
-// packages/workspace-tools/src/utils/file-path-utils.ts
-var removeExtension = (filePath) => {
-  return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
-};
-
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
@@ -109295,7 +109290,6 @@ var runTsupBuild = async (context, config, options) => {
   const getConfigOptions = {
     ...options,
     main: context.main,
-    entry: { [removeExtension(context.main).replace(context.sourceRoot, "")]: context.main },
     define: {
       __STORM_CONFIG: JSON.stringify(stormEnv)
     },
@@ -115617,6 +115611,11 @@ glob.glob = glob;
 var import_fileutils = require("nx/src/utils/fileutils");
 var import_prettier = require("prettier");
 
+// packages/workspace-tools/src/utils/file-path-utils.ts
+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)(getWorkspaceRoot());
@@ -115830,17 +115829,19 @@ ${externalDependencies.map((dep) => {
   }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
-    packageJson.dependencies = void 0;
-    for (const externalDependency of externalDependencies) {
-      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] && !packageJson?.devDependencies?.[packageName]) {
-          packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
-        }
-        if (!options.external.includes(packageName)) {
-          options.external.push(packageName);
+    if (options.bundle === false) {
+      packageJson.dependencies = void 0;
+      for (const externalDependency of externalDependencies) {
+        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] && !packageJson?.devDependencies?.[packageName]) {
+            packageJson.dependencies ??= {};
+            packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
+          }
+          if (!options.external.includes(packageName)) {
+            options.external.push(packageName);
+          }
         }
       }
     }

package/src/utils/index.js

@@ -119810,7 +119810,6 @@ var runTsupBuild = async (context, config, options) => {
   const getConfigOptions = {
     ...options,
     main: context.main,
-    entry: { [removeExtension(context.main).replace(context.sourceRoot, "")]: context.main },
     define: {
       __STORM_CONFIG: JSON.stringify(stormEnv)
     },