From cb8b3a21e50c26e91ba46fb85a390ba2031606dc Mon Sep 17 00:00:00 2001 From: Zack Tanner Date: Sat, 30 Sep 2023 16:43:03 -0700 Subject: [PATCH] only override NODE_EXTRA_CA_CERTS when using experimental https flag (#56252) This was unintentionally preventing this flag from being sent on `process.env` even if you weren't using `--experimental-https`. [x-ref](https://github.com/vercel/next.js/pull/55775#issuecomment-1741870873) --- packages/next/src/cli/next-dev.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/next/src/cli/next-dev.ts b/packages/next/src/cli/next-dev.ts index 8754c8af2c..70546ea42f 100644 --- a/packages/next/src/cli/next-dev.ts +++ b/packages/next/src/cli/next-dev.ts @@ -245,14 +245,17 @@ const nextDev: CliCommand = async (args) => { async function startServer(options: StartServerOptions) { return new Promise((resolve) => { let resolved = false + const defaultEnv = (initialEnv || process.env) as typeof process.env child = fork(startServerPath, { stdio: 'inherit', env: { - ...((initialEnv || process.env) as typeof process.env), + ...defaultEnv, TURBOPACK: process.env.TURBOPACK, NEXT_PRIVATE_WORKER: '1', - NODE_EXTRA_CA_CERTS: options.selfSignedCertificate?.rootCA, + NODE_EXTRA_CA_CERTS: options.selfSignedCertificate + ? options.selfSignedCertificate.rootCA + : defaultEnv.NODE_EXTRA_CA_CERTS, }, })