betterstart-cli 0.0.48 → 0.0.50

package/dist/cli.js

@@ -21840,7 +21840,7 @@ ${validationErrors.map((error) => `  - ${error}`).join("\n")}`
 }
 
 // adapters/next/commands/init.ts
-import { execFileSync as execFileSync5, spawn as spawn4 } from "child_process";
+import { execFileSync as execFileSync5, spawn as spawn5 } from "child_process";
 import fs39 from "fs";
 import path50 from "path";
 import * as p18 from "@clack/prompts";
@@ -24620,6 +24620,7 @@ function readBlobTokenFromDotenv(filePath) {
 }
 
 // adapters/next/init/vercel/deploy.ts
+import { spawn as spawn4 } from "child_process";
 import fs36 from "fs";
 import path47 from "path";
 import { stripVTControlCharacters as stripVTControlCharacters3 } from "util";
@@ -24672,12 +24673,14 @@ async function syncVercelProductionEnv(runner, cwd, env) {
 var LOCAL_PROTOCOL_PATTERN = /^(workspace|link|file|portal):/;
 var ADMIN_CONFIG_IMPORT_PATTERN = /^import\s+\{[^}]*\bdefineConfig\b[^}]*\}\s+from\s+['"]betterstart-cli['"];?[^\S\n]*$/m;
 var ADMIN_CONFIG_IMPORT_SHIM = "const defineConfig = <T>(config: T): T => config";
-function guardProjectForDeploy(cwd) {
+async function guardProjectForDeploy(cwd, refreshLockfile = runPnpmLockfileOnly) {
   const restores = [];
-  const localSpecDeps = guardPackageJson(cwd, restores);
+  const { localSpecDeps, removedCliDep } = guardPackageJson(cwd, restores);
   guardAdminConfig(cwd, restores);
+  const lockfile = removedCliDep ? await guardPnpmLockfile(cwd, restores, refreshLockfile) : "not-needed";
   return {
     localSpecDeps,
+    lockfile,
     restore() {
       for (const restoreFile2 of restores) {
         try {
@@ -24691,14 +24694,14 @@ function guardProjectForDeploy(cwd) {
 function guardPackageJson(cwd, restores) {
   const packageJsonPath = path47.join(cwd, "package.json");
   if (!fs36.existsSync(packageJsonPath)) {
-    return [];
+    return { localSpecDeps: [], removedCliDep: false };
   }
   const original = fs36.readFileSync(packageJsonPath, "utf-8");
   let parsed;
   try {
     parsed = JSON.parse(original);
   } catch {
-    return [];
+    return { localSpecDeps: [], removedCliDep: false };
   }
   const localSpecDeps = [];
   let removed = false;
@@ -24721,7 +24724,34 @@ function guardPackageJson(cwd, restores) {
 `, "utf-8");
     restores.push(() => fs36.writeFileSync(packageJsonPath, original, "utf-8"));
   }
-  return localSpecDeps;
+  return { localSpecDeps, removedCliDep: removed };
+}
+async function guardPnpmLockfile(cwd, restores, refreshLockfile) {
+  const lockfilePath = path47.join(cwd, "pnpm-lock.yaml");
+  if (!fs36.existsSync(lockfilePath)) {
+    return "not-needed";
+  }
+  const original = fs36.readFileSync(lockfilePath, "utf-8");
+  restores.push(() => fs36.writeFileSync(lockfilePath, original, "utf-8"));
+  return await refreshLockfile(cwd) ? "updated" : "failed";
+}
+var LOCKFILE_REFRESH_TIMEOUT_MS = 12e4;
+function runPnpmLockfileOnly(cwd) {
+  return new Promise((resolve) => {
+    const child = spawn4("pnpm", ["install", "--lockfile-only"], { cwd, stdio: "ignore" });
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      resolve(false);
+    }, LOCKFILE_REFRESH_TIMEOUT_MS);
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      resolve(code === 0);
+    });
+    child.on("error", () => {
+      clearTimeout(timer);
+      resolve(false);
+    });
+  });
 }
 function guardAdminConfig(cwd, restores) {
   const adminConfigPath = path47.join(cwd, "admin.config.ts");
@@ -24992,7 +25022,15 @@ async function runVercelDeployFlow(options) {
       );
     }
     ensureVercelJsonFramework(options.cwd);
-    const packageGuard = guardProjectForDeploy(options.cwd);
+    const guardSpinner = spinner2();
+    guardSpinner.start("Preparing the project for deploy");
+    const packageGuard = await guardProjectForDeploy(options.cwd);
+    guardSpinner.clear();
+    if (packageGuard.lockfile === "failed") {
+      p17.log.warn(
+        "Could not refresh pnpm-lock.yaml after removing betterstart-cli \u2014 the remote install may fail."
+      );
+    }
     for (const dep of packageGuard.localSpecDeps) {
       p17.log.warn(
         `Dependency ${pc6.cyan(dep)} uses a local spec that cannot install on Vercel \u2014 the remote build may fail.`
@@ -26401,7 +26439,7 @@ function runSeedScript(cwd, adminDir, authBasePath, envOverrides) {
   };
   return new Promise((resolve) => {
     const tsxBin = path50.join(cwd, "node_modules", ".bin", "tsx");
-    const child = spawn4(tsxBin, [seedPath], {
+    const child = spawn5(tsxBin, [seedPath], {
       cwd,
       stdio: "pipe",
       env: {
@@ -26505,7 +26543,7 @@ ${stderr}`;
 }
 function runQuietCommand(bin, args, options) {
   return new Promise((resolve) => {
-    const child = spawn4(bin, args, {
+    const child = spawn5(bin, args, {
       cwd: options.cwd,
       stdio: "pipe",
       env: {
@@ -26645,7 +26683,7 @@ function pipeManagedDevServerStream(stream, target, state) {
 function startManagedDevServer(cwd, devCmd, adminLoginUrl, adminCredentials) {
   return new Promise((resolve, reject) => {
     const [bin, ...args] = devCmd.split(" ");
-    const child = spawn4(bin, args, {
+    const child = spawn5(bin, args, {
       cwd,
       stdio: ["inherit", "pipe", "pipe"]
     });