Merge branch 'main' into erikarowland/extract-get-files-from-trace-to-function

erikareads · erikareads · commit a89aa5409c69 · 2025-01-31T13:12:30.000-08:00
diff --git a/.changeset/khaki-cats-rush.md b/.changeset/khaki-cats-rush.md
@@ -0,0 +1,5 @@
+---
+"@vercel/remix-builder": patch
+---
+
+[remix] extract common handler logic into `determineHandler` function
diff --git a/packages/remix/src/build-vite.ts b/packages/remix/src/build-vite.ts
@@ -185,6 +185,37 @@ function determineFrameworkSettings(workPath: string) {
   return REMIX_FRAMEWORK_SETTINGS;
 }
 
+interface HandlerOptions {
+  rootDir: string;
+  serverBuildPath: string;
+  serverEntryPoint?: string;
+  serverSourcePromise: Promise<string>;
+  sourceSearchValue: string;
+}
+
+async function determineHandler({
+  rootDir,
+  serverBuildPath,
+  serverEntryPoint,
+  serverSourcePromise,
+  sourceSearchValue,
+}: HandlerOptions) {
+  let handler = relative(rootDir, serverBuildPath);
+  let handlerPath = join(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = basename(serverBuildPath, '.js');
+    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = join(rootDir, handler);
+
+    const serverSource = await serverSourcePromise;
+    await fs.writeFile(
+      handlerPath,
+      serverSource.replace(sourceSearchValue, `./${baseServerBuildPath}.js`)
+    );
+  }
+  return { handler, handlerPath };
+}
+
 export const build: BuildV2 = async ({
   entrypoint,
   workPath,
@@ -477,23 +508,13 @@ async function createRenderReactRouterFunction(
 ): Promise<EdgeFunction | NodejsLambda> {
   const isEdgeFunction = config.runtime === 'edge';
 
-  let handler = relative(rootDir, serverBuildPath);
-  let handlerPath = join(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = basename(serverBuildPath, '.js');
-    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = join(rootDir, handler);
-
-    // Copy the `server-react-router.mjs` file into the "build" directory
-    const reactRouterServerSrc = await reactRouterServerSrcPromise;
-    await fs.writeFile(
-      handlerPath,
-      reactRouterServerSrc.replace(
-        REACT_ROUTER_FRAMEWORK_SETTINGS.sourceSearchValue,
-        `./${baseServerBuildPath}.js`
-      )
-    );
-  }
+  const { handler, handlerPath } = await determineHandler({
+    rootDir,
+    serverBuildPath,
+    serverEntryPoint,
+    serverSourcePromise: reactRouterServerSrcPromise,
+    sourceSearchValue: REACT_ROUTER_FRAMEWORK_SETTINGS.sourceSearchValue,
+  });
 
   // Trace the handler with `@vercel/nft`
   let conditions: NodeFileTraceOptions['conditions'];
@@ -554,23 +575,13 @@ async function createRenderNodeFunction(
   frameworkVersion: string,
   config: /*TODO: ResolvedNodeRouteConfig*/ any
 ): Promise<NodejsLambda> {
-  let handler = relative(rootDir, serverBuildPath);
-  let handlerPath = join(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = basename(serverBuildPath, '.js');
-    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = join(rootDir, handler);
-
-    // Copy the `server-node.mjs` file into the "build" directory
-    const nodeServerSrc = await nodeServerSrcPromise;
-    await fs.writeFile(
-      handlerPath,
-      nodeServerSrc.replace(
-        REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
-        `./${baseServerBuildPath}.js`
-      )
-    );
-  }
+  const { handler, handlerPath } = await determineHandler({
+    rootDir,
+    serverBuildPath,
+    serverEntryPoint,
+    serverSourcePromise: nodeServerSrcPromise,
+    sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
+  });
 
   // Trace the handler with `@vercel/nft`
   const trace = await nodeFileTrace([handlerPath], {
@@ -607,23 +618,13 @@ async function createRenderEdgeFunction(
   frameworkVersion: string,
   config: /* TODO: ResolvedEdgeRouteConfig*/ any
 ): Promise<EdgeFunction> {
-  let handler = relative(rootDir, serverBuildPath);
-  let handlerPath = join(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = basename(serverBuildPath, '.js');
-    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = join(rootDir, handler);
-
-    // Copy the `server-edge.mjs` file into the "build" directory
-    const edgeServerSrc = await edgeServerSrcPromise;
-    await fs.writeFile(
-      handlerPath,
-      edgeServerSrc.replace(
-        REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
-        `./${baseServerBuildPath}.js`
-      )
-    );
-  }
+  const { handler, handlerPath } = await determineHandler({
+    rootDir,
+    serverBuildPath,
+    serverEntryPoint,
+    serverSourcePromise: edgeServerSrcPromise,
+    sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
+  });
 
   // Trace the handler with `@vercel/nft`
   const trace = await nodeFileTrace([handlerPath], {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@vercel/remix-builder": patch
 +---
++
 +[remix] extract common handler logic into `determineHandler` function