@storm-software/workspace-tools 1.43.14 → 1.43.16

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.43.15](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.14...workspace-tools-v1.43.15) (2024-01-17)
+
+
+### Bug Fixes
+
+* **config-tools:** Ensure colors are set correctly ([e6fffd0](https://github.com/storm-software/storm-ops/commit/e6fffd0c6554d2fa36e3a4b8b44b443c030aa831))
+* **workspace-tools:** Skip adding biome as external dependency ([0512735](https://github.com/storm-software/storm-ops/commit/051273598815a55c9e5f0ff7b39e1eefc2b93be3))
+
+## [1.43.14](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.13...workspace-tools-v1.43.14) (2024-01-17)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Update the logic to apply external dependencies ([29b73ca](https://github.com/storm-software/storm-ops/commit/29b73ca3ee95539a3832adcc59043882d358eb53))
+
 ## [1.43.13](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.43.12...workspace-tools-v1.43.13) (2024-01-17)
 
 

package/index.js

@@ -16007,14 +16007,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: {} };
         }
@@ -130562,7 +130562,19 @@ var loadStormConfig = async (workspaceRoot) => {
   const configEnv = getConfigEnv();
   for (const key of Object.keys(configEnv)) {
     if (configEnv[key] !== void 0 && configEnv[key] !== null) {
-      configFile[key] = configEnv[key];
+      if (key === "colors") {
+        configFile.colors = {
+          primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
+          background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
+          success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
+          info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
+          warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
+          error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
+          fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
+        };
+      } else {
+        configFile[key] = configEnv[key];
+      }
     }
   }
   const config = StormConfigSchema.parse(configFile);
@@ -137851,29 +137863,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_devkit3.createProjectGraphAsync)({
-      exitOnError: true
-    });
-    console.log("Read project graph");
+    const projectGraph = (0, import_devkit3.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") {
-        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 ??= {};
@@ -137912,7 +137914,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", "");
@@ -137969,7 +137970,6 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path3.join)("packages", context.projectName);
-    console.log("Checking entry points - packageJsonPath");
     const packageJsonPath = (0, import_node_path3.join)(context.root, options.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs2.writeFileSync)(
@@ -137982,7 +137982,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_devkit3.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),