Backport v14: Static worker fixes (#71564 & #74154) (#74284)

Backports: - #71564 - #74154 --------- Co-authored-by: JJ Kasper <[email protected]>
vercel · Dec 24, 2024 · 6c06474 · 6c06474
1 parent a7f2879
commit 6c06474
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/packages/next/src/build/type-check.ts b/packages/next/src/build/type-check.ts
@@ -4,7 +4,7 @@ import type { Span } from '../trace'
 
 import path from 'path'
 import * as Log from './output/log'
-import { Worker as JestWorker } from 'next/dist/compiled/jest-worker'
+import { Worker } from '../lib/worker'
 import { verifyAndLint } from '../lib/verifyAndLint'
 import createSpinner from './spinner'
 import { eventTypeCheckCompleted } from '../telemetry/events'
@@ -30,20 +30,18 @@ function verifyTypeScriptSetup(
   hasAppDir: boolean,
   hasPagesDir: boolean
 ) {
-  const typeCheckWorker = new JestWorker(
+  const typeCheckWorker = new Worker(
     require.resolve('../lib/verify-typescript-setup'),
     {
+      exposedMethods: ['verifyTypeScriptSetup'],
       numWorkers: 1,
       enableWorkerThreads,
       maxRetries: 0,
     }
-  ) as JestWorker & {
+  ) as Worker & {
     verifyTypeScriptSetup: typeof import('../lib/verify-typescript-setup').verifyTypeScriptSetup
   }
 
-  typeCheckWorker.getStdout().pipe(process.stdout)
-  typeCheckWorker.getStderr().pipe(process.stderr)
-
   return typeCheckWorker
     .verifyTypeScriptSetup({
       dir,

diff --git a/packages/next/src/lib/verifyAndLint.ts b/packages/next/src/lib/verifyAndLint.ts
@@ -1,5 +1,5 @@
 import { red } from './picocolors'
-import { Worker } from 'next/dist/compiled/jest-worker'
+import { Worker } from './worker'
 import { existsSync } from 'fs'
 import { join } from 'path'
 import { ESLINT_DEFAULT_DIRS } from './constants'
@@ -15,18 +15,22 @@ export async function verifyAndLint(
   enableWorkerThreads: boolean | undefined,
   telemetry: Telemetry
 ): Promise<void> {
+  let lintWorkers:
+    | (Worker & {
+        runLintCheck: typeof import('./eslint/runLintCheck').runLintCheck
+      })
+    | undefined
+
   try {
-    const lintWorkers = new Worker(require.resolve('./eslint/runLintCheck'), {
+    lintWorkers = new Worker(require.resolve('./eslint/runLintCheck'), {
+      exposedMethods: ['runLintCheck'],
       numWorkers: 1,
       enableWorkerThreads,
       maxRetries: 0,
     }) as Worker & {
       runLintCheck: typeof import('./eslint/runLintCheck').runLintCheck
     }
 
-    lintWorkers.getStdout().pipe(process.stdout)
-    lintWorkers.getStderr().pipe(process.stderr)
-
     const lintDirs = (configLintDirs ?? ESLINT_DEFAULT_DIRS).reduce(
       (res: string[], d: string) => {
         const currDir = join(dir, d)
@@ -37,7 +41,7 @@ export async function verifyAndLint(
       []
     )
 
-    const lintResults = await lintWorkers.runLintCheck(dir, lintDirs, {
+    const lintResults = await lintWorkers?.runLintCheck(dir, lintDirs, {
       lintDuringBuild: true,
       eslintOptions: {
         cacheLocation,
@@ -63,8 +67,6 @@ export async function verifyAndLint(
     if (lintOutput) {
       console.log(lintOutput)
     }
-
-    lintWorkers.end()
   } catch (err) {
     if (isError(err)) {
       if (err.type === 'CompileError' || err instanceof CompileError) {
@@ -77,5 +79,9 @@ export async function verifyAndLint(
       }
     }
     throw err
+  } finally {
+    try {
+      lintWorkers?.end()
+    } catch {}
   }
 }
diff --git a/packages/next/src/lib/worker.ts b/packages/next/src/lib/worker.ts
@@ -35,6 +35,11 @@ export class Worker {
 
     this._worker = undefined
 
+    // ensure we end workers if they weren't before exit
+    process.on('exit', () => {
+      this.close()
+    })
+
     const createWorker = () => {
       this._worker = new JestWorker(workerPath, {
         ...farmOptions,