Skip to content

Commit fa09aa8

Browse files
committed
fix devserver env vars not setting
1 parent 3785fbe commit fa09aa8

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

packages/craco/src/lib/features/dev-server/create-config-provider-proxy.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ function createProxy(
4040
);
4141
}
4242

43-
setEnvironmentVariables(devServerConfig);
44-
4543
devServerConfig = applyDevServerConfigPlugins(
4644
cracoConfig,
4745
devServerConfig,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
import type { CracoConfig, DevServerContext } from '@craco/types';
22

33
import { overrideDevServerConfigProvider } from '../../cra';
4+
import { isFunction } from '../../utils';
45
import { createConfigProviderProxy } from './create-config-provider-proxy';
56
import { overrideDevServerUtils } from './override-utils';
7+
import { setEnvironmentVariables } from './set-environment-variables';
68

79
export function overrideDevServer(
810
cracoConfig: CracoConfig,
911
context: DevServerContext
1012
) {
1113
overrideDevServerUtils(cracoConfig);
1214

15+
if (cracoConfig.devServer && !isFunction(cracoConfig.devServer)) {
16+
setEnvironmentVariables(cracoConfig.devServer);
17+
}
18+
1319
const proxy = createConfigProviderProxy(cracoConfig, context);
1420
overrideDevServerConfigProvider(cracoConfig, proxy);
1521
}

0 commit comments

Comments
 (0)