Skip to content

next-upgrade: Stop interleaving user-input with long tasks #70636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2024
Merged

next-upgrade: Stop interleaving user-input with long tasks #70636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions packages/next-codemod/bin/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ export async function runUpgrade(
await suggestTurbopack(appPackageJson)
}

const codemods = await suggestCodemods(
installedNextVersion,
targetNextVersion
)

fs.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2))

const packageManager: PackageManager = getPkgManager(process.cwd())
Expand Down Expand Up @@ -193,7 +198,9 @@ export async function runUpgrade(
silent: !verbose,
})

await suggestCodemods(installedNextVersion, targetNextVersion)
for (const codemod of codemods) {
await runTransform(codemod, process.cwd(), { force: true })
}

console.log(
`\n${chalk.green('✔')} Your Next.js project has been upgraded successfully. ${chalk.bold('Time to ship! 🚢')}`
Expand Down Expand Up @@ -313,13 +320,13 @@ async function suggestTurbopack(packageJson: any): Promise<void> {
async function suggestCodemods(
initialNextVersion: string,
targetNextVersion: string
): Promise<void> {
): Promise<string[]> {
const initialVersionIndex = availableCodemods.findIndex(
(versionCodemods) =>
compareVersions(versionCodemods.version, initialNextVersion) > 0
)
if (initialVersionIndex === -1) {
return
return []
}

let targetVersionIndex = availableCodemods.findIndex(
Expand All @@ -335,7 +342,7 @@ async function suggestCodemods(
.flatMap((versionCodemods) => versionCodemods.codemods)

if (relevantCodemods.length === 0) {
return
return []
}

const { codemods } = await prompts(
Expand All @@ -358,7 +365,5 @@ async function suggestCodemods(
}
)

for (const codemod of codemods) {
await runTransform(codemod, process.cwd(), { force: true })
}
return codemods
}
Loading