chore: resolve conflicts

nestjs · Jun 15, 2023 · 21fb852 · 21fb852
2 parents abfc4e3 + 6de82f2
commit 21fb852
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/lib/config.module.ts b/lib/config.module.ts
@@ -184,8 +184,12 @@ export class ConfigModule {
           config,
         );
         if (options.expandVariables) {
-          const expandOptions: DotenvExpandOptions = typeof options.expandVariables === 'object' ? options.expandVariables : {};
-          config = expand({ ...expandOptions, parsed: config }).parsed || config;
+          const expandOptions: DotenvExpandOptions =
+            typeof options.expandVariables === 'object'
+              ? options.expandVariables
+              : {};
+          config =
+            expand({ ...expandOptions, parsed: config }).parsed || config;
         }
       }
     }
@@ -197,14 +201,14 @@ export class ConfigModule {
       return;
     }
     const keys = Object.keys(config).filter(key => !(key in process.env));
-    keys.forEach(
-      key => {
-        const value = config[key];
-        if (typeof value === 'string') {
-          process.env[key] = value;
-        }
-      },
-    );
+    keys.forEach(key => {
+      const value = config[key];
+      if (typeof value === 'string') {
+        process.env[key] = value;
+      } else if (typeof value === 'boolean' || typeof value === 'number') {
+        process.env[key] = `${value}`;
+      }
+    });
   }
 
   private static mergePartial(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/config",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@config)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",