@vercel/remix-builder 5.1.2 → 5.2.1

package/dist/index.js

@@ -3634,6 +3634,27 @@ function determineFrameworkSettings(workPath) {
   }
   return REMIX_FRAMEWORK_SETTINGS;
 }
+async function determineHandler({
+  rootDir,
+  serverBuildPath,
+  serverEntryPoint,
+  serverSourcePromise,
+  sourceSearchValue
+}) {
+  let handler = (0, import_path2.relative)(rootDir, serverBuildPath);
+  let handlerPath = (0, import_path2.join)(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = (0, import_path2.basename)(serverBuildPath, ".js");
+    handler = (0, import_path2.join)((0, import_path2.dirname)(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = (0, import_path2.join)(rootDir, handler);
+    const serverSource = await serverSourcePromise;
+    await import_fs2.promises.writeFile(
+      handlerPath,
+      serverSource.replace(sourceSearchValue, `./${baseServerBuildPath}.js`)
+    );
+  }
+  return { handler, handlerPath };
+}
 var build = async ({
   entrypoint,
   workPath,
@@ -3869,22 +3890,13 @@ var COMMON_NODE_FUNCTION_OPTIONS = {
 var COMMON_EDGE_FUNCTION_OPTIONS = { deploymentTarget: "v8-worker" };
 async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootDir, serverBuildPath, serverEntryPoint, frameworkVersion, config) {
   const isEdgeFunction = config.runtime === "edge";
-  const files = {};
-  let handler = (0, import_path2.relative)(rootDir, serverBuildPath);
-  let handlerPath = (0, import_path2.join)(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = (0, import_path2.basename)(serverBuildPath, ".js");
-    handler = (0, import_path2.join)((0, import_path2.dirname)(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = (0, import_path2.join)(rootDir, handler);
-    const reactRouterServerSrc = await reactRouterServerSrcPromise;
-    await import_fs2.promises.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
+  });
   let conditions;
   let readFile;
   if (isEdgeFunction) {
@@ -3898,9 +3910,7 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     readFile
   });
   logNftWarnings(trace.warnings, "react-router");
-  for (const file of trace.fileList) {
-    files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
-  }
+  const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   let fn;
   if (isEdgeFunction) {
     fn = new import_build_utils3.EdgeFunction({
@@ -3932,30 +3942,19 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
   return fn;
 }
 async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, serverBuildPath, serverEntryPoint, frameworkVersion, config) {
-  const files = {};
-  let handler = (0, import_path2.relative)(rootDir, serverBuildPath);
-  let handlerPath = (0, import_path2.join)(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = (0, import_path2.basename)(serverBuildPath, ".js");
-    handler = (0, import_path2.join)((0, import_path2.dirname)(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = (0, import_path2.join)(rootDir, handler);
-    const nodeServerSrc = await nodeServerSrcPromise;
-    await import_fs2.promises.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
+  });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
     processCwd: entrypointDir
   });
   logNftWarnings(trace.warnings, "@remix-run/node");
-  for (const file of trace.fileList) {
-    files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
-  }
+  const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.NodejsLambda({
     ...COMMON_NODE_FUNCTION_OPTIONS,
     files,
@@ -3972,22 +3971,13 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
   return fn;
 }
 async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath, serverEntryPoint, frameworkVersion, config) {
-  const files = {};
-  let handler = (0, import_path2.relative)(rootDir, serverBuildPath);
-  let handlerPath = (0, import_path2.join)(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = (0, import_path2.basename)(serverBuildPath, ".js");
-    handler = (0, import_path2.join)((0, import_path2.dirname)(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = (0, import_path2.join)(rootDir, handler);
-    const edgeServerSrc = await edgeServerSrcPromise;
-    await import_fs2.promises.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
+  });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
     processCwd: entrypointDir,
@@ -3995,9 +3985,7 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     readFile: edgeReadFile
   });
   logNftWarnings(trace.warnings, "@remix-run/server-runtime");
-  for (const file of trace.fileList) {
-    files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
-  }
+  const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.EdgeFunction({
     ...COMMON_EDGE_FUNCTION_OPTIONS,
     files,
@@ -4010,6 +3998,16 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
   });
   return fn;
 }
+async function getFilesFromTrace({
+  fileList,
+  rootDir
+}) {
+  const files = {};
+  for (const file of fileList) {
+    files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
+  }
+  return files;
+}
 
 // src/build-legacy.ts
 var import_ts_morph2 = require("ts-morph");
@@ -4713,8 +4711,8 @@ var prepareCache = async ({
       root
     );
   }
-  const nodeModulesFiles = await (0, import_build_utils5.glob)("**/node_modules/**", root);
-  return { ...nodeModulesFiles, ...cacheDirFiles };
+  const defaultCacheFiles = await (0, import_build_utils5.glob)(import_build_utils5.defaultCachePathGlob, root);
+  return { ...defaultCacheFiles, ...cacheDirFiles };
 };
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.1.2",
+  "version": "5.2.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -24,7 +24,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "9.1.1",
+    "@vercel/build-utils": "9.2.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",