@vercel/remix-builder 5.1.1 → 5.2.0

package/dist/index.js

@@ -3564,6 +3564,8 @@ var REMIX_FRAMEWORK_SETTINGS = {
   primaryPackageName: "@remix-run/dev",
   buildCommand: "remix build",
   buildResultFilePath: ".vercel/remix-build-result.json",
+  slug: "remix",
+  sourceSearchValue: "@remix-run/dev/server-build",
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3598,6 +3600,8 @@ var REACT_ROUTER_FRAMEWORK_SETTINGS = {
   primaryPackageName: "react-router",
   buildCommand: "react-router build",
   buildResultFilePath: ".vercel/react-router-build-result.json",
+  slug: "react-router",
+  sourceSearchValue: "ENTRYPOINT_PLACEHOLDER",
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3826,6 +3830,43 @@ var build = async ({
   });
   return { routes, output, framework: { version: frameworkVersion } };
 };
+async function edgeReadFile(fsPath) {
+  let source;
+  try {
+    source = await import_fs2.promises.readFile(fsPath);
+  } catch (err) {
+    if (err.code === "ENOENT" || err.code === "EISDIR") {
+      return null;
+    }
+    throw err;
+  }
+  if ((0, import_path2.basename)(fsPath) === "package.json") {
+    const pkgJson = JSON.parse(source.toString());
+    for (const prop of ["browser", "module"]) {
+      const val = pkgJson[prop];
+      if (typeof val === "string") {
+        pkgJson.main = val;
+        source = JSON.stringify(pkgJson);
+        break;
+      }
+    }
+  }
+  return source;
+}
+var EDGE_TRACE_CONDITIONS = [
+  "edge-light",
+  "browser",
+  "module",
+  "import",
+  "require"
+];
+var COMMON_NODE_FUNCTION_OPTIONS = {
+  shouldAddHelpers: false,
+  shouldAddSourcemapSupport: false,
+  operationType: "SSR",
+  supportsResponseStreaming: true
+};
+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 = {};
@@ -3839,7 +3880,7 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     await import_fs2.promises.writeFile(
       handlerPath,
       reactRouterServerSrc.replace(
-        "ENTRYPOINT_PLACEHOLDER",
+        REACT_ROUTER_FRAMEWORK_SETTINGS.sourceSearchValue,
         `./${baseServerBuildPath}.js`
       )
     );
@@ -3847,30 +3888,8 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
   let conditions;
   let readFile;
   if (isEdgeFunction) {
-    conditions = ["edge-light", "browser", "module", "import", "require"];
-    readFile = async (fsPath) => {
-      let source;
-      try {
-        source = await import_fs2.promises.readFile(fsPath);
-      } catch (err) {
-        if (err.code === "ENOENT" || err.code === "EISDIR") {
-          return null;
-        }
-        throw err;
-      }
-      if ((0, import_path2.basename)(fsPath) === "package.json") {
-        const pkgJson = JSON.parse(source.toString());
-        for (const prop of ["browser", "module"]) {
-          const val = pkgJson[prop];
-          if (typeof val === "string") {
-            pkgJson.main = val;
-            source = JSON.stringify(pkgJson);
-            break;
-          }
-        }
-      }
-      return source;
-    };
+    conditions = EDGE_TRACE_CONDITIONS;
+    readFile = edgeReadFile;
   }
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
@@ -3885,30 +3904,27 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
   let fn;
   if (isEdgeFunction) {
     fn = new import_build_utils3.EdgeFunction({
+      ...COMMON_EDGE_FUNCTION_OPTIONS,
       files,
-      deploymentTarget: "v8-worker",
       entrypoint: handler,
       regions: config.regions,
       framework: {
-        slug: "react-router",
+        slug: REACT_ROUTER_FRAMEWORK_SETTINGS.slug,
         version: frameworkVersion
       }
     });
   } else {
     fn = new import_build_utils3.NodejsLambda({
+      ...COMMON_NODE_FUNCTION_OPTIONS,
       files,
       handler,
       runtime: nodeVersion.runtime,
-      shouldAddHelpers: false,
-      shouldAddSourcemapSupport: false,
-      operationType: "SSR",
-      supportsResponseStreaming: true,
       useWebApi: true,
       regions: config.regions,
       memory: config.memory,
       maxDuration: config.maxDuration,
       framework: {
-        slug: "react-router",
+        slug: REACT_ROUTER_FRAMEWORK_SETTINGS.slug,
         version: frameworkVersion
       }
     });
@@ -3927,7 +3943,7 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     await import_fs2.promises.writeFile(
       handlerPath,
       nodeServerSrc.replace(
-        "@remix-run/dev/server-build",
+        REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
         `./${baseServerBuildPath}.js`
       )
     );
@@ -3941,18 +3957,15 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
   }
   const fn = new import_build_utils3.NodejsLambda({
+    ...COMMON_NODE_FUNCTION_OPTIONS,
     files,
     handler,
     runtime: nodeVersion.runtime,
-    shouldAddHelpers: false,
-    shouldAddSourcemapSupport: false,
-    operationType: "SSR",
-    supportsResponseStreaming: true,
     regions: config.regions,
     memory: config.memory,
     maxDuration: config.maxDuration,
     framework: {
-      slug: "remix",
+      slug: REMIX_FRAMEWORK_SETTINGS.slug,
       version: frameworkVersion
     }
   });
@@ -3970,55 +3983,28 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     await import_fs2.promises.writeFile(
       handlerPath,
       edgeServerSrc.replace(
-        "@remix-run/dev/server-build",
+        REMIX_FRAMEWORK_SETTINGS.sourceSearchValue,
         `./${baseServerBuildPath}.js`
       )
     );
   }
-  let remixRunVercelPkgJson;
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
     processCwd: entrypointDir,
-    conditions: ["edge-light", "browser", "module", "import", "require"],
-    async readFile(fsPath) {
-      let source;
-      try {
-        source = await import_fs2.promises.readFile(fsPath);
-      } catch (err) {
-        if (err.code === "ENOENT" || err.code === "EISDIR") {
-          return null;
-        }
-        throw err;
-      }
-      if ((0, import_path2.basename)(fsPath) === "package.json") {
-        const pkgJson = JSON.parse(source.toString());
-        for (const prop of ["browser", "module"]) {
-          const val = pkgJson[prop];
-          if (typeof val === "string") {
-            pkgJson.main = val;
-            source = JSON.stringify(pkgJson);
-            break;
-          }
-        }
-      }
-      return source;
-    }
+    conditions: EDGE_TRACE_CONDITIONS,
+    readFile: edgeReadFile
   });
   logNftWarnings(trace.warnings, "@remix-run/server-runtime");
   for (const file of trace.fileList) {
-    if (remixRunVercelPkgJson && file.endsWith(`@remix-run${import_path2.sep}vercel${import_path2.sep}package.json`)) {
-      files[file] = new import_build_utils3.FileBlob({ data: remixRunVercelPkgJson });
-    } else {
-      files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
-    }
+    files[file] = await import_build_utils3.FileFsRef.fromFsPath({ fsPath: (0, import_path2.join)(rootDir, file) });
   }
   const fn = new import_build_utils3.EdgeFunction({
+    ...COMMON_EDGE_FUNCTION_OPTIONS,
     files,
-    deploymentTarget: "v8-worker",
     entrypoint: handler,
     regions: config.regions,
     framework: {
-      slug: "remix",
+      slug: REMIX_FRAMEWORK_SETTINGS.slug,
       version: frameworkVersion
     }
   });
@@ -4727,8 +4713,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.1",
+  "version": "5.2.0",
   "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.0",
+    "@vercel/build-utils": "9.2.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",