move logic inside getDeploymentMapping

Author: dario-piotrowicz

packages/cloudflare/src/cli/commands/deploy.ts

@@ -27,13 +27,11 @@ export async function deployCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 
 	const wranglerConfig = readWranglerConfig(args);
 
-	const platformProxyEnvVars = await getEnvFromPlatformProxy({
+	const envVars = await getEnvFromPlatformProxy({
 		configPath: args.configPath,
 		environment: args.env,
 	});
 
-	const envVars = { ...platformProxyEnvVars, ...process.env };
-
 	const deploymentMapping = await getDeploymentMapping(options, config, envVars);
 
 	await populateCache(options, config, wranglerConfig, {

packages/cloudflare/src/cli/commands/skew-protection.ts

@@ -45,18 +45,23 @@ const MS_PER_DAY = 24 * 3600 * 1000;
  *
  * @param options Build options
  * @param config OpenNext config
- * @param envVars Environment variables
+ * @param workerEnvVars Worker Environment variables (taken from the wrangler config files)
  * @returns Deployment mapping or undefined
  */
 export async function getDeploymentMapping(
 	options: BuildOptions,
 	config: OpenNextConfig,
-	envVars: WorkerEnvVar
+	workerEnvVars: WorkerEnvVar
 ): Promise<Record<string, string> | undefined> {
 	if (config.cloudflare?.skewProtection?.enabled !== true) {
 		return undefined;
 	}
 
+	// Note that `process.env` is spread after `workerEnvVars` since we do want
+	// system environment variables to take precedence over the variables defined
+	// in the wrangler config files
+	const envVars = { ...workerEnvVars, ...process.env };
+
 	const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next"));
 	const deploymentId = nextConfig.deploymentId;
 

packages/cloudflare/src/cli/commands/upload.ts

@@ -27,13 +27,11 @@ export async function uploadCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 
 	const wranglerConfig = readWranglerConfig(args);
 
-	const platformProxyEnvVars = await getEnvFromPlatformProxy({
+	const envVars = await getEnvFromPlatformProxy({
 		configPath: args.configPath,
 		environment: args.env,
 	});
 
-	const envVars = { ...platformProxyEnvVars, ...process.env };
-
 	const deploymentMapping = await getDeploymentMapping(options, config, envVars);
 
 	await populateCache(options, config, wranglerConfig, {