Commit ed03f82
src/cli.ts
@@ -20,6 +20,7 @@ import {
ProcessOutput,
parseArgv,
updateArgv,
+ resolveDefaults,
chalk,
dotenv,
fetch,
@@ -89,8 +90,9 @@ export async function main() {
argv.ext = normalizeExt(argv.ext)
if (argv.cwd) $.cwd = argv.cwd
if (argv.env) {
- const envPath = path.resolve($.cwd ?? process.cwd(), argv.env)
- $.env = { ...process.env, ...dotenv.load(envPath) }
+ const envfile = path.resolve($.cwd ?? process.cwd(), argv.env)
+ dotenv.config(envfile)
+ resolveDefaults()
}
if (argv.verbose) $.verbose = true
if (argv.quiet) $.quiet = true
src/core.ts
@@ -893,7 +893,7 @@ const promisifyStream = <S extends Writable>(
})
export function resolveDefaults(
- defs: Options,
+ defs: Options = defaults,
prefix: string = ENV_PREFIX,
env = process.env
) {