Skip to content

fix: init uses yarn assuming version > 1.x#2329

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
blakef merged 1 commit into from
Mar 20, 2024
Merged

fix: init uses yarn assuming version > 1.x #2329

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions __e2e__/init.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
import fs from 'fs';
import path from 'path';
import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
import {execSync} from 'child_process';
import semver from 'semver';
import slash from 'slash';

const yarnVersion = semver.parse(execSync('yarn --version').toString().trim())!;

// .yarnrc -> .yarnrc.yml >= 2.0.0: yarnpkg/berry/issues/239
const yarnConfigFile = yarnVersion.major > 1 ? '.yarnrc.yml' : '.yarnrc';

const DIR = getTempDirectory('command-init');
const PROJECT_NAME = 'TestInit';

Expand All@@ -23,7 +30,7 @@ function createCustomTemplateFiles() {
const customTemplateCopiedFiles = [
'.git',
'.yarn',
'.yarnrc.yml',
yarnConfigFile,
'dir',
'file',
'node_modules',
Expand DownExpand Up@@ -178,7 +185,7 @@ test('init uses npm as the package manager with --npm', () => {
// Remove yarn specific files and node_modules
const filteredFiles = customTemplateCopiedFiles.filter(
(file) =>
!['yarn.lock', 'node_modules', '.yarnrc.yml', '.yarn'].includes(file),
!['yarn.lock', 'node_modules', yarnConfigFile, '.yarn'].includes(file),
);

// Add package-lock.json
Expand Down
10 changes: 5 additions & 5 deletions jest/helpers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ export const makeTemplate =
});

export const cleanup = (directory: string) => {
fs.rmSync(directory, {recursive: true, force: true});
fs.rmSync(directory, {recursive: true, force: true, maxRetries: 10});
};

/**
Expand DownExpand Up@@ -142,18 +142,18 @@ function getExecaOptions(options: SpawnOptions) {
function handleTestFailure(
cmd: string,
options: SpawnOptions,
result: {[key: string]: any},
result: execa.ExecaReturnBase<string>,
args: string[] | undefined,
) {
if (!options.expectedFailure && result.code !== 0) {
if (!options.expectedFailure && result.exitCode !== 0) {

@blakefblakefMar 19, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This was spamming the logs with false positives on the CI E2E tests.

@szymonrybczakszymonrybczakMar 20, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I know that some time ago we hit the issue where commands were failing and execa where reporting status codes as undefined, hopefully this change will catch all situations when there's a failure.

More details: #2152

console.log(`Running ${cmd} command failed for unexpected reason. Here's more info:
${chalk.bold('cmd:')} ${cmd}
${chalk.bold('options:')} ${JSON.stringify(options)}
${chalk.bold('args:')} ${(args || []).join(' ')}
${chalk.bold('stderr:')} ${result.stderr}
${chalk.bold('stdout:')} ${result.stdout}
${chalk.bold('code:')}${result.code}`);
} else if (options.expectedFailure && result.code === 0) {
${chalk.bold('exitCode:')}${result.exitCode}`);
} else if (options.expectedFailure && result.exitCode === 0) {
throw new Error("Expected command to fail, but it didn't");
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-platform-android/src/config/findManifest.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import path from 'path';
import {unixifyPaths} from '@react-native-community/cli-tools';

export default function findManifest(folder: string) {
let manifestPaths = glob.sync(path.join('**', 'AndroidManifest.xml'), {
let manifestPaths = glob.sync('**/AndroidManifest.xml', {

@blakefblakefMar 19, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

fast-globonly wants paths expressed as forward slashes, so we want the opposite behaviour. This was causing failures on the Windows E2E tests.

cwd: unixifyPaths(folder),
ignore: [
'node_modules/**',
Expand Down
9 changes: 7 additions & 2 deletions packages/cli/src/commands/init/init.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,19 +78,24 @@ interface TemplateReturnType {

// Here we are defining explicit version of Yarn to be used in the new project because in some cases providing `3.x` don't work.
const YARN_VERSION = '3.6.4';
const YARN_LEGACY_VERSION = '1.22.22';

const bumpYarnVersion = async (silent: boolean, root: string) => {
try {
let yarnVersion = semver.parse(getYarnVersionIfAvailable());

if (yarnVersion) {
await executeCommand('yarn', ['set', 'version', YARN_VERSION], {
// `yarn set` is unsupported until 1.22, however it's a alias (yarnpkg/yarn/pull/7862) calling `policies set-version`.
const setVersionArgs =
yarnVersion.major > 1
? ['set', 'version', YARN_VERSION]
: ['policies', 'set-version', YARN_LEGACY_VERSION];
await executeCommand('yarn', setVersionArgs, {
root,
silent,
});

// React Native doesn't support PnP, so we need to set nodeLinker to node-modules. Read more here: https://github.com/react-native-community/cli/issues/27#issuecomment-1772626767

await executeCommand(
'yarn',
['config', 'set', 'nodeLinker', 'node-modules'],
Expand Down