wrangler 0.0.0-e95e5a0 → 0.0.0-e98613f8

package/src/dev/dev-vars.ts

@@ -1,6 +1,5 @@
-import * as fs from "node:fs";
 import * as path from "node:path";
-import dotenv from "dotenv";
+import { loadDotEnv } from "../config";
 import { logger } from "../logger";
 import type { Config } from "../config";
 
@@ -14,23 +13,27 @@ import type { Config } from "../config";
  * It is useful during development, to provide these types of variable locally.
  * When running `wrangler dev` we will look for a file called `.dev.vars`, situated
  * next to the `wrangler.toml` file (or in the current working directory if there is no
- * `wrangler.toml`).
+ * `wrangler.toml`). If the `--env <env>` option is set, we'll first look for
+ * `.dev.vars.<env>`.
  *
  * Any values in this file, formatted like a `dotenv` file, will add to or override `vars`
  * bindings provided in the `wrangler.toml`.
  */
-export function getVarsForDev(config: Config): Config["vars"] {
-  const configDir = path.resolve(path.dirname(config.configPath ?? "."));
-  const devVarsPath = path.resolve(configDir, ".dev.vars");
-  if (fs.existsSync(devVarsPath)) {
-    const devVarsRelativePath = path.relative(process.cwd(), devVarsPath);
-    logger.log(`Using vars defined in ${devVarsRelativePath}`);
-    const devVars = dotenv.parse(fs.readFileSync(devVarsPath, "utf8"));
-    return {
-      ...config.vars,
-      ...devVars,
-    };
-  } else {
-    return config.vars;
-  }
+export function getVarsForDev(
+	config: Config,
+	env: string | undefined
+): Config["vars"] {
+	const configDir = path.resolve(path.dirname(config.configPath ?? "."));
+	const devVarsPath = path.resolve(configDir, ".dev.vars");
+	const loaded = loadDotEnv(devVarsPath, env);
+	if (loaded !== undefined) {
+		const devVarsRelativePath = path.relative(process.cwd(), loaded.path);
+		logger.log(`Using vars defined in ${devVarsRelativePath}`);
+		return {
+			...config.vars,
+			...loaded.parsed,
+		};
+	} else {
+		return config.vars;
+	}
 }