fix(dev): address review feedback

Author: Salnika

packages/prompts/package.json

@@ -35,7 +35,6 @@
     "fast-string-width": "^1.1.0",
     "fast-wrap-ansi": "^0.1.3",
     "is-unicode-supported": "^1.3.0",
-    "rolldown": "workspace:*",
     "tsdown": "catalog:"
   }
 }

packages/tools/src/local-cli.ts

@@ -13,17 +13,18 @@ const localVpPath = path.join(repoRoot, 'target', 'debug', isWindows ? 'vp.exe'
 const localVpBinDir = path.dirname(localVpPath);
 const viteRepoDir = path.join(repoRoot, 'vite');
 const legacyViteRepoDir = path.join(repoRoot, 'rolldown-vite');
-const rolldownSrcDir = path.join(repoRoot, 'rolldown', 'packages', 'rolldown', 'src');
+const rolldownRepoDir = path.join(repoRoot, 'rolldown');
+const rolldownPackageDir = path.join(rolldownRepoDir, 'packages', 'rolldown');
+const rolldownPackageJsonPath = path.join(rolldownPackageDir, 'package.json');
+const rolldownSrcDir = path.join(rolldownPackageDir, 'src');
 const toolBinPath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'bin.js');
 const buildHint = 'pnpm build:cli';
 const bootstrapHint = 'pnpm bootstrap:dev';
 const installHint = 'pnpm install:dev';
 const pnpmExecPath = process.env.npm_execpath;
 const pnpmBin = isWindows ? 'pnpm.cmd' : 'pnpm';
 const cargoBin = isWindows ? 'cargo.exe' : 'cargo';
-const requireFromRolldown = createRequire(
-  path.join(repoRoot, 'rolldown', 'packages', 'rolldown', 'package.json'),
-);
+const requireFromRolldown = createRequire(rolldownPackageJsonPath);
 
 type CommandOptions = {
   cwd?: string;
@@ -191,6 +192,22 @@ function ensureBuildWorkspaceReady() {
     }
     process.exit(1);
   }
+
+  if (!existsSync(rolldownRepoDir)) {
+    console.error(`Missing local rolldown checkout: ${rolldownRepoDir}`);
+    console.error(
+      `Run "${installHint}" to fetch the local upstream checkouts, or "${bootstrapHint}" to prepare and build the local CLI.`,
+    );
+    process.exit(1);
+  }
+
+  if (!existsSync(rolldownPackageJsonPath) || !existsSync(rolldownSrcDir)) {
+    console.error(`Incomplete local rolldown checkout: ${rolldownPackageDir}`);
+    console.error(
+      `Run "${installHint}" to fetch the local upstream checkouts, or "${bootstrapHint}" to prepare and build the local CLI.`,
+    );
+    process.exit(1);
+  }
 }
 
 function runCommand(step: string, command: string, args: string[], options: CommandOptions = {}) {

pnpm-lock.yaml

@@ -10,6 +10,7 @@ const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'
 const gitBin = isWindows ? 'git.exe' : 'git';
 const pnpmBin = isWindows ? 'pnpm.cmd' : 'pnpm';
 const pnpmLockfilePath = path.join(repoRoot, 'pnpm-lock.yaml');
+const rolldownPackageJsonRelativePath = 'packages/rolldown/package.json';
 const upstreamVersions = JSON.parse(
   readFileSync(path.join(repoRoot, 'packages', 'tools', '.upstream-versions.json'), 'utf-8'),
 );
@@ -59,6 +60,14 @@ function capture(command, args, cwd) {
   }).stdout.trim();
 }
 
+function stringifyJson(value) {
+  return JSON.stringify(value, null, 2) + '\n';
+}
+
+function rolldownPackageJsonPath(rootDir = repoRoot) {
+  return path.join(rootDir, rolldownPackageJsonRelativePath);
+}
+
 function isGitRepo(dir) {
   const result = spawnSync(gitBin, ['rev-parse', '--git-dir'], {
     cwd: dir,
@@ -140,14 +149,12 @@ function rolldownBindingCandidates() {
   }
 }
 
-function ensureRolldownHostBindings() {
+function withRolldownHostBindings(pkg) {
   const candidates = rolldownBindingCandidates();
   if (candidates.length === 0) {
-    return;
+    return { changed: false, pkg };
   }
 
-  const packageJsonPath = path.join(repoRoot, 'rolldown', 'packages', 'rolldown', 'package.json');
-  const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
   const optionalDependencies = {
     ...(pkg.optionalDependencies ?? {}),
   };
@@ -160,15 +167,50 @@ function ensureRolldownHostBindings() {
     }
   }
 
+  if (!changed) {
+    return { changed: false, pkg };
+  }
+
+  return {
+    changed: true,
+    pkg: {
+      ...pkg,
+      optionalDependencies,
+    },
+  };
+}
+
+function ensureRolldownHostBindings() {
+  const packageJsonPath = rolldownPackageJsonPath();
+  const { changed, pkg } = withRolldownHostBindings(
+    JSON.parse(readFileSync(packageJsonPath, 'utf-8')),
+  );
   if (!changed) {
     return;
   }
 
-  pkg.optionalDependencies = optionalDependencies;
-  writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
+  writeFileSync(packageJsonPath, stringifyJson(pkg), 'utf-8');
   log(`Added host rolldown bindings to ${packageJsonPath}`);
 }
 
+function hasOnlyManagedRolldownBindingsChange(dir) {
+  const statusEntries = capture(gitBin, ['status', '--porcelain'], dir)
+    .split('\n')
+    .filter(Boolean);
+  if (statusEntries.length !== 1 || statusEntries[0].slice(3) !== rolldownPackageJsonRelativePath) {
+    return false;
+  }
+
+  const { changed, pkg } = withRolldownHostBindings(
+    JSON.parse(capture(gitBin, ['show', `HEAD:${rolldownPackageJsonRelativePath}`], dir)),
+  );
+  if (!changed) {
+    return false;
+  }
+
+  return readFileSync(rolldownPackageJsonPath(dir), 'utf-8') === stringifyJson(pkg);
+}
+
 function syncCleanCheckout(name, config) {
   const dir = path.join(repoRoot, name);
 
@@ -188,10 +230,15 @@ function syncCleanCheckout(name, config) {
 
   ensureExpectedRemote(name, dir, config.repo);
 
-  if (isDirty(dir)) {
+  const hasManagedRolldownBindingsChange =
+    name === 'rolldown' && isDirty(dir) && hasOnlyManagedRolldownBindingsChange(dir);
+  if (isDirty(dir) && !hasManagedRolldownBindingsChange) {
     log(`Keeping existing dirty ${name} checkout at ${dir}`);
     return;
   }
+  if (hasManagedRolldownBindingsChange) {
+    log(`Ignoring managed rolldown host binding diff at ${dir}`);
+  }
 
   log(`Updating clean ${name} checkout...`);
   run(gitBin, ['fetch', 'origin', '--tags'], { cwd: dir });