@vercel/remix-builder 2.1.6 → 2.1.8

package/defaults/server-node.mjs

@@ -4,7 +4,11 @@ import {
   installGlobals,
 } from '@remix-run/node';
 
-installGlobals();
+installGlobals({
+  nativeFetch:
+    parseInt(process.versions.node, 10) >= 20 &&
+    process.env.VERCEL_REMIX_NATIVE_FETCH === '1',
+});
 
 import * as build from '@remix-run/dev/server-build';
 
@@ -13,11 +17,11 @@ const handleRequest = createRemixRequestHandler(
   process.env.NODE_ENV
 );
 
-function createRemixHeaders(requestHeaders) {
+function toWebHeaders(nodeHeaders) {
   const headers = new Headers();
 
-  for (const key in requestHeaders) {
-    const header = requestHeaders[key];
+  for (const key in nodeHeaders) {
+    const header = nodeHeaders[key];
     // set-cookie is an array (maybe others)
     if (Array.isArray(header)) {
       for (const value of header) {
@@ -31,8 +35,12 @@ function createRemixHeaders(requestHeaders) {
   return headers;
 }
 
+function toNodeHeaders(webHeaders) {
+  return webHeaders.raw?.() || [...webHeaders].flat();
+}
+
 function createRemixRequest(req, res) {
-  const host = req.headers['x-forwarded-host'] || req.headers['host'];
+  const host = req.headers['x-forwarded-host'] || req.headers.host;
   const protocol = req.headers['x-forwarded-proto'] || 'https';
   const url = new URL(req.url, `${protocol}://${host}`);
 
@@ -42,7 +50,7 @@ function createRemixRequest(req, res) {
 
   const init = {
     method: req.method,
-    headers: createRemixHeaders(req.headers),
+    headers: toWebHeaders(req.headers),
     signal: controller.signal,
   };
 
@@ -55,11 +63,10 @@ function createRemixRequest(req, res) {
 
 async function sendRemixResponse(res, nodeResponse) {
   res.statusMessage = nodeResponse.statusText;
-  let multiValueHeaders = nodeResponse.headers.raw();
   res.writeHead(
     nodeResponse.status,
     nodeResponse.statusText,
-    multiValueHeaders
+    toNodeHeaders(nodeResponse.headers)
   );
 
   if (nodeResponse.body) {

package/dist/index.js

@@ -3164,6 +3164,7 @@ var build = async ({
   spawnOpts.env = (0, import_build_utils3.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts.env
   });
@@ -3557,7 +3558,13 @@ var build2 = async ({
     config,
     meta
   );
-  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } = await (0, import_build_utils4.scanParentDirs)(entrypointFsDirname);
+  const {
+    cliType,
+    packageJsonPath,
+    packageJson,
+    lockfileVersion,
+    lockfilePath
+  } = await (0, import_build_utils4.scanParentDirs)(entrypointFsDirname, true);
   if (!packageJsonPath) {
     throw new Error("Failed to locate `package.json` file in your project");
   }
@@ -3573,6 +3580,7 @@ var build2 = async ({
   spawnOpts.env = (0, import_build_utils4.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts.env
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@vercel/error-utils": "2.0.2",
-    "@vercel/nft": "0.27.0",
+    "@vercel/nft": "0.27.2",
     "@vercel/static-config": "3.0.0",
     "ts-morph": "12.0.0"
   },
@@ -25,16 +25,19 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "8.1.0",
+    "@vercel/build-utils": "8.2.2",
+    "glob": "10.3.16",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
-    "semver": "7.5.2"
+    "semver": "7.5.2",
+    "vitest": "1.3.1"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
-    "test-unit": "pnpm test test/unit.*test.*",
-    "test-e2e": "pnpm test test/integration-*.test.ts",
+    "vitest-run": "vitest",
+    "vitest-unit": "glob --absolute 'test/unit/**/*.test.ts'",
+    "vitest-e2e": "glob --absolute test/integration-*.test.ts",
     "type-check": "tsc --noEmit"
   }
 }