@storm-software/workspace-tools 1.30.0 → 1.30.2

package/package.json

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

@@ -117232,7 +117232,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("/", "\\").replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117325,7 +117325,7 @@ ${Object.keys(options).map(
         output: "."
       });
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -117358,16 +117358,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
+            const buildTargetName = Object.keys(
+              context.projectsConfigurations.projects[key].targets
+            ).find((name) => name.toLowerCase() === "build");
+            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
+              const packageJson = (0, import_devkit2.readJsonFile)(
+                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
+              );
+              if (packageJson?.name && !options.external.includes(packageJson.name)) {
+                ret.push(packageJson.name);
+              }
             }
           }
           return ret;
@@ -117455,20 +117456,20 @@ ${Object.keys(options).map(
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117496,7 +117497,7 @@ ${Object.keys(options).map(
       packageJson.main ??= "dist/legacy/index.cjs";
       packageJson.module ??= "dist/legacy/index.js";
       options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-      if (options.includeSrc !== false) {
+      if (options.includeSrc === true) {
         let distSrc = sourceRoot.replace(projectRoot, "");
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
@@ -117508,7 +117509,7 @@ ${Object.keys(options).map(
       }
       packageJson.sideEffects ??= false;
       packageJson.files ??= ["dist/**/*"];
-      if (options.includeSrc !== false && !packageJson.files.includes("src")) {
+      if (options.includeSrc === true && !packageJson.files.includes("src")) {
         packageJson.files.push("src/**/*");
       }
       packageJson.publishConfig ??= {
@@ -117536,7 +117537,7 @@ ${Object.keys(options).map(
         })
       );
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       const files = globSync([
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),

package/src/executors/tsup/get-config.js

@@ -88629,7 +88629,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("/", "\\").replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);

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

@@ -117263,7 +117263,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("/", "\\").replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117356,7 +117356,7 @@ ${Object.keys(options).map(
         output: "."
       });
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -117389,16 +117389,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
+            const buildTargetName = Object.keys(
+              context.projectsConfigurations.projects[key].targets
+            ).find((name) => name.toLowerCase() === "build");
+            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
+              const packageJson = (0, import_devkit2.readJsonFile)(
+                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
+              );
+              if (packageJson?.name && !options.external.includes(packageJson.name)) {
+                ret.push(packageJson.name);
+              }
             }
           }
           return ret;
@@ -117486,20 +117487,20 @@ ${Object.keys(options).map(
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117527,7 +117528,7 @@ ${Object.keys(options).map(
       packageJson.main ??= "dist/legacy/index.cjs";
       packageJson.module ??= "dist/legacy/index.js";
       options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-      if (options.includeSrc !== false) {
+      if (options.includeSrc === true) {
         let distSrc = sourceRoot.replace(projectRoot, "");
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
@@ -117539,7 +117540,7 @@ ${Object.keys(options).map(
       }
       packageJson.sideEffects ??= false;
       packageJson.files ??= ["dist/**/*"];
-      if (options.includeSrc !== false && !packageJson.files.includes("src")) {
+      if (options.includeSrc === true && !packageJson.files.includes("src")) {
         packageJson.files.push("src/**/*");
       }
       packageJson.publishConfig ??= {
@@ -117567,7 +117568,7 @@ ${Object.keys(options).map(
         })
       );
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       const files = globSync([
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),

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

@@ -117263,7 +117263,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("/", "\\").replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117356,7 +117356,7 @@ ${Object.keys(options).map(
         output: "."
       });
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -117389,16 +117389,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
+            const buildTargetName = Object.keys(
+              context.projectsConfigurations.projects[key].targets
+            ).find((name) => name.toLowerCase() === "build");
+            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
+              const packageJson = (0, import_devkit2.readJsonFile)(
+                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
+              );
+              if (packageJson?.name && !options.external.includes(packageJson.name)) {
+                ret.push(packageJson.name);
+              }
             }
           }
           return ret;
@@ -117486,20 +117487,20 @@ ${Object.keys(options).map(
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117527,7 +117528,7 @@ ${Object.keys(options).map(
       packageJson.main ??= "dist/legacy/index.cjs";
       packageJson.module ??= "dist/legacy/index.js";
       options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-      if (options.includeSrc !== false) {
+      if (options.includeSrc === true) {
         let distSrc = sourceRoot.replace(projectRoot, "");
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
@@ -117539,7 +117540,7 @@ ${Object.keys(options).map(
       }
       packageJson.sideEffects ??= false;
       packageJson.files ??= ["dist/**/*"];
-      if (options.includeSrc !== false && !packageJson.files.includes("src")) {
+      if (options.includeSrc === true && !packageJson.files.includes("src")) {
         packageJson.files.push("src/**/*");
       }
       packageJson.publishConfig ??= {
@@ -117567,7 +117568,7 @@ ${Object.keys(options).map(
         })
       );
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       const files = globSync([
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),

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

@@ -117263,7 +117263,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("/", "\\").replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117356,7 +117356,7 @@ ${Object.keys(options).map(
         output: "."
       });
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -117389,16 +117389,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
+            const buildTargetName = Object.keys(
+              context.projectsConfigurations.projects[key].targets
+            ).find((name) => name.toLowerCase() === "build");
+            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
+              const packageJson = (0, import_devkit2.readJsonFile)(
+                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
+              );
+              if (packageJson?.name && !options.external.includes(packageJson.name)) {
+                ret.push(packageJson.name);
+              }
             }
           }
           return ret;
@@ -117486,20 +117487,20 @@ ${Object.keys(options).map(
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117527,7 +117528,7 @@ ${Object.keys(options).map(
       packageJson.main ??= "dist/legacy/index.cjs";
       packageJson.module ??= "dist/legacy/index.js";
       options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-      if (options.includeSrc !== false) {
+      if (options.includeSrc === true) {
         let distSrc = sourceRoot.replace(projectRoot, "");
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
@@ -117539,7 +117540,7 @@ ${Object.keys(options).map(
       }
       packageJson.sideEffects ??= false;
       packageJson.files ??= ["dist/**/*"];
-      if (options.includeSrc !== false && !packageJson.files.includes("src")) {
+      if (options.includeSrc === true && !packageJson.files.includes("src")) {
         packageJson.files.push("src/**/*");
       }
       packageJson.publishConfig ??= {
@@ -117567,7 +117568,7 @@ ${Object.keys(options).map(
         })
       );
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       const files = globSync([
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
         (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),