@storm-software/workspace-tools 1.43.15 → 1.43.16

package/package.json

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

@@ -8247,14 +8247,14 @@ var require_parse_target_string = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.targetToTargetString = exports.parseTargetString = void 0;
     var nx_1 = require_nx();
-    var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
+    var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
     splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
     splitByColons = splitByColons ?? ((s) => s.split(":"));
     function parseTargetString(targetString, projectGraphOrCtx) {
       let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
       if (!projectGraph) {
         try {
-          projectGraph = readCachedProjectGraph();
+          projectGraph = readCachedProjectGraph2();
         } catch (e) {
           projectGraph = { nodes: {} };
         }
@@ -137266,29 +137266,19 @@ ${externalDependencies.map((dep) => {
     }
     return ret;
   }, {});
-  console.log("Conditional before checking entry points");
   if (options.generatePackageJson !== false) {
-    console.log("Checking entry points");
-    const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
-      exitOnError: true
-    });
-    console.log("Read project graph");
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
     for (const externalDependency of externalDependencies) {
-      console.log(externalDependency);
       const packageConfig = externalDependency.node.data;
-      if (packageConfig?.packageName && externalDependency.node.type === "npm" && packageConfig?.packageName !== "@biomejs/biome") {
-        console.log("In if statement");
-        console.log(packageConfig);
+      if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
         const { packageName, version } = packageConfig;
-        if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
-          return null;
+        if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
       }
     }
-    console.log("Checking entry points - internalDependencies");
     for (const packageName of internalDependencies) {
       if (!packageJson?.devDependencies?.[packageName]) {
         packageJson.dependencies ??= {};
@@ -137327,7 +137317,6 @@ ${externalDependencies.map((dep) => {
         },
         "./package.json": "./package.json"
       };
-      console.log("Checking entry points - packageJson.exports");
       packageJson.exports = Object.keys(entry).reduce((ret, key) => {
         let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
         packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137384,7 +137373,6 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
-    console.log("Checking entry points - packageJsonPath");
     const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs2.writeFileSync)(
@@ -137397,7 +137385,6 @@ ${externalDependencies.map((dep) => {
   } else {
     writeWarning(config, "Skipping writing to package.json file");
   }
-  console.log("Checking entry points - options.includeSrc");
   if (options.includeSrc === true) {
     const files = globSync([
       (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),

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

@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.targetToTargetString = exports.parseTargetString = void 0;
     var nx_1 = require_nx();
-    var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
+    var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
     splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
     splitByColons = splitByColons ?? ((s) => s.split(":"));
     function parseTargetString(targetString, projectGraphOrCtx) {
       let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
       if (!projectGraph) {
         try {
-          projectGraph = readCachedProjectGraph();
+          projectGraph = readCachedProjectGraph2();
         } catch (e) {
           projectGraph = { nodes: {} };
         }
@@ -137297,29 +137297,19 @@ ${externalDependencies.map((dep) => {
     }
     return ret;
   }, {});
-  console.log("Conditional before checking entry points");
   if (options.generatePackageJson !== false) {
-    console.log("Checking entry points");
-    const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
-      exitOnError: true
-    });
-    console.log("Read project graph");
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
     for (const externalDependency of externalDependencies) {
-      console.log(externalDependency);
       const packageConfig = externalDependency.node.data;
-      if (packageConfig?.packageName && externalDependency.node.type === "npm" && packageConfig?.packageName !== "@biomejs/biome") {
-        console.log("In if statement");
-        console.log(packageConfig);
+      if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
         const { packageName, version } = packageConfig;
-        if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
-          return null;
+        if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
       }
     }
-    console.log("Checking entry points - internalDependencies");
     for (const packageName of internalDependencies) {
       if (!packageJson?.devDependencies?.[packageName]) {
         packageJson.dependencies ??= {};
@@ -137358,7 +137348,6 @@ ${externalDependencies.map((dep) => {
         },
         "./package.json": "./package.json"
       };
-      console.log("Checking entry points - packageJson.exports");
       packageJson.exports = Object.keys(entry).reduce((ret, key) => {
         let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
         packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137415,7 +137404,6 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
-    console.log("Checking entry points - packageJsonPath");
     const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs2.writeFileSync)(
@@ -137428,7 +137416,6 @@ ${externalDependencies.map((dep) => {
   } else {
     writeWarning(config, "Skipping writing to package.json file");
   }
-  console.log("Checking entry points - options.includeSrc");
   if (options.includeSrc === true) {
     const files = globSync([
       (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),

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

@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.targetToTargetString = exports.parseTargetString = void 0;
     var nx_1 = require_nx();
-    var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
+    var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
     splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
     splitByColons = splitByColons ?? ((s) => s.split(":"));
     function parseTargetString(targetString, projectGraphOrCtx) {
       let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
       if (!projectGraph) {
         try {
-          projectGraph = readCachedProjectGraph();
+          projectGraph = readCachedProjectGraph2();
         } catch (e) {
           projectGraph = { nodes: {} };
         }
@@ -137297,29 +137297,19 @@ ${externalDependencies.map((dep) => {
     }
     return ret;
   }, {});
-  console.log("Conditional before checking entry points");
   if (options.generatePackageJson !== false) {
-    console.log("Checking entry points");
-    const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
-      exitOnError: true
-    });
-    console.log("Read project graph");
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
     for (const externalDependency of externalDependencies) {
-      console.log(externalDependency);
       const packageConfig = externalDependency.node.data;
-      if (packageConfig?.packageName && externalDependency.node.type === "npm" && packageConfig?.packageName !== "@biomejs/biome") {
-        console.log("In if statement");
-        console.log(packageConfig);
+      if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
         const { packageName, version } = packageConfig;
-        if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
-          return null;
+        if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
       }
     }
-    console.log("Checking entry points - internalDependencies");
     for (const packageName of internalDependencies) {
       if (!packageJson?.devDependencies?.[packageName]) {
         packageJson.dependencies ??= {};
@@ -137358,7 +137348,6 @@ ${externalDependencies.map((dep) => {
         },
         "./package.json": "./package.json"
       };
-      console.log("Checking entry points - packageJson.exports");
       packageJson.exports = Object.keys(entry).reduce((ret, key) => {
         let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
         packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137415,7 +137404,6 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
-    console.log("Checking entry points - packageJsonPath");
     const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs2.writeFileSync)(
@@ -137428,7 +137416,6 @@ ${externalDependencies.map((dep) => {
   } else {
     writeWarning(config, "Skipping writing to package.json file");
   }
-  console.log("Checking entry points - options.includeSrc");
   if (options.includeSrc === true) {
     const files = globSync([
       (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),

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

@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.targetToTargetString = exports.parseTargetString = void 0;
     var nx_1 = require_nx();
-    var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
+    var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
     splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
     splitByColons = splitByColons ?? ((s) => s.split(":"));
     function parseTargetString(targetString, projectGraphOrCtx) {
       let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
       if (!projectGraph) {
         try {
-          projectGraph = readCachedProjectGraph();
+          projectGraph = readCachedProjectGraph2();
         } catch (e) {
           projectGraph = { nodes: {} };
         }
@@ -137297,29 +137297,19 @@ ${externalDependencies.map((dep) => {
     }
     return ret;
   }, {});
-  console.log("Conditional before checking entry points");
   if (options.generatePackageJson !== false) {
-    console.log("Checking entry points");
-    const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
-      exitOnError: true
-    });
-    console.log("Read project graph");
+    const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
     for (const externalDependency of externalDependencies) {
-      console.log(externalDependency);
       const packageConfig = externalDependency.node.data;
-      if (packageConfig?.packageName && externalDependency.node.type === "npm" && packageConfig?.packageName !== "@biomejs/biome") {
-        console.log("In if statement");
-        console.log(packageConfig);
+      if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
         const { packageName, version } = packageConfig;
-        if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
-          return null;
+        if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
       }
     }
-    console.log("Checking entry points - internalDependencies");
     for (const packageName of internalDependencies) {
       if (!packageJson?.devDependencies?.[packageName]) {
         packageJson.dependencies ??= {};
@@ -137358,7 +137348,6 @@ ${externalDependencies.map((dep) => {
         },
         "./package.json": "./package.json"
       };
-      console.log("Checking entry points - packageJson.exports");
       packageJson.exports = Object.keys(entry).reduce((ret, key) => {
         let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
         packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137415,7 +137404,6 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
-    console.log("Checking entry points - packageJsonPath");
     const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs2.writeFileSync)(
@@ -137428,7 +137416,6 @@ ${externalDependencies.map((dep) => {
   } else {
     writeWarning(config, "Skipping writing to package.json file");
   }
-  console.log("Checking entry points - options.includeSrc");
   if (options.includeSrc === true) {
     const files = globSync([
       (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),