@vercel/remix-builder 2.0.11 → 2.0.12

package/dist/index.js

@@ -2835,7 +2835,6 @@ var import_nft = require("@vercel/nft");
 
 // src/utils.ts
 var import_semver = __toESM(require_semver2());
-var import_child_process = require("child_process");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_path_to_regexp = __toESM(require_dist());
@@ -2981,46 +2980,6 @@ async function chdirAndReadConfig(remixRunDevPath, dir, packageJsonPath) {
   }
   return remixConfig;
 }
-function addDependencies(cliType, names, opts = {}) {
-  (0, import_build_utils.debug)("Installing additional dependencies:");
-  for (const name of names) {
-    (0, import_build_utils.debug)(` - ${name}`);
-  }
-  const args = [];
-  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);
-}
 function resolveSemverMinMax(min, max, version2) {
   const floored = import_semver.default.intersects(version2, `>= ${min}`) ? version2 : min;
   return import_semver.default.intersects(floored, `<= ${max}`) ? floored : max;
@@ -3261,7 +3220,7 @@ var build = async ({
   );
   const { serverEntryPoint, appDirectory } = remixConfig;
   const remixRoutes = Object.values(remixConfig.routes);
-  const depsToAdd = [];
+  let depsModified = false;
   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(
@@ -3269,9 +3228,14 @@ var build = async ({
       REMIX_RUN_DEV_MAX_VERSION,
       remixVersion
     );
-    depsToAdd.push(
-      `@remix-run/dev@npm:@vercel/remix-run-dev@${remixDevForkVersion}`
-    );
+    if (pkg.devDependencies["@remix-run/dev"]) {
+      delete pkg.devDependencies["@remix-run/dev"];
+      pkg.devDependencies["@vercel/remix-run-dev"] = remixDevForkVersion;
+    } else {
+      delete pkg.dependencies["@remix-run/dev"];
+      pkg.dependencies["@vercel/remix-run-dev"] = remixDevForkVersion;
+    }
+    depsModified = true;
   }
   const userEntryServerFile = findEntry(appDirectory, "entry.server");
   if (!userEntryServerFile) {
@@ -3285,14 +3249,26 @@ var build = async ({
         REMIX_RUN_DEV_MAX_VERSION,
         remixVersion
       );
-      depsToAdd.push(`@vercel/remix@${vercelRemixVersion}`);
+      pkg.dependencies["@vercel/remix"] = vercelRemixVersion;
+      depsModified = true;
     }
   }
-  if (depsToAdd.length) {
-    await addDependencies(cliType, depsToAdd, {
-      ...spawnOpts,
-      cwd: entrypointFsDirname
-    });
+  if (depsModified) {
+    await import_fs2.promises.writeFile(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
+    const nonCiEnv = { ...spawnOpts.env };
+    delete nonCiEnv.CI;
+    delete nonCiEnv.VERCEL;
+    delete nonCiEnv.NOW_BUILDER;
+    await (0, import_build_utils3.runNpmInstall)(
+      entrypointFsDirname,
+      [],
+      {
+        ...spawnOpts,
+        env: nonCiEnv
+      },
+      void 0,
+      nodeVersion
+    );
   }
   const userEntryClientFile = findEntry(
     remixConfig.appDirectory,
@@ -3464,12 +3440,10 @@ module.exports = config;`;
     ),
     !isHydrogen2 ? ensureResolvable(entrypointFsDirname, repoRootPath, "@remix-run/node") : null
   ]);
-  const staticDir = (0, import_path3.join)(
-    remixConfig.assetsBuildDirectory,
-    ...remixConfig.publicPath.replace(/^\/|\/$/g, "").split("/").map((_) => "..")
-  );
-  const [staticFiles, ...functions] = await Promise.all([
+  const staticDir = (0, import_path3.join)(entrypointFsDirname, "public");
+  const [staticFiles, buildAssets, ...functions] = await Promise.all([
     (0, import_build_utils3.glob)("**", staticDir),
+    (0, import_build_utils3.glob)("**", remixConfig.assetsBuildDirectory),
     ...serverBundles.map((bundle) => {
       const firstRoute = remixConfig.routes[bundle.routes[0]];
       const config2 = resolvedConfigsMap.get(firstRoute) ?? {
@@ -3496,10 +3470,16 @@ module.exports = config;`;
       );
     })
   ]);
-  const output = staticFiles;
+  const transformedBuildAssets = (0, import_build_utils3.rename)(buildAssets, (name) => {
+    return import_path3.posix.join("./", remixConfig.publicPath, name);
+  });
+  const output = {
+    ...staticFiles,
+    ...transformedBuildAssets
+  };
   const routes = [
     {
-      src: "^/build/(.*)$",
+      src: `^/${remixConfig.publicPath.replace(/^\/|\/$/g, "")}/(.*)$`,
       headers: { "cache-control": "public, max-age=31536000, immutable" },
       continue: true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -23,7 +23,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.5",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"