Skip to content

add command to add files to staging after eject #5960

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
iansu merged 6 commits into from
Mar 12, 2019
+24 −0
Merged

add command to add files to staging after eject #5960

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b534ed8
add command to add files to staging after eject
clickclickonsal Dec 4, 2018
52f6602
update console.log message
clickclickonsal Dec 4, 2018
d33182a
wrap git add in a try/catch block
clickclickonsal Dec 4, 2018
34c946e
return true & update log message
clickclickonsal Dec 5, 2018
4bda65b
add test to check if files were staged
clickclickonsal Dec 8, 2018
d44f9ff
Fix check for staged files
iansu Mar 12, 2019
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
19 changes: 19 additions & 0 deletions packages/react-scripts/scripts/eject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ function getGitStatus() {
}
}

function tryGitAdd(appPath) {
try {
spawnSync(
'git',
['add', path.join(appPath, 'config'), path.join(appPath, 'scripts')],
{
stdio: 'inherit',
}
);
} catch (e) {
return '';
Copy link
Copy Markdown
Contributor

@iansu iansu Dec 5, 2018

Choose a reason for hiding this comment

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

You can probably just return instead of returning an empty string. What get's returned if this succeeds?

Copy link
Copy Markdown
Contributor Author

@clickclickonsal clickclickonsal Dec 5, 2018

Choose a reason for hiding this comment

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

I thought about just returning but then I saw we're retuning an empty string on line #37 so I did to keep it consistent.

I forgot to return true so I'll add that in. 😓

Copy link
Copy Markdown
Contributor

@iansu iansu Dec 5, 2018

Choose a reason for hiding this comment

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

That other function returns a string on success and an empty string on failure. If this function returns true on success then it should return false on failure.

}
}

console.log(
chalk.cyan.bold(
'NOTE: Create React App 2 supports TypeScript, Sass, CSS Modules and more without ejecting: ' +
Expand Down Expand Up @@ -310,6 +324,11 @@ inquirer
console.log(green('Ejected successfully!'));
console.log();

if (tryGitAdd(appPath)) {
console.log(cyan('Added ejected files to Staging for commit.'));
Copy link
Copy Markdown
Contributor

@iansu iansu Dec 5, 2018

Choose a reason for hiding this comment

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

The message can probably just be: Staged ejected files for for commit.

Copy link
Copy Markdown
Contributor

@iansu iansu Dec 5, 2018

Choose a reason for hiding this comment

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

for for was a typo. Please remove one of them.

console.log();
}

console.log(
green('Please consider sharing why you ejected in this survey:')
);
Expand Down
⚡