@storm-software/workspace-tools 1.43.8 → 1.43.10

package/package.json

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

package/src/base/index.js

@@ -47677,12 +47677,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/executors/design-tokens/executor.js

@@ -65593,12 +65593,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/executors/tsup/executor.js

@@ -130534,12 +130534,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

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

@@ -130525,12 +130525,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

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

@@ -130525,12 +130525,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

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

@@ -130525,12 +130525,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/generators/browser-library/generator.js

@@ -47670,12 +47670,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/generators/config-schema/generator.js

@@ -30428,12 +30428,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/generators/neutral-library/generator.js

@@ -47670,12 +47670,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/generators/node-library/generator.js

@@ -47670,12 +47670,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };
 

package/src/generators/preset/generator.js

@@ -30429,12 +30429,22 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
+  console.debug("\n\n");
+  console.debug(`Loaded Storm config from ${config.configFile}`);
+  for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
+    console.debug(configFile[key]);
+  }
+  console.debug("\n\n");
   return config;
 };