kylefang/create-react-app
1
0
Fork 0
mirror of https://github.com/zhigang1992/create-react-app.git synced 2026-04-01 12:42:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix eject for linked react-scripts (#1736)

Browse Source 
* fix eject for linked react-scripts

* path.resolve => resolveApp
This commit is contained in:
Valerii Sorokobatko
2017-03-06 19:44:18 +02:00
committed by Dan Abramov
parent 1bfd5dafdf
commit d7bcc1916a
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/react-scripts/config/paths.js vendored
View File

@@ -114,7 +114,8 @@ module.exports = {
ownNodeModules: resolveOwn('node_modules'), // This is empty on npm 3
};
var reactScriptsPath = path.resolve('node_modules/react-scripts');
var ownPackageJson = require('../package.json');
var reactScriptsPath = resolveApp(`node_modules/${ownPackageJson.name}`);
var reactScriptsLinked = fs.existsSync(reactScriptsPath) && fs.lstatSync(reactScriptsPath).isSymbolicLink();
// config before publish: we're in ./packages/react-scripts/config/

19
packages/react-scripts/scripts/eject.js vendored
View File

@@ -158,14 +158,17 @@ prompt(
);
console.log();
try {
// remove react-scripts and react-scripts binaries from app node_modules
Object.keys(ownPackage.bin).forEach(function(binKey) {
fs.removeSync(path.join(appPath, 'node_modules', '.bin', binKey));
});
fs.removeSync(ownPath);
} catch(e) {
// It's not essential that this succeeds
// "Don't destroy what isn't ours"
if (ownPath.indexOf(appPath) === 0) {
try {
// remove react-scripts and react-scripts binaries from app node_modules
Object.keys(ownPackage.bin).forEach(function(binKey) {
fs.removeSync(path.join(appPath, 'node_modules', '.bin', binKey));
});
fs.removeSync(ownPath);
} catch(e) {
// It's not essential that this succeeds
}
}
if (fs.existsSync(paths.yarnLockFile)) {