Skip to content
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

Jump to bottom

fix(core): docusaurus CLI should detect the correct yarn version when suggesting upgrades #9006

Merged
merged 6 commits into from
May 31, 2023
Merged

fix(core): docusaurus CLI should detect the correct yarn version when suggesting upgrades #9006

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a0e83e
fix(core): Correct yarn version detection
0420syj May 24, 2023
1914bed
Merge branch 'facebook:main' into correct-yarn-version-detection
0420syj May 31, 2023
cd951d9
Change to use `shelljs` instead of `js-yaml`
0420syj May 31, 2023
027584f
Change echo mode to silent
0420syj May 31, 2023
c14a611
Check `yarn.lock` exist, before version checking
0420syj May 31, 2023
c4db321
Remove unnecessary optional chaining
0420syj May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 23 additions & 7 deletions packages/docusaurus/bin/beforeCli.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import fs from 'fs-extra';
import path from 'path';
import {createRequire} from 'module';
import shell from 'shelljs';
import logger from '@docusaurus/logger';
import semver from 'semver';
import updateNotifier from 'update-notifier';
Expand Down Expand Up @@ -105,16 +106,31 @@ export default async function beforeCli() {
.map((p) => p.concat('@latest'))
.join(' ');

const getYarnVersion = async () => {
const fallbackYarnVersion = 1;
const yarnVersionResult = shell.exec('yarn --version');
if (yarnVersionResult?.code === 0) {
const yarnVersionOutput = yarnVersionResult.stdout?.trim();
const majorVersion = parseInt(
yarnVersionOutput?.split('.')[0] ?? '',
10,
);
if (typeof majorVersion === 'number' && !Number.isNaN(majorVersion)) {
return majorVersion;
0420syj marked this conversation as resolved.
Show resolved Hide resolved
}
}
if (await fs.pathExists(path.resolve('yarn.lock'))) {
return fallbackYarnVersion;
}
return undefined;
};

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

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