Skip to content

fix(core): Correct yarn upgrade command for yarn 2.x #8908

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
slorber merged 2 commits into from
Apr 20, 2023
Merged

fix(core): Correct yarn upgrade command for yarn 2.x #8908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c72a76
fix(core): Correct yarn upgrade command for yarn 2.x
andrewnicols Apr 20, 2023
d7fd239
return early for npm upgrade command
slorber Apr 20, 2023
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
20 changes: 15 additions & 5 deletions packages/docusaurus/bin/beforeCli.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,20 @@ export default async function beforeCli() {
.filter((p) => p.startsWith('@docusaurus'))
.map((p) => p.concat('@latest'))
.join(' ');
const isYarnUsed = await fs.pathExists(path.resolve('yarn.lock'));
const upgradeCommand = isYarnUsed
? `yarn upgrade ${siteDocusaurusPackagesForUpdate}`
: `npm i ${siteDocusaurusPackagesForUpdate}`;

const getUpgradeCommand = async () => {
const isYarnUsed = await fs.pathExists(path.resolve('yarn.lock'));
if (!isYarnUsed) {
return `npm i ${siteDocusaurusPackagesForUpdate}`;
}

const isYarnClassicUsed = !(await fs.pathExists(
path.resolve('.yarnrc.yml'),
));
return isYarnClassicUsed
? `yarn upgrade ${siteDocusaurusPackagesForUpdate}`
: `yarn up ${siteDocusaurusPackagesForUpdate}`;
};

/** @type {import('boxen').Options} */
const boxenOptions = {
Expand All @@ -124,7 +134,7 @@ export default async function beforeCli() {
)} → ${logger.green(`${notifier.update.latest}`)}

To upgrade Docusaurus packages with the latest version, run the following command:
${logger.code(upgradeCommand)}`,
${logger.code(await getUpgradeCommand())}`,
boxenOptions,
);

Expand Down