@vercel/remix-builder 2.0.12 → 2.0.14

package/dist/index.js

@@ -3170,13 +3170,14 @@ var build = async ({
     config,
     meta
   );
-  const { cliType, packageJsonPath, lockfileVersion } = await (0, import_build_utils3.scanParentDirs)(
-    entrypointFsDirname
-  );
+  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } = await (0, import_build_utils3.scanParentDirs)(entrypointFsDirname);
   if (!packageJsonPath) {
     throw new Error("Failed to locate `package.json` file in your project");
   }
-  const pkgRaw = await import_fs2.promises.readFile(packageJsonPath, "utf8");
+  const [lockfileRaw, pkgRaw] = await Promise.all([
+    lockfilePath ? import_fs2.promises.readFile(lockfilePath) : null,
+    import_fs2.promises.readFile(packageJsonPath, "utf8")
+  ]);
   const pkg = JSON.parse(pkgRaw);
   const spawnOpts = (0, import_build_utils3.getSpawnOptions)(meta, nodeVersion);
   if (!spawnOpts.env) {
@@ -3418,17 +3419,23 @@ module.exports = config;`;
     const cleanupOps = [];
     if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
       cleanupOps.push(
-        import_fs2.promises.rename(renamedRemixConfigPath, remixConfigPath).then(
-          () => (0, import_build_utils3.debug)(`Restored original "${(0, import_path3.basename)(remixConfigPath)}" file`)
-        )
+        import_fs2.promises.rename(renamedRemixConfigPath, remixConfigPath).then(() => (0, import_build_utils3.debug)(`Restored original "${remixConfigPath}" file`))
       );
     }
     if (serverEntryPointAbs && originalServerEntryPoint) {
       cleanupOps.push(
-        import_fs2.promises.writeFile(serverEntryPointAbs, originalServerEntryPoint).then(
-          () => (0, import_build_utils3.debug)(`Restored original "${(0, import_path3.basename)(serverEntryPointAbs)}" file`)
-        )
+        import_fs2.promises.writeFile(serverEntryPointAbs, originalServerEntryPoint).then(() => (0, import_build_utils3.debug)(`Restored original "${serverEntryPointAbs}" file`))
+      );
+    }
+    if (depsModified) {
+      cleanupOps.push(
+        import_fs2.promises.writeFile(packageJsonPath, pkgRaw).then(() => (0, import_build_utils3.debug)(`Restored original "${packageJsonPath}" file`))
       );
+      if (lockfilePath && lockfileRaw) {
+        cleanupOps.push(
+          import_fs2.promises.writeFile(lockfilePath, lockfileRaw).then(() => (0, import_build_utils3.debug)(`Restored original "${lockfilePath}" file`))
+        );
+      }
     }
     await Promise.all(cleanupOps);
   }
@@ -3696,11 +3703,28 @@ var import_path4 = require("path");
 var prepareCache = async ({
   entrypoint,
   repoRootPath,
-  workPath
+  workPath,
+  config
 }) => {
   const root = repoRootPath || workPath;
   const mountpoint = (0, import_path4.dirname)(entrypoint);
   const entrypointFsDirname = (0, import_path4.join)(workPath, mountpoint);
+  const nodeVersion = await (0, import_build_utils4.getNodeVersion)(
+    entrypointFsDirname,
+    void 0,
+    config
+  );
+  const spawnOpts = (0, import_build_utils4.getSpawnOptions)({}, nodeVersion);
+  await (0, import_build_utils4.runNpmInstall)(
+    entrypointFsDirname,
+    [],
+    {
+      ...spawnOpts,
+      stdio: "ignore"
+    },
+    void 0,
+    nodeVersion
+  );
   const packageJsonPath = (0, import_path4.join)(entrypointFsDirname, "package.json");
   const remixRunDevPath = (0, import_path4.dirname)(
     require_.resolve("@remix-run/dev/package.json", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.0.12",
+  "version": "2.0.14",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -19,11 +19,11 @@
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.2.0",
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.3.1",
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.2.5",
+    "@vercel/build-utils": "7.3.0",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"