Unverified Commit 7790f72f authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Run export child process with runtime's default `max-old-space-size` (#78712)

parent 4cde29ca
...@@ -764,7 +764,9 @@ export function createStaticWorker( ...@@ -764,7 +764,9 @@ export function createStaticWorker(
progress?.clear() progress?.clear()
}, },
forkOptions: { forkOptions: {
env: { ...process.env, NODE_OPTIONS: formatNodeOptions(nodeOptions) }, env: {
NODE_OPTIONS: formatNodeOptions(nodeOptions),
},
}, },
enableWorkerThreads: config.experimental.workerThreads, enableWorkerThreads: config.experimental.workerThreads,
exposedMethods: staticWorkerExposedMethods, exposedMethods: staticWorkerExposedMethods,
......
...@@ -16,7 +16,6 @@ async function turbopackBuildWithWorker() { ...@@ -16,7 +16,6 @@ async function turbopackBuildWithWorker() {
maxRetries: 0, maxRetries: 0,
forkOptions: { forkOptions: {
env: { env: {
...process.env,
NEXT_PRIVATE_BUILD_WORKER: '1', NEXT_PRIVATE_BUILD_WORKER: '1',
NODE_OPTIONS: formatNodeOptions(nodeOptions), NODE_OPTIONS: formatNodeOptions(nodeOptions),
}, },
......
...@@ -57,7 +57,6 @@ async function webpackBuildWithWorker( ...@@ -57,7 +57,6 @@ async function webpackBuildWithWorker(
maxRetries: 0, maxRetries: 0,
forkOptions: { forkOptions: {
env: { env: {
...process.env,
NEXT_PRIVATE_BUILD_WORKER: '1', NEXT_PRIVATE_BUILD_WORKER: '1',
NODE_OPTIONS: formatNodeOptions(nodeOptions), NODE_OPTIONS: formatNodeOptions(nodeOptions),
}, },
......
...@@ -2,7 +2,7 @@ import type { ChildProcess } from 'child_process' ...@@ -2,7 +2,7 @@ import type { ChildProcess } from 'child_process'
import { Worker as JestWorker } from 'next/dist/compiled/jest-worker' import { Worker as JestWorker } from 'next/dist/compiled/jest-worker'
import { Transform } from 'stream' import { Transform } from 'stream'
type FarmOptions = ConstructorParameters<typeof JestWorker>[1] type FarmOptions = NonNullable<ConstructorParameters<typeof JestWorker>[1]>
const RESTARTED = Symbol('restarted') const RESTARTED = Symbol('restarted')
...@@ -19,7 +19,12 @@ export class Worker { ...@@ -19,7 +19,12 @@ export class Worker {
constructor( constructor(
workerPath: string, workerPath: string,
options: FarmOptions & { options: Omit<FarmOptions, 'forkOptions'> & {
forkOptions?:
| (Omit<NonNullable<FarmOptions['forkOptions']>, 'env'> & {
env?: Partial<NodeJS.ProcessEnv> | undefined
})
| undefined
timeout?: number timeout?: number
onActivity?: () => void onActivity?: () => void
onActivityAbort?: () => void onActivityAbort?: () => void
...@@ -48,8 +53,8 @@ export class Worker { ...@@ -48,8 +53,8 @@ export class Worker {
forkOptions: { forkOptions: {
...farmOptions.forkOptions, ...farmOptions.forkOptions,
env: { env: {
...((farmOptions.forkOptions?.env || {}) as any),
...process.env, ...process.env,
...((farmOptions.forkOptions?.env || {}) as any),
IS_NEXT_WORKER: 'true', IS_NEXT_WORKER: 'true',
} as any, } as any,
}, },
......
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