Skip to content

Commit 302409b

Browse files
committed
fixed issue which caused always using yarn as the packager
1 parent 81d1c89 commit 302409b

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

setup.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,29 @@ const devDependencies = require('./devDependencies.json');
99
const deleteFile = (fileName) => fs.unlinkSync(path.join(process.cwd(), fileName));
1010
const writeFile = (fileName, data) => fs.writeFileSync(path.join(process.cwd(), fileName), data);
1111
const isYarnAvailable = () => {
12-
try {
13-
execSync('yarnpkg --version', { stdio: 'ignore' });
14-
return true;
15-
} catch (e) {
16-
return false;
17-
}
18-
}
19-
const currPackager = isYarnAvailable ? "yarn" : "npm";
20-
const logInstallingWith = pkg => console.log(`\n📦 Installing dependencies with ${pkg}...\n`);
21-
const execOptions = {
22-
stdio: 'inherit'
12+
try {
13+
execSync('yarnpkg --version', { stdio: 'ignore' });
14+
return true;
15+
} catch (e) {
16+
return false;
17+
}
2318
}
2419

20+
const packager = isYarnAvailable() ? 'yarn' : 'npm';
21+
const execOptions = { stdio: 'inherit' };
22+
2523
console.log('\n🔄 Please wait...\n');
2624

2725
packageJson.scripts.start = `${packageJson.scripts.start} --config ../../../../rn-cli.config.js`;
2826
packageJson.jest = Object.assign(packageJson.jest, jestJson);
2927
writeFile('package.json', JSON.stringify(packageJson, null, 2));
3028

31-
logInstallingWith(currPackager);
29+
console.log(`\n📦 Installing dependencies with ${packager}...\n`);
3230

33-
if (isYarnAvailable) {
34-
execSync(`yarn add ${devDependencies.join(' ')} --dev --exact`, execOptions);
31+
if (packager === 'yarn') {
32+
execSync(`yarn add ${devDependencies.join(' ')} --dev --exact`, execOptions);
3533
} else {
36-
execSync(`npm i ${devDependencies.join(' ')} --save-dev --save-exact`, execOptions);
34+
execSync(`npm i ${devDependencies.join(' ')} --save-dev --save-exact`, execOptions);
3735
}
3836

3937
deleteFile('App.js');
@@ -45,4 +43,4 @@ deleteFile('README.md');
4543
deleteFile('LICENSE');
4644
deleteFile('setup.js');
4745

48-
console.log(`\n✅ Setup completed! You can now start with: ${currPackager} start\n`);
46+
console.log(`\n✅ Setup completed! You can now start with: ${packager} start\n`);

0 commit comments

Comments
 (0)