Skip to content

Re-enable yarn install on eject for non-windows machines #3347

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

Closed
wants to merge 16 commits into from
Closed

Re-enable yarn install on eject for non-windows machines #3347

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
57df9e8
re-enable yarn on non-windows machines
Timer Oct 29, 2017
849a35c
Adjust packages using package managers
Timer Nov 5, 2017
f5d28e0
oops
Timer Nov 5, 2017
c2eb722
Specific versions
Timer Nov 5, 2017
9c57ba7
Avoid magic values
Timer Nov 5, 2017
b52f311
Check status of process
Timer Nov 5, 2017
48c343b
Output error when command fails
Timer Nov 5, 2017
51dc554
Rename vars
Timer Nov 5, 2017
1332a19
try yarn.cmd explicitly
Timer Nov 5, 2017
9e7833c
Use Node's spawn behavior except default to a shell on Windows
Timer Nov 19, 2017
f702acc
Support sync spawn, too
Timer Nov 19, 2017
90045fb
Don't clobber user's options object
Timer Nov 19, 2017
65d335e
Revert "Use Node's spawn behavior except default to a shell on Windows"
Timer Nov 19, 2017
814da9e
Skip cross spawn
Timer Nov 19, 2017
012d821
whoops
Timer Nov 19, 2017
6a26e57
No append cmd
Timer Nov 19, 2017
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
Prev Previous commit
Next Next commit
Avoid magic values
  • Loading branch information
@Timer
Timer committed Nov 19, 2017
commit 9c57ba76fc04685df785f4e157ebe81555ce7358
14 changes: 10 additions & 4 deletions packages/react-scripts/scripts/eject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,26 @@ function getGitStatus() {
}
}

function adjustPackages(packages, append, dev = false) {
const ADD_PACKAGE = true,
REMOVE_PACKAGE = false;
const PROD_PACKAGE = true,
DEV_PACKAGE = false;
function adjustPackages(cwd, packages, append, dev) {
if (!Array.isArray(packages)) {
packages = [packages];
}
if (fs.existsSync(paths.yarnLockFile)) {
spawnSync('yarnpkg', [append ? 'add' : 'remove', ...packages], {
stdio: 'inherit',
cwd,
});
} else {
spawnSync(
'npm',
[append ? 'install' : 'uninstall', dev ? '-D' : '-S', ...packages],
{
stdio: 'inherit',
cwd,
}
);
}
Expand Down Expand Up @@ -171,13 +177,13 @@ inquirer
// We used to put react-scripts in devDependencies
if (appPackage.devDependencies[ownPackageName]) {
console.log(` Removing ${cyan(ownPackageName)} from devDependencies`);
adjustPackages(ownPackageName, false, true);
adjustPackages(appPath, ownPackageName, REMOVE_PACKAGE, DEV_PACKAGE);
}
}
appPackage.dependencies = appPackage.dependencies || {};
if (appPackage.dependencies[ownPackageName]) {
console.log(` Removing ${cyan(ownPackageName)} from dependencies`);
adjustPackages(ownPackageName, false);
adjustPackages(appPath, ownPackageName, REMOVE_PACKAGE, PROD_PACKAGE);
}
let appendList = [];
Object.keys(ownPackage.dependencies).forEach(key => {
Expand All @@ -188,7 +194,7 @@ inquirer
console.log(` Adding ${cyan(key)} to dependencies`);
appendList.push(`${key}@${ownPackage.dependencies[key]}`);
});
adjustPackages(appendList, true);
adjustPackages(appPath, appendList, ADD_PACKAGE, PROD_PACKAGE);
console.log();

appPackage = require(path.join(appPath, 'package.json'));
Expand Down