fix(migrate): reject unsupported tsup config inputs

Author: fengmk2

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/migration_from_tsup/snapshots.toml

@@ -46,15 +46,27 @@ steps = [
   { argv = ["vpt", "print-file", "package.json"], comment = "both inline configs are unchanged" },
 ]
 
+[[case]]
+name = "migration_from_tsup_inline_config"
+vp = "local"
+steps = [
+  { argv = ["vpt", "rm", "tsup.config.ts"], snapshot = false },
+  { argv = ["vpt", "json-edit", "package.json", "scripts.build", "tsup"], snapshot = false },
+  { argv = ["vpt", "json-edit", "package.json", "tsup", '{"entry":["src/index.ts"]}'], snapshot = false },
+  { argv = ["vp", "migrate", "--no-interactive", "--no-hooks", "--no-agent", "--no-editor"], comment = "an inline tsup config should stop automatic migration", continue-on-failure = true },
+  { argv = ["vpt", "print-file", "package.json"], comment = "the inline tsup config is unchanged" },
+]
+
 [[case]]
 name = "migration_from_tsup_custom_config"
 vp = "local"
 steps = [
   { argv = ["vpt", "mkdir", "-p", "configs"], snapshot = false },
   { argv = ["vpt", "write-file", "configs/legacy.ts", "export default {};\n"], snapshot = false },
   { argv = ["vpt", "json-edit", "package.json", "scripts.build", "tsup --config configs/legacy.ts"], snapshot = false },
-  { argv = ["vp", "migrate", "--no-interactive", "--no-hooks", "--no-agent", "--no-editor"], comment = "a custom config should stop automatic migration before any files change", continue-on-failure = true },
+  { argv = ["vpt", "json-edit", "package.json", "scripts.irregular", "tsup --config ././tsup.config.ts"], snapshot = false },
+  { argv = ["vp", "migrate", "--no-interactive", "--no-hooks", "--no-agent", "--no-editor"], comment = "unsupported config paths should stop automatic migration before any files change", continue-on-failure = true },
   { argv = ["vpt", "print-file", "tsup.config.ts"], comment = "the standard config is unchanged" },
   { argv = ["vpt", "print-file", "configs/legacy.ts"], comment = "the custom config is unchanged" },
-  { argv = ["vpt", "print-file", "package.json"], comment = "the custom-config script and tsup dependency are unchanged" },
+  { argv = ["vpt", "print-file", "package.json"], comment = "the unsupported scripts and tsup dependency are unchanged" },
 ]

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/migration_from_tsup/snapshots/migration_from_tsup_custom_config.md

@@ -10,9 +10,12 @@
 ## `vpt json-edit package.json scripts.build 'tsup --config configs/legacy.ts'`
 
 
+## `vpt json-edit package.json scripts.irregular 'tsup --config ././tsup.config.ts'`
+
+
 ## `vp migrate --no-interactive --no-hooks --no-agent --no-editor`
 
-a custom config should stop automatic migration before any files change
+unsupported config paths should stop automatic migration before any files change
 
 **Exit code:** 1
 
@@ -23,6 +26,7 @@ tsup configuration detected. Auto-migrating to tsdown...
 
 Automatic tsup migration was skipped because these scripts use configs that cannot be migrated automatically:
   package.json#build -> configs/legacy.ts
+  package.json#irregular -> ././tsup.config.ts
 
 Choose one of these manual migration methods:
   1. Run `vp dlx tsdown-migrate` in the project root.
@@ -56,7 +60,7 @@ export default {};
 
 ## `vpt print-file package.json`
 
-the custom-config script and tsup dependency are unchanged
+the unsupported scripts and tsup dependency are unchanged
 
 ```
 {
@@ -66,7 +70,8 @@ the custom-config script and tsup dependency are unchanged
   },
   "name": "migration-from-tsup",
   "scripts": {
-    "build": "tsup --config configs/legacy.ts"
+    "build": "tsup --config configs/legacy.ts",
+    "irregular": "tsup --config ././tsup.config.ts"
   }
 }
 ```

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/migration_from_tsup/snapshots/migration_from_tsup_inline_config.md

@@ -0,0 +1,53 @@
+# migration_from_tsup_inline_config
+
+## `vpt rm tsup.config.ts`
+
+
+## `vpt json-edit package.json scripts.build tsup`
+
+
+## `vpt json-edit package.json tsup '{"entry":["src/index.ts"]}'`
+
+
+## `vp migrate --no-interactive --no-hooks --no-agent --no-editor`
+
+an inline tsup config should stop automatic migration
+
+**Exit code:** 1
+
+```
+VITE+ - The Unified Toolchain for the Web
+
+tsup configuration detected. Auto-migrating to tsdown...
+
+Automatic tsup migration was skipped because these inline tsup configs cannot be migrated automatically:
+  package.json#tsup
+
+Choose one of these manual migration methods:
+  1. Run `vp dlx tsdown-migrate` in the project root.
+  2. Use the tsdown migration skill:
+     https://github.com/rolldown/tsdown/blob/main/skills/tsdown-migrate/SKILL.md
+Complete the tsup migration manually, then re-run `vp migrate`.
+```
+
+## `vpt print-file package.json`
+
+the inline tsup config is unchanged
+
+```
+{
+  "devDependencies": {
+    "tsup": "^8.5.0",
+    "vite": "^7.0.0"
+  },
+  "name": "migration-from-tsup",
+  "scripts": {
+    "build": "tsup"
+  },
+  "tsup": {
+    "entry": [
+      "src/index.ts"
+    ]
+  }
+}
+```

packages/cli/src/migration/__tests__/tsup.spec.ts

@@ -143,6 +143,31 @@ describe('tsup migration', () => {
     expect(mockInfo).toHaveBeenCalledWith(manualMigrationOptions());
   });
 
+  it('refuses to migrate an inline tsup config', async () => {
+    fs.unlinkSync(path.join(projectPath, 'tsup.config.ts'));
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    const originalPackageJson = {
+      name: 'fixture',
+      scripts: { build: 'tsup' },
+      devDependencies: { tsup: '^8.5.0' },
+      tsup: { entry: ['src/index.ts'] },
+    };
+    fs.writeFileSync(packageJsonPath, `${JSON.stringify(originalPackageJson, null, 2)}\n`);
+
+    await expect(
+      migrateTsupToTsdown(projectPath, false, PackageManager.npm, 'package.json#tsup', undefined, {
+        silent: true,
+      }),
+    ).resolves.toBe(false);
+
+    expect(mockRunCommandSilently).not.toHaveBeenCalled();
+    expect(readJsonFile(packageJsonPath)).toEqual(originalPackageJson);
+    expect(mockWarn).toHaveBeenCalledWith(
+      'Automatic tsup migration was skipped because these inline tsup configs cannot be migrated automatically:\n  package.json#tsup',
+    );
+    expect(mockInfo).toHaveBeenCalledWith(manualMigrationOptions());
+  });
+
   it('refuses to migrate a script that uses a custom tsup config', async () => {
     const packageJsonPath = path.join(projectPath, 'package.json');
     const originalPackageJson = {
@@ -169,6 +194,30 @@ describe('tsup migration', () => {
     expect(mockInfo).toHaveBeenCalledWith(manualMigrationOptions());
   });
 
+  it('refuses a default config path that cleanup cannot remove', async () => {
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    const originalPackageJson = {
+      name: 'fixture',
+      scripts: { build: 'tsup --config ././tsup.config.ts' },
+      devDependencies: { tsup: '^8.5.0' },
+    };
+    fs.writeFileSync(packageJsonPath, `${JSON.stringify(originalPackageJson, null, 2)}\n`);
+
+    await expect(
+      migrateTsupToTsdown(projectPath, false, PackageManager.npm, 'tsup.config.ts', undefined, {
+        silent: true,
+      }),
+    ).resolves.toBe(false);
+
+    expect(mockRunCommandSilently).not.toHaveBeenCalled();
+    expect(readJsonFile(packageJsonPath)).toEqual(originalPackageJson);
+    expect(fs.existsSync(path.join(projectPath, 'tsup.config.ts'))).toBe(true);
+    expect(mockWarn).toHaveBeenCalledWith(
+      'Automatic tsup migration was skipped because these scripts use configs that cannot be migrated automatically:\n  package.json#build -> ././tsup.config.ts',
+    );
+    expect(mockInfo).toHaveBeenCalledWith(manualMigrationOptions());
+  });
+
   it('refuses to remove selectors for multiple standard tsup configs', async () => {
     fs.writeFileSync(path.join(projectPath, 'tsup.config.js'), 'export default {};\n');
     const packageJsonPath = path.join(projectPath, 'package.json');

packages/cli/src/migration/migrator/tsup.ts

@@ -106,13 +106,13 @@ interface SharedTsupConfig {
   consumers: Map<string, SharedTsupConsumer>;
 }
 
-interface TsdownConfigCollision {
+interface TsupConfigLocation {
   configPath: string;
   targetPath: string;
 }
 
 interface UnsupportedTsupConfigConsumer {
-  configPath: string;
+  configArgument: string;
   packagePath: string;
   scriptName: string;
 }
@@ -175,8 +175,8 @@ function collectSharedTsupConfigs(
   return sharedConfigs;
 }
 
-function collectTsupConfigCollisions(tsupTargets: string[]): TsdownConfigCollision[] {
-  const collisions: TsdownConfigCollision[] = [];
+function collectTsupConfigCollisions(tsupTargets: string[]): TsupConfigLocation[] {
+  const collisions: TsupConfigLocation[] = [];
   for (const target of tsupTargets) {
     const tsdownConfig = detectConfigs(target).tsdownConfig;
     if (tsdownConfig) {
@@ -193,6 +193,25 @@ function collectTsupConfigCollisions(tsupTargets: string[]): TsdownConfigCollisi
   return collisions;
 }
 
+function collectInlineTsupConfigs(tsupTargets: string[]): TsupConfigLocation[] {
+  return tsupTargets.flatMap((target) => {
+    const packageJsonPath = path.join(target, 'package.json');
+    if (!fs.existsSync(packageJsonPath) || !Object.hasOwn(readJsonFile(packageJsonPath), 'tsup')) {
+      return [];
+    }
+    return [{ configPath: `${packageJsonPath}#tsup`, targetPath: target }];
+  });
+}
+
+function isRemovableDefaultConfigArgument(configArgument: string, defaultConfig?: string): boolean {
+  return (
+    !!defaultConfig &&
+    (configArgument === defaultConfig ||
+      configArgument === `./${defaultConfig}` ||
+      configArgument === `.\\${defaultConfig}`)
+  );
+}
+
 function collectUnsupportedTsupConfigConsumers(
   tsupTargets: string[],
 ): UnsupportedTsupConfigConsumer[] {
@@ -219,12 +238,15 @@ function collectUnsupportedTsupConfigConsumers(
 
     for (const [scriptName, script] of Object.entries(packageJson.scripts ?? {})) {
       for (const match of script.matchAll(TSUP_CONFIG_OPTION_RE)) {
-        const configPath = resolveScriptConfigPath(target, match[1] ?? match[2] ?? match[3]);
-        const isDefaultConfig = configPath === defaultConfigPath;
+        const configArgument = match[1] ?? match[2] ?? match[3];
+        const configPath = resolveScriptConfigPath(target, configArgument);
+        const isDefaultConfig =
+          configPath === defaultConfigPath &&
+          isRemovableDefaultConfigArgument(configArgument, detectedConfig);
         const isSharedMigratedConfig =
           migratedConfigPaths.has(configPath) && path.dirname(configPath) !== target;
         if (!isDefaultConfig && !isSharedMigratedConfig) {
-          unsupported.push({ configPath, packagePath: target, scriptName });
+          unsupported.push({ configArgument, packagePath: target, scriptName });
         }
       }
     }
@@ -413,13 +435,28 @@ export async function migrateTsupToTsdown(
     showTsdownMigrationOptions(targetLabel);
     return false;
   }
+  const inlineTsupConfigs = collectInlineTsupConfigs(tsupTargets);
+  if (inlineTsupConfigs.length > 0) {
+    prompts.log.warn(
+      `Automatic tsup migration was skipped because these inline tsup configs cannot be migrated automatically:\n${inlineTsupConfigs
+        .map(({ configPath }) => `  ${displayRelative(configPath, projectPath)}`)
+        .join('\n')}`,
+    );
+    const firstInlineTarget = inlineTsupConfigs[0].targetPath;
+    const targetLabel =
+      firstInlineTarget === rootPath
+        ? 'the project root'
+        : displayRelative(firstInlineTarget, projectPath);
+    showTsdownMigrationOptions(targetLabel);
+    return false;
+  }
   const unsupportedConfigConsumers = collectUnsupportedTsupConfigConsumers(tsupTargets);
   if (unsupportedConfigConsumers.length > 0) {
     prompts.log.warn(
       `Automatic tsup migration was skipped because these scripts use configs that cannot be migrated automatically:\n${unsupportedConfigConsumers
         .map(
-          ({ configPath, packagePath, scriptName }) =>
-            `  ${displayRelative(path.join(packagePath, 'package.json'), projectPath)}#${scriptName} -> ${displayRelative(configPath, projectPath)}`,
+          ({ configArgument, packagePath, scriptName }) =>
+            `  ${displayRelative(path.join(packagePath, 'package.json'), projectPath)}#${scriptName} -> ${configArgument}`,
         )
         .join('\n')}`,
     );