move util

vercel · May 23, 2023 · 28409af · 28409af
1 parent 1c70aa6
commit 28409af
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/packages/next/src/server/lib/render-server.ts b/packages/next/src/server/lib/render-server.ts
@@ -14,7 +14,7 @@ import {
   deleteAppClientCache as _deleteAppClientCache,
 } from '../../build/webpack/plugins/nextjs-require-cache-hot-reloader'
 import { clearModuleContext as _clearModuleContext } from '../web/sandbox/context'
-import { getFreePort } from './server-ipc'
+import { getFreePort } from '../lib/worker-utils'
 export const WORKER_SELF_EXIT_CODE = 77
 
 const MAXIMUM_HEAP_SIZE_ALLOWED =

diff --git a/packages/next/src/server/lib/server-ipc/index.ts b/packages/next/src/server/lib/server-ipc/index.ts
@@ -1,11 +1,10 @@
 import type NextServer from '../../next-server'
 
-import http from 'http'
 import { getNodeOptionsWithoutInspect } from '../utils'
 import { deserializeErr, errorToJSON } from '../../render'
 import crypto from 'crypto'
 import isError from '../../../lib/is-error'
-import { genRenderExecArgv } from '../worker-utils'
+import { genRenderExecArgv, getFreePort } from '../worker-utils'
 
 // we can't use process.send as jest-worker relies on
 // it already and can cause unexpected message errors
@@ -80,22 +79,6 @@ export async function createIpcServer(
   }
 }
 
-export const getFreePort = async (): Promise<number> => {
-  return new Promise((resolve, reject) => {
-    const server = http.createServer(() => {})
-    server.listen(0, () => {
-      const address = server.address()
-      server.close()
-
-      if (address && typeof address === 'object') {
-        resolve(address.port)
-      } else {
-        reject(new Error('invalid address from server: ' + address?.toString()))
-      }
-    })
-  })
-}
-
 export const createWorker = async (
   ipcPort: number,
   ipcValidationKey: string,

diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts
@@ -6,7 +6,7 @@ import type { ChildProcess } from 'child_process'
 import { normalizeRepeatedSlashes } from '../../shared/lib/utils'
 import { initialEnv } from '@next/env'
 import { genExecArgv, getNodeOptionsWithoutInspect } from './utils'
-import { getFreePort } from './server-ipc'
+import { getFreePort } from './worker-utils'
 
 export interface StartServerOptions {
   dir: string

diff --git a/packages/next/src/server/lib/worker-utils.ts b/packages/next/src/server/lib/worker-utils.ts
@@ -1,4 +1,21 @@
 import * as Log from '../../build/output/log'
+import http from 'http'
+
+export const getFreePort = async (): Promise<number> => {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer(() => {})
+    server.listen(0, () => {
+      const address = server.address()
+      server.close()
+
+      if (address && typeof address === 'object') {
+        resolve(address.port)
+      } else {
+        reject(new Error('invalid address from server: ' + address?.toString()))
+      }
+    })
+  })
+}
 
 export const genRenderExecArgv = (type: 'pages' | 'app') => {
   const isDebugging =