@vercel/remix-builder 2.0.4 → 2.0.6

package/defaults/server-edge.mjs

@@ -1,3 +1,3 @@
 import { createRequestHandler } from '@remix-run/server-runtime';
-import build from '@remix-run/dev/server-build';
-export default createRequestHandler(build);
+import * as build from '@remix-run/dev/server-build';
+export default createRequestHandler(build.default || build);

package/defaults/server-node.mjs

@@ -1,20 +1,20 @@
 import {
-  AbortController as NodeAbortController,
   createRequestHandler as createRemixRequestHandler,
-  Headers as NodeHeaders,
-  Request as NodeRequest,
   writeReadableStreamToWritable,
   installGlobals,
 } from '@remix-run/node';
 
 installGlobals();
 
-import build from '@remix-run/dev/server-build';
+import * as build from '@remix-run/dev/server-build';
 
-const handleRequest = createRemixRequestHandler(build, process.env.NODE_ENV);
+const handleRequest = createRemixRequestHandler(
+  build.default || build,
+  process.env.NODE_ENV
+);
 
 function createRemixHeaders(requestHeaders) {
-  const headers = new NodeHeaders();
+  const headers = new Headers();
 
   for (const key in requestHeaders) {
     const header = requestHeaders[key];
@@ -37,7 +37,7 @@ function createRemixRequest(req, res) {
   const url = new URL(req.url, `${protocol}://${host}`);
 
   // Abort action/loaders once we can no longer write a response
-  const controller = new NodeAbortController();
+  const controller = new AbortController();
   res.on('close', () => controller.abort());
 
   const init = {
@@ -50,7 +50,7 @@ function createRemixRequest(req, res) {
     init.body = req;
   }
 
-  return new NodeRequest(url.href, init);
+  return new Request(url.href, init);
 }
 
 async function sendRemixResponse(res, nodeResponse) {

package/dist/index.js

@@ -2987,25 +2987,36 @@ function addDependencies(cliType, names, opts = {}) {
     (0, import_build_utils.debug)(` - ${name}`);
   }
   const args = [];
-  if (cliType === "npm" || cliType === "pnpm") {
-    args.push("install");
-    if (opts.saveDev) {
-      args.push("--save-dev");
-    }
-  } else {
-    args.push("add");
-    if (opts.saveDev) {
-      args.push("--dev");
-    }
-    const yarnVersion = (0, import_child_process.execSync)("yarn -v", { encoding: "utf8" }).trim();
-    const isYarnV1 = import_semver.default.satisfies(yarnVersion, "1");
-    if (isYarnV1) {
-      args.push("--ignore-workspace-root-check");
-    }
-  }
-  if (cliType === "pnpm" && opts.cwd) {
-    if ((0, import_fs.existsSync)((0, import_path.join)(opts.cwd, "pnpm-workspace.yaml"))) {
-      args.push("--workspace-root");
+  switch (cliType) {
+    case "npm":
+    case "pnpm":
+      args.push("install");
+      if (opts.saveDev) {
+        args.push("--save-dev");
+      }
+      if (cliType === "pnpm" && opts.cwd) {
+        if ((0, import_fs.existsSync)((0, import_path.join)(opts.cwd, "pnpm-workspace.yaml"))) {
+          args.push("--workspace-root");
+        }
+      }
+      break;
+    case "bun":
+    case "yarn":
+      args.push("add");
+      if (opts.saveDev) {
+        args.push("--dev");
+      }
+      if (cliType === "yarn") {
+        const yarnVersion = (0, import_child_process.execSync)("yarn -v", { encoding: "utf8" }).trim();
+        const isYarnV1 = import_semver.default.satisfies(yarnVersion, "1");
+        if (isYarnV1) {
+          args.push("--ignore-workspace-root-check");
+        }
+      }
+      break;
+    default: {
+      const n = cliType;
+      throw new Error(`Unexpected package manager: ${n}`);
     }
   }
   return (0, import_build_utils.spawnAsync)(cliType, args.concat(names), opts);
@@ -3231,7 +3242,9 @@ var build = async ({
   } else {
     await (0, import_build_utils3.runNpmInstall)(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
   }
-  const isHydrogen2 = pkg.dependencies?.["@shopify/remix-oxygen"] || pkg.devDependencies?.["@shopify/remix-oxygen"];
+  const isHydrogen2 = Boolean(
+    pkg.dependencies?.["@shopify/remix-oxygen"] || pkg.devDependencies?.["@shopify/remix-oxygen"]
+  );
   const remixRunDevPath = await ensureResolvable(
     entrypointFsDirname,
     repoRootPath,
@@ -3249,7 +3262,8 @@ var build = async ({
   const { serverEntryPoint, appDirectory } = remixConfig;
   const remixRoutes = Object.values(remixConfig.routes);
   const depsToAdd = [];
-  if (!isHydrogen2 && remixRunDevPkg.name !== "@vercel/remix-run-dev") {
+  const remixRunDevPkgVersion = pkg.dependencies?.["@remix-run/dev"] || pkg.devDependencies?.["@remix-run/dev"];
+  if (!isHydrogen2 && remixRunDevPkg.name !== "@vercel/remix-run-dev" && !remixRunDevPkgVersion?.startsWith("https:")) {
     const remixDevForkVersion = resolveSemverMinMax(
       REMIX_RUN_DEV_MIN_VERSION,
       REMIX_RUN_DEV_MAX_VERSION,
@@ -3356,7 +3370,7 @@ var build = async ({
           renamedRemixConfigPath
         )}';
 config.serverBuildTarget = undefined;
-config.serverModuleFormat = 'cjs';
+config.serverModuleFormat = '${pkg.type === "module" ? "esm" : "cjs"}';
 config.serverPlatform = 'node';
 config.serverBuildPath = undefined;
 config.serverBundles = ${JSON.stringify(serverBundles)};
@@ -3366,7 +3380,7 @@ export default config;`;
           renamedRemixConfigPath
         )}');
 config.serverBuildTarget = undefined;
-config.serverModuleFormat = 'cjs';
+config.serverModuleFormat = '${pkg.type === "module" ? "esm" : "cjs"}';
 config.serverPlatform = 'node';
 config.serverBuildPath = undefined;
 config.serverBundles = ${JSON.stringify(serverBundles)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -19,7 +19,7 @@
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@1.19.3",
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.0.0",
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",