@vercel/remix-builder 5.2.2 → 5.2.3

package/dist/index.js

@@ -3591,6 +3591,15 @@ var REMIX_FRAMEWORK_SETTINGS = {
   buildResultFilePath: ".vercel/remix-build-result.json",
   slug: "remix",
   sourceSearchValue: "@remix-run/dev/server-build",
+  edge: {
+    serverSourcePromise: edgeServerSrcPromise,
+    traceWarningTag: "@remix-run/server-runtime"
+  },
+  node: {
+    serverSourcePromise: nodeServerSrcPromise,
+    traceWarningTag: "@remix-run/node",
+    options: {}
+  },
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3627,6 +3636,16 @@ var REACT_ROUTER_FRAMEWORK_SETTINGS = {
   buildResultFilePath: ".vercel/react-router-build-result.json",
   slug: "react-router",
   sourceSearchValue: "ENTRYPOINT_PLACEHOLDER",
+  // React Router uses the same server source for both node and edge
+  edge: {
+    serverSourcePromise: reactRouterServerSrcPromise,
+    traceWarningTag: "react-router"
+  },
+  node: {
+    serverSourcePromise: reactRouterServerSrcPromise,
+    traceWarningTag: "react-router",
+    options: { useWebApi: true }
+  },
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3919,7 +3938,11 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: reactRouterServerSrcPromise,
+    serverSourcePromise: (
+      // React Router has the same promise for both edge and node
+      // so this chooses edge out of convenience
+      REACT_ROUTER_FRAMEWORK_SETTINGS.edge.serverSourcePromise
+    ),
     sourceSearchValue: REACT_ROUTER_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   let conditions;
@@ -3934,7 +3957,10 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     conditions,
     readFile
   });
-  logNftWarnings(trace.warnings, "react-router");
+  logNftWarnings(
+    trace.warnings,
+    REACT_ROUTER_FRAMEWORK_SETTINGS.edge.traceWarningTag
+  );
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   let fn;
   if (isEdgeFunction) {
@@ -3954,7 +3980,7 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
       files,
       handler,
       runtime: nodeVersion.runtime,
-      useWebApi: true,
+      useWebApi: REACT_ROUTER_FRAMEWORK_SETTINGS.node.options.useWebApi,
       regions: config.regions,
       memory: config.memory,
       maxDuration: config.maxDuration,
@@ -3971,14 +3997,14 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: nodeServerSrcPromise,
+    serverSourcePromise: REMIX_FRAMEWORK_SETTINGS.node.serverSourcePromise,
     sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
     processCwd: entrypointDir
   });
-  logNftWarnings(trace.warnings, "@remix-run/node");
+  logNftWarnings(trace.warnings, REMIX_FRAMEWORK_SETTINGS.node.traceWarningTag);
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.NodejsLambda({
     ...COMMON_NODE_FUNCTION_OPTIONS,
@@ -3988,6 +4014,7 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     regions: config.regions,
     memory: config.memory,
     maxDuration: config.maxDuration,
+    useWebApi: REMIX_FRAMEWORK_SETTINGS.node.options.useWebApi,
     framework: {
       slug: REMIX_FRAMEWORK_SETTINGS.slug,
       version: frameworkVersion
@@ -4000,7 +4027,7 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: edgeServerSrcPromise,
+    serverSourcePromise: REMIX_FRAMEWORK_SETTINGS.edge.serverSourcePromise,
     sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
@@ -4009,7 +4036,7 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     conditions: EDGE_TRACE_CONDITIONS,
     readFile: edgeReadFile
   });
-  logNftWarnings(trace.warnings, "@remix-run/server-runtime");
+  logNftWarnings(trace.warnings, REMIX_FRAMEWORK_SETTINGS.edge.traceWarningTag);
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.EdgeFunction({
     ...COMMON_EDGE_FUNCTION_OPTIONS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "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.2.0",
+    "@vercel/build-utils": "9.2.1",
     "@vercel-internals/path-to-regexp": "1.0.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",