Fix eject for linked react-scripts (facebook#1736)

* fix eject for linked react-scripts * path.resolve => resolveApp # Conflicts: # packages/react-cy-scripts/config/paths.js # packages/react-cy-scripts/scripts/eject.js
CodeYellowBV · Mar 7, 2017 · 276c0f1 · 276c0f1
1 parent 4cdaf1a
commit 276c0f1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/react-cy-scripts/config/paths.js b/packages/react-cy-scripts/config/paths.js
@@ -114,7 +114,8 @@ module.exports = {
   ownNodeModules: resolveOwn('node_modules'), // This is empty on npm 3
 };
 
-var reactScriptsPath = path.resolve('node_modules/react-cy-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/

diff --git a/packages/react-cy-scripts/scripts/eject.js b/packages/react-cy-scripts/scripts/eject.js
@@ -157,13 +157,18 @@ 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) {}
+  // "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)) {
     console.log(cyan('Running yarn...'));