Unverified Commit cb8b3a21 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

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)
parent 3b8a8f5c
...@@ -245,14 +245,17 @@ const nextDev: CliCommand = async (args) => { ...@@ -245,14 +245,17 @@ const nextDev: CliCommand = async (args) => {
async function startServer(options: StartServerOptions) { async function startServer(options: StartServerOptions) {
return new Promise<void>((resolve) => { return new Promise<void>((resolve) => {
let resolved = false let resolved = false
const defaultEnv = (initialEnv || process.env) as typeof process.env
child = fork(startServerPath, { child = fork(startServerPath, {
stdio: 'inherit', stdio: 'inherit',
env: { env: {
...((initialEnv || process.env) as typeof process.env), ...defaultEnv,
TURBOPACK: process.env.TURBOPACK, TURBOPACK: process.env.TURBOPACK,
NEXT_PRIVATE_WORKER: '1', 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,
}, },
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment