Skip to content

Commit

Permalink
Bootstrap with Yarn when available (facebook#2673)
Browse files Browse the repository at this point in the history
* Bootstrap with Yarn if we can

* Update test scripts

* Check OS and npm concurrency ability

* Windows support

* Update bootstrap.js

* Install yarn before bootstrap
  • Loading branch information
Timer authored and romaindso committed Jul 10, 2017
1 parent 9700ddb commit bb3a9e5
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 17 deletions.
67 changes: 67 additions & 0 deletions bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
'use strict';

const { execSync, spawn } = require('child_process');
const { resolve } = require('path');
const { existsSync } = require('fs');
const { platform } = require('os');

function shouldUseYarn() {
try {
execSync('yarnpkg --version', { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}

function shouldUseNpmConcurrently() {
try {
const versionString = execSync('npm --version');
const m = /^(\d+)[.]/.exec(versionString);
// NPM >= 5 support concurrent installs
return Number(m[1]) >= 5;
} catch (e) {
return false;
}
}

const yarn = shouldUseYarn();
const windows = platform() === 'win32';
const lerna = resolve(
__dirname,
'node_modules',
'.bin',
windows ? 'lerna.cmd' : 'lerna'
);

if (!existsSync(lerna)) {
if (yarn) {
console.log('Cannot find lerna. Please run `yarn --check-files`.');
} else {
console.log(
'Cannot find lerna. Please remove `node_modules` and run `npm install`.'
);
}
process.exit(1);
}

let child;
if (yarn) {
// Yarn does not support concurrency
child = spawn(lerna, ['bootstrap', '--npm-client=yarn', '--concurrency=1'], {
stdio: 'inherit',
});
} else {
let args = ['bootstrap'];
if (
// The Windows filesystem does not handle concurrency well
windows ||
// Only newer npm versions support concurrency
!shouldUseNpmConcurrently()
) {
args.push('--concurrency=1');
}
child = spawn(lerna, args, { stdio: 'inherit' });
}

child.on('close', code => process.exit(code));
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.0.0-beta.38",
"lerna": "2.0.0-rc.5",
"version": "independent",
"changelog": {
"repo": "facebookincubator/create-react-app",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"create-react-app": "tasks/cra.sh",
"e2e": "tasks/e2e-simple.sh",
"e2e:docker": "tasks/local-test.sh",
"postinstall": "lerna bootstrap && cd packages/react-error-overlay/ && npm run build:prod",
"postinstall": "node bootstrap.js && cd packages/react-error-overlay/ && npm run build:prod",
"publish": "tasks/release.sh",
"start": "node packages/react-scripts/scripts/start.js",
"test": "node packages/react-scripts/scripts/test.js --env=jsdom",
Expand All @@ -16,7 +16,7 @@
"devDependencies": {
"eslint": "3.19.0",
"husky": "^0.13.2",
"lerna": "2.0.0-beta.38",
"lerna": "2.0.0-rc.5",
"lerna-changelog": "^0.2.3",
"lint-staged": "^3.3.1",
"prettier": "^1.5.2"
Expand Down
8 changes: 4 additions & 4 deletions tasks/e2e-installs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ then
# AppVeyor uses an old version of yarn.
# Once updated to 0.24.3 or above, the workaround can be removed
# and replaced with `yarnpkg cache clean`
# Issues:
# Issues:
# https://github.com/yarnpkg/yarn/issues/2591
# https://github.com/appveyor/ci/issues/1576
# https://github.com/facebookincubator/create-react-app/pull/2400
Expand All @@ -102,9 +102,9 @@ then
npm cache clean || npm cache verify
fi

# Prevent lerna bootstrap, we only want top-level dependencies
# Prevent bootstrap, we only want top-level dependencies
cp package.json package.json.bak
grep -v "lerna bootstrap" package.json > temp && mv temp package.json
grep -v "postinstall" package.json > temp && mv temp package.json
npm install
mv package.json.bak package.json

Expand All @@ -116,7 +116,7 @@ then
fi

# We removed the postinstall, so do it manually
./node_modules/.bin/lerna bootstrap --concurrency=1
node bootstrap.js

cd packages/react-error-overlay/
npm run build:prod
Expand Down
8 changes: 4 additions & 4 deletions tasks/e2e-kitchensink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ then
# AppVeyor uses an old version of yarn.
# Once updated to 0.24.3 or above, the workaround can be removed
# and replaced with `yarnpkg cache clean`
# Issues:
# Issues:
# https://github.com/yarnpkg/yarn/issues/2591
# https://github.com/appveyor/ci/issues/1576
# https://github.com/facebookincubator/create-react-app/pull/2400
Expand All @@ -94,9 +94,9 @@ then
npm cache clean || npm cache verify
fi

# Prevent lerna bootstrap, we only want top-level dependencies
# Prevent bootstrap, we only want top-level dependencies
cp package.json package.json.bak
grep -v "lerna bootstrap" package.json > temp && mv temp package.json
grep -v "postinstall" package.json > temp && mv temp package.json
npm install
mv package.json.bak package.json

Expand All @@ -108,7 +108,7 @@ then
fi

# We removed the postinstall, so do it manually
./node_modules/.bin/lerna bootstrap --concurrency=1
node bootstrap.js

cd packages/react-error-overlay/
npm run build:prod
Expand Down
12 changes: 6 additions & 6 deletions tasks/e2e-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ then
# AppVeyor uses an old version of yarn.
# Once updated to 0.24.3 or above, the workaround can be removed
# and replaced with `yarnpkg cache clean`
# Issues:
# Issues:
# https://github.com/yarnpkg/yarn/issues/2591
# https://github.com/appveyor/ci/issues/1576
# https://github.com/facebookincubator/create-react-app/pull/2400
Expand All @@ -93,9 +93,9 @@ then
npm cache clean || npm cache verify
fi

# Prevent lerna bootstrap, we only want top-level dependencies
# Prevent bootstrap, we only want top-level dependencies
cp package.json package.json.bak
grep -v "lerna bootstrap" package.json > temp && mv temp package.json
grep -v "postinstall" package.json > temp && mv temp package.json
npm install
mv package.json.bak package.json

Expand All @@ -115,16 +115,16 @@ then
[[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1
fi

# We removed the postinstall, so do it manually here
./node_modules/.bin/lerna bootstrap --concurrency=1

if [ "$USE_YARN" = "yes" ]
then
# Install Yarn so that the test can use it to install packages.
npm install -g yarn
yarn cache clean
fi

# We removed the postinstall, so do it manually here
node bootstrap.js

# Lint own code
./node_modules/.bin/eslint --max-warnings 0 packages/babel-preset-react-app/
./node_modules/.bin/eslint --max-warnings 0 packages/create-react-app/
Expand Down

0 comments on commit bb3a9e5

Please sign in to comment.