fix devserver env vars not setting

dilanx · Oct 27, 2022 · fa09aa8 · fa09aa8
1 parent 3785fbe
commit fa09aa8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/craco/src/lib/features/dev-server/create-config-provider-proxy.ts b/packages/craco/src/lib/features/dev-server/create-config-provider-proxy.ts
@@ -40,8 +40,6 @@ function createProxy(
       );
     }
 
-    setEnvironmentVariables(devServerConfig);
-
     devServerConfig = applyDevServerConfigPlugins(
       cracoConfig,
       devServerConfig,

diff --git a/packages/craco/src/lib/features/dev-server/override.ts b/packages/craco/src/lib/features/dev-server/override.ts
@@ -1,15 +1,21 @@
 import type { CracoConfig, DevServerContext } from '@craco/types';
 
 import { overrideDevServerConfigProvider } from '../../cra';
+import { isFunction } from '../../utils';
 import { createConfigProviderProxy } from './create-config-provider-proxy';
 import { overrideDevServerUtils } from './override-utils';
+import { setEnvironmentVariables } from './set-environment-variables';
 
 export function overrideDevServer(
   cracoConfig: CracoConfig,
   context: DevServerContext
 ) {
   overrideDevServerUtils(cracoConfig);
 
+  if (cracoConfig.devServer && !isFunction(cracoConfig.devServer)) {
+    setEnvironmentVariables(cracoConfig.devServer);
+  }
+
   const proxy = createConfigProviderProxy(cracoConfig, context);
   overrideDevServerConfigProvider(cracoConfig, proxy);
 }