Skip to content

fix(create-react-app): improve Yarn 2+ support #12366

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −5
Open

fix(create-react-app): improve Yarn 2+ support #12366

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
24 changes: 19 additions & 5 deletions packages/create-react-app/createReactApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,19 +220,25 @@ function init() {
console.log();
} else {
const useYarn = isUsingYarn();
let yarnInfo;
if (useYarn) {
yarnInfo = checkYarnVersion();
}

createApp(
projectName,
program.verbose,
program.scriptsVersion,
program.template,
useYarn,
yarnInfo,
program.usePnp
);
}
});
}

function createApp(name, verbose, version, template, useYarn, usePnp) {
function createApp(name, verbose, version, template, useYarn, yarnInfo, usePnp) {
const unsupportedNodeVersion = !semver.satisfies(
// Coerce strings with metadata (i.e. `15.0.0-nightly`).
semver.coerce(process.version),
Expand Down Expand Up @@ -268,6 +274,11 @@ function createApp(name, verbose, version, template, useYarn, usePnp) {
version: '0.1.0',
private: true,
};

if (yarnInfo.hasMaxYarnPnp) {
packageJson.packageManager = `yarn@${yarnInfo.yarnVersion}`;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the packageManager field should be set regardless of package manager and/or version.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to make this change focused on improving Yarn 2+ support, without affecting Yarn 1.x and other package managers at all

}

fs.writeFileSync(
path.join(root, 'package.json'),
JSON.stringify(packageJson, null, 2) + os.EOL
Expand All @@ -294,7 +305,6 @@ function createApp(name, verbose, version, template, useYarn, usePnp) {
version = 'react-scripts@0.9.x';
}
} else if (usePnp) {
const yarnInfo = checkYarnVersion();
if (yarnInfo.yarnVersion) {
if (!yarnInfo.hasMinYarnPnp) {
console.log(
Expand Down Expand Up @@ -762,10 +772,14 @@ function checkYarnVersion() {
let hasMaxYarnPnp = false;
let yarnVersion = null;
try {
yarnVersion = execSync('yarnpkg --version').toString().trim();
const userAgentMatches = (process.env.npm_config_user_agent || '').match('yarn/([^ ]+)');
yarnVersion = userAgentMatches ? userAgentMatches[1] : null;
if (!yarnVersion) {
yarnVersion = execSync('yarnpkg --version').toString().trim();
}
if (semver.valid(yarnVersion)) {
hasMinYarnPnp = semver.gte(yarnVersion, minYarnPnp);
hasMaxYarnPnp = semver.lt(yarnVersion, maxYarnPnp);
hasMaxYarnPnp = semver.gte(yarnVersion, maxYarnPnp);
} else {
// Handle non-semver compliant yarn version strings, which yarn currently
// uses for nightly builds. The regex truncates anything after the first
Expand All @@ -774,7 +788,7 @@ function checkYarnVersion() {
if (trimmedYarnVersionMatch) {
const trimmedYarnVersion = trimmedYarnVersionMatch.pop();
hasMinYarnPnp = semver.gte(trimmedYarnVersion, minYarnPnp);
hasMaxYarnPnp = semver.lt(trimmedYarnVersion, maxYarnPnp);
hasMaxYarnPnp = semver.gte(trimmedYarnVersion, maxYarnPnp);
}
}
} catch (err) {
Expand Down