Merge pull request #17 from FormidableLabs/jp-npm5-support

add NPM 5 support
FormidableLabs · Oct 19, 2017 · a0c7de3 · a0c7de3
2 parents 70cd72e + 76504ef
commit a0c7de3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/util/assert.js b/src/util/assert.js
@@ -43,14 +43,9 @@ function isOwnDependency(packageName) {
   }
 }
 
-function isNotSymlinked(packageName) {
+function isSymlinked(packageName) {
   const packagePath = path.resolve(process.cwd(), 'node_modules', packageName);
-  if (isSymlink.sync(packagePath)) {
-    exitWith(
-      `Package ${packageName} appears to be symlinked. ` +
-      'Overwriting symlinks is not currently supported. Unlink package and try again.'
-    );
-  }
+  return isSymlink.sync(packagePath)
 }
 
 module.exports = {
@@ -59,5 +54,5 @@ module.exports = {
   whackageJsonDoesntExist,
   isValidModule,
   isOwnDependency,
-  isNotSymlinked
+  isSymlinked
 };
diff --git a/src/util/start-server.js b/src/util/start-server.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs-extra');
 const chokidar = require('chokidar');
 const assert = require('./assert');
 const syncAll = require('./sync-all');
@@ -32,7 +33,10 @@ module.exports = function startServer() {
   // initial sync
   for (const key in packageLookup) {
     if (packageLookup.hasOwnProperty(key)) {
-      assert.isNotSymlinked(packageLookup[key]);
+      if (assert.isSymlinked(packageLookup[key])) {
+        const packagePath = path.resolve(process.cwd(), 'node_modules', packageLookup[key]);
+        fs.removeSync(packagePath);
+      }
       syncAll(ROOT_PATH, key, packageLookup[key], exclude);
     }
   }