@storm-software/workspace-tools 1.30.1 → 1.30.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.30.2](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.30.1...workspace-tools-v1.30.2) (2023-12-12)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue where `includeSrc` option was incorrectly set ([a162001](https://github.com/storm-software/storm-ops/commit/a162001761a68900b5dc968f27cb70859bcfcc6a))
+
+## [1.30.1](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.30.0...workspace-tools-v1.30.1) (2023-12-12)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue with dependency names and bad entry paths ([85b3e68](https://github.com/storm-software/storm-ops/commit/85b3e6896731be05284b8c1d9f504ef75fd0dbfc))
+
 # [1.30.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.29.0...workspace-tools-v1.30.0) (2023-12-12)
 
 

package/index.js

@@ -26484,46 +26484,6 @@ var require_devkit = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js
-var require_get_extra_dependencies = __commonJS({
-  "node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getExtraDependencies = void 0;
-    function getExtraDependencies2(projectName, graph) {
-      const deps = /* @__PURE__ */ new Map();
-      recur(projectName);
-      function recur(currProjectName) {
-        const allDeps = graph.dependencies[currProjectName];
-        const externalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.externalNodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        const internalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.nodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        for (const externalDep of externalDeps) {
-          deps.set(externalDep.name, {
-            name: externalDep.name,
-            outputs: [],
-            node: externalDep
-          });
-        }
-        for (const internalDep of internalDeps) {
-          recur(internalDep.name);
-        }
-      }
-      return Array.from(deps.values());
-    }
-    exports.getExtraDependencies = getExtraDependencies2;
-  }
-});
-
 // node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json
 var require_package2 = __commonJS({
   "node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json"(exports, module2) {
@@ -106597,7 +106557,10 @@ __export(workspace_tools_exports, {
   eslintVersion: () => eslintVersion,
   findCacheDirectory: () => findCacheDirectory,
   findFileName: () => findFileName,
+  getExternalDependencies: () => getExternalDependencies,
+  getExtraDependencies: () => getExtraDependencies,
   getFileBanner: () => getFileBanner,
+  getInternalDependencies: () => getInternalDependencies,
   getProjectConfigurations: () => getProjectConfigurations,
   getWorkspaceRoot: () => getWorkspaceRoot2,
   lintStagedVersion: () => lintStagedVersion,
@@ -110928,7 +110891,6 @@ ${commentStart} ----------------------------------------------------------------
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_esbuild_decorators = __toESM(require_src());
 var import_devkit2 = __toESM(require_devkit());
-var import_get_extra_dependencies = __toESM(require_get_extra_dependencies());
 var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -117172,6 +117134,60 @@ function findFileName(filePath) {
   )?.pop() ?? "";
 }
 
+// packages/workspace-tools/src/utils/get-project-deps.ts
+function getExtraDependencies(projectName, graph) {
+  const deps = /* @__PURE__ */ new Map();
+  recur(projectName);
+  function recur(currProjectName) {
+    const allDeps = graph.dependencies[currProjectName];
+    const externalDeps = allDeps.reduce((acc, node) => {
+      const found = graph.externalNodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, []);
+    const internalDeps = allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, []);
+    for (const externalDep of externalDeps) {
+      deps.set(externalDep.name, {
+        name: externalDep.name,
+        outputs: [],
+        node: externalDep
+      });
+    }
+    for (const internalDep of internalDeps) {
+      recur(internalDep.name);
+    }
+  }
+  return Array.from(deps.values());
+}
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.nodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
+function getExternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.externalNodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
+
 // packages/workspace-tools/src/executors/tsup/get-config.ts
 var import_devkit = __toESM(require_devkit());
 var import_tsup = __toESM(require_dist6());
@@ -117407,13 +117423,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   tsConfig,
   additionalEntryPoints,
   platform,
+  emitOnAll = true,
   ...rest
 }) {
   const entryPoints = [];
   if (rest.entry) {
     entryPoints.push(rest.entry);
   }
-  if (rest.packageAll !== false) {
+  if (emitOnAll !== false) {
     entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
   }
   if (additionalEntryPoints) {
@@ -117425,7 +117442,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(2).replaceAll("\\", "/"), "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117518,7 +117535,7 @@ ${Object.keys(options).map(
         output: "."
       });
     }
-    if (options.includeSrc !== false) {
+    if (options.includeSrc === true) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -117547,28 +117564,6 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
-    if (implicitDependencies && implicitDependencies.length > 0) {
-      options.external = implicitDependencies.reduce(
-        (ret, key) => {
-          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;
-        },
-        options.external
-      );
-    }
     let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
@@ -117580,19 +117575,19 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    externalDependencies = implicitDependencies.reduce((acc, name) => {
-      const internalNode = context.projectGraph.nodes[name];
-      if (internalNode) {
-        acc.push({
-          name,
-          outputs: [],
-          node: internalNode
-        });
+    let internalDependencies = [];
+    for (const internalDependency of getInternalDependencies(
+      context.projectName,
+      context.projectGraph
+    )) {
+      const packageConfig = internalDependency.node.data;
+      if (packageConfig?.packageName) {
+        options.external.push(packageConfig.packageName);
+        internalDependencies.push(internalDependency);
       }
-      return acc;
-    }, externalDependencies);
+    }
     if (options.bundle === false) {
-      for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
+      for (const thirdPartyDependency of getExternalDependencies(
         context.projectName,
         context.projectGraph
       )) {
@@ -117628,7 +117623,7 @@ ${Object.keys(options).map(
       delete packageJson.dependencies;
       externalDependencies.forEach((entry) => {
         const packageConfig = entry.node.data;
-        if (packageConfig?.packageName && (!!(projectGraph.externalNodes[entry.node.name]?.type === "npm") || !!projectGraph.nodes[entry.node.name])) {
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
@@ -117637,6 +117632,14 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
+      internalDependencies.forEach((entry) => {
+        const packageConfig = entry.node.data;
+        if (packageConfig?.packageName) {
+          const { packageName, version } = packageConfig;
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = version ? version : "latest";
+        }
+      });
       packageJson.type = "module";
       packageJson.exports ??= {
         ".": {
@@ -117690,7 +117693,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);
@@ -117702,7 +117705,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 ??= {
@@ -117730,7 +117733,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"),
@@ -117888,7 +117891,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.packageAll ??= true;
+  options.emitOnAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;
@@ -119857,7 +119860,10 @@ var WorkspaceStorage = class {
   eslintVersion,
   findCacheDirectory,
   findFileName,
+  getExternalDependencies,
+  getExtraDependencies,
   getFileBanner,
+  getInternalDependencies,
   getProjectConfigurations,
   getWorkspaceRoot,
   lintStagedVersion,