fix: ssr apps process env variables

teambit · Feb 2, 2024 · 2cf12e1 · 2cf12e1
1 parent 357cdf2
commit 2cf12e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/angular/app-types/angular-app-type/angular.application.ts b/angular/app-types/angular-app-type/angular.application.ts
@@ -187,7 +187,7 @@ export class AngularApp implements Application {
         logger: logger,
         tempFolder: tempFolder,
         envVars: {
-          'process.env': envVars
+          process: { env: envVars }
         }
       });
     } else {

diff --git a/angular/app-types/angular-app-type/plugins/define.plugin.ts b/angular/app-types/angular-app-type/plugins/define.plugin.ts
@@ -1,4 +1,5 @@
 import { Plugin, PluginBuild } from 'esbuild';
+import { merge } from 'lodash';
 
 export const stringifyDefine = (define: any) => {
   return Object.entries(define).reduce((acc: any, [key, value]) => {
@@ -11,18 +12,9 @@ export const stringifyDefine = (define: any) => {
  * Pass environment variables to esbuild.
  * @returns An esbuild plugin.
  */
-export default function(defineValues = {}) {
+export default function(defineValues: any = {}) {
   // set variables on global so that they also work during ssr
-  const keys = Object.keys(defineValues);
-  keys.forEach((key: any) => {
-    // @ts-ignore
-    if (global[key]) {
-      throw new Error(`Define plugin: key ${ key } already exists on global`);
-    } else {
-      // @ts-ignore
-      global[key] = defineValues[key];
-    }
-  });
+  merge(global, defineValues);
 
   const plugin: Plugin = {
     name: 'env',