fix(config): Update config to use outputDirectory value

storm-software · Apr 13, 2024 · 42604fa · 42604fa
1 parent 966a430
commit 42604fa
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 19 deletions.
diff --git a/packages/config-tools/src/env/get-env.ts b/packages/config-tools/src/env/get-env.ts
@@ -10,17 +10,23 @@ import { correctPaths } from "../utilities/correct-paths";
  * @param extensionName - The name of the extension module
  * @returns The config for the specified Storm extension module. If the module does not exist, `undefined` is returned.
  */
-export const getExtensionEnv = <TConfig extends Record<string, any> = Record<string, any>>(
+export const getExtensionEnv = <
+  TConfig extends Record<string, any> = Record<string, any>
+>(
   extensionName: string
 ): TConfig | undefined => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
   return Object.keys(process.env)
-    .filter((key) => key.startsWith(prefix))
+    .filter(key => key.startsWith(prefix))
     .reduce((ret: Record<string, any>, key: string) => {
       const name = key
         .replace(prefix, "")
         .split("_")
-        .map((i) => (i.length > 0 ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1) : ""))
+        .map(i =>
+          i.length > 0
+            ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1)
+            : ""
+        )
         .join("");
       if (name) {
         ret[name] = process.env[key];
@@ -45,7 +51,9 @@ export const getConfigEnv = (): DeepPartial<StormConfig> => {
     owner: process.env[`${prefix}OWNER`],
     worker: process.env[`${prefix}WORKER`],
     organization: process.env[`${prefix}ORGANIZATION`],
-    packageManager: process.env[`${prefix}PACKAGE_MANAGER`] as StormConfig["packageManager"],
+    packageManager: process.env[
+      `${prefix}PACKAGE_MANAGER`
+    ] as StormConfig["packageManager"],
     license: process.env[`${prefix}LICENSE`],
     homepage: process.env[`${prefix}HOMEPAGE`],
     timezone: process.env[`${prefix}TIMEZONE`] ?? process.env.TZ,
@@ -60,14 +68,16 @@ export const getConfigEnv = (): DeepPartial<StormConfig> => {
         : undefined,
     cacheDirectory: correctPaths(process.env[`${prefix}CACHE_DIRECTORY`]),
     runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
-    runtimeDirectory: correctPaths(process.env[`${prefix}RUNTIME_DIRECTORY`]),
+    outputDirectory: correctPaths(process.env[`${prefix}OUTPUT_DIRECTORY`]),
     env: (process.env[`${prefix}ENV`] ??
       process.env.NODE_ENV ??
       process.env.ENVIRONMENT) as StormConfig["env"],
     ci:
       process.env[`${prefix}CI`] !== undefined
         ? Boolean(
-            process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
+            process.env[`${prefix}CI`] ??
+              process.env.CI ??
+              process.env.CONTINUOUS_INTEGRATION
           )
         : undefined,
     colors: {
@@ -86,10 +96,15 @@ export const getConfigEnv = (): DeepPartial<StormConfig> => {
       ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] as string)
       : [],
     logLevel:
-      process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== undefined
+      process.env[`${prefix}LOG_LEVEL`] !== null &&
+      process.env[`${prefix}LOG_LEVEL`] !== undefined
         ? process.env[`${prefix}LOG_LEVEL`] &&
-          Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`] as string))
-          ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`] as string))
+          Number.isSafeInteger(
+            Number.parseInt(process.env[`${prefix}LOG_LEVEL`] as string)
+          )
+          ? getLogLevelLabel(
+              Number.parseInt(process.env[`${prefix}LOG_LEVEL`] as string)
+            )
           : (process.env[`${prefix}LOG_LEVEL`] as LogLevelLabel)
         : undefined
   };

diff --git a/packages/config-tools/src/env/set-env.ts b/packages/config-tools/src/env/set-env.ts
@@ -9,7 +9,9 @@ import { correctPaths } from "../utilities/correct-paths";
  * @param extensionName - The name of the extension module
  * @returns The config for the specified Storm extension module. If the module does not exist, `undefined` is returned.
  */
-export const setExtensionEnv = <TConfig extends Record<string, any> = Record<string, any>>(
+export const setExtensionEnv = <
+  TConfig extends Record<string, any> = Record<string, any>
+>(
   extensionName: string,
   extension: TConfig
 ) => {
@@ -35,8 +37,9 @@ export const setExtensionEnv = <TConfig extends Record<string, any> = Record<str
         });
       }
 
-      process.env[`STORM_EXTENSION_${extensionName.toUpperCase()}_${extensionKey.toUpperCase()}`] =
-        extension[key];
+      process.env[
+        `STORM_EXTENSION_${extensionName.toUpperCase()}_${extensionKey.toUpperCase()}`
+      ] = extension[key];
     }
   }
 };
@@ -98,10 +101,14 @@ export const setConfigEnv = (config: StormConfig) => {
     process.env.NX_WORKSPACE_ROOT_PATH = correctPaths(config.workspaceRoot);
   }
   if (config.packageDirectory) {
-    process.env[`${prefix}PACKAGE_DIRECTORY`] = correctPaths(config.packageDirectory);
+    process.env[`${prefix}PACKAGE_DIRECTORY`] = correctPaths(
+      config.packageDirectory
+    );
   }
   if (config.buildDirectory) {
-    process.env[`${prefix}BUILD_DIRECTORY`] = correctPaths(config.buildDirectory);
+    process.env[`${prefix}BUILD_DIRECTORY`] = correctPaths(
+      config.buildDirectory
+    );
   }
   if (config.skipCache !== undefined) {
     process.env[`${prefix}SKIP_CACHE`] = String(config.skipCache);
@@ -111,7 +118,9 @@ export const setConfigEnv = (config: StormConfig) => {
     }
   }
   if (!config.skipCache && config.cacheDirectory) {
-    process.env[`${prefix}CACHE_DIRECTORY`] = correctPaths(config.cacheDirectory);
+    process.env[`${prefix}CACHE_DIRECTORY`] = correctPaths(
+      config.cacheDirectory
+    );
     // if (config.cacheDirectory.includes("/storm") || config.cacheDirectory.includes("\\storm")) {
     //   const nxCacheDirectory = join(
     //     config.cacheDirectory.includes("/storm")
@@ -126,8 +135,10 @@ export const setConfigEnv = (config: StormConfig) => {
   if (config.runtimeVersion) {
     process.env[`${prefix}RUNTIME_VERSION`] = config.runtimeVersion;
   }
-  if (config.runtimeDirectory) {
-    process.env[`${prefix}RUNTIME_DIRECTORY`] = correctPaths(config.runtimeDirectory);
+  if (config.outputDirectory) {
+    process.env[`${prefix}OUTPUT_DIRECTORY`] = correctPaths(
+      config.outputDirectory
+    );
   }
   if (config.env) {
     process.env[`${prefix}ENV`] = config.env;
@@ -180,7 +191,8 @@ export const setConfigEnv = (config: StormConfig) => {
     process.env.NX_VERBOSE_LOGGING = String(
       getLogLevel(config.logLevel) >= LogLevel.DEBUG ? true : false
     );
-    process.env.RUST_BACKTRACE = getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none";
+    process.env.RUST_BACKTRACE =
+      getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none";
   }
   process.env[`${prefix}CONFIG`] = JSON.stringify(config);
 

diff --git a/packages/config/src/schema.ts b/packages/config/src/schema.ts
@@ -171,7 +171,7 @@ export const StormConfigSchema = z
       .trim()
       .default("dist")
       .describe("The build directory for the workspace"),
-    runtimeDirectory: z
+    outputDirectory: z
       .string()
       .trim()
       .default("node_modules/.storm")