use fs-extra copy instead of ncp

Closes #213, #150, #151
electron · Apr 11, 2016 · e502853 · e502853
1 parent 100c72b
commit e502853
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/docs/api.md b/docs/api.md
@@ -220,7 +220,7 @@ Object (also known as a "hash") of application metadata to embed into the execut
 
 ### `err`
 
-*Error* (or *Array*, in the case of an `ncp` error)
+*Error* (or *Array*, in the case of an `copy` error)
 
 Contains errors, if any.
 

diff --git a/mac.js b/mac.js
@@ -163,7 +163,7 @@ module.exports = {
               // Ignore error if icon doesn't exist, in case it's only available for other OS
               cb(null)
             } else {
-              ncp(icon, path.join(contentsPath, 'Resources', appPlist.CFBundleIconFile), cb)
+              fs.copy(icon, path.join(contentsPath, 'Resources', appPlist.CFBundleIconFile), cb)
             }
           })
         })
@@ -175,7 +175,7 @@ module.exports = {
         if (!Array.isArray(extras)) extras = [extras]
         extras.forEach(function (val) {
           operations.push(function (cb) {
-            ncp(val, path.join(contentsPath, 'Resources', path.basename(val)), cb)
+            fs.copy(val, path.join(contentsPath, 'Resources', path.basename(val)), cb)
           })
         })
       }

diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "fs-extra": "^0.26.5",
     "get-package-info": "0.0.2",
     "minimist": "^1.1.1",
-    "ncp": "^2.0.0",
     "object-assign": "^4.0.1",
     "plist": "^1.1.0",
     "rcedit": "^0.5.0",

diff --git a/test/basic.js b/test/basic.js
@@ -398,7 +398,7 @@ function createIgnoreOutDirTest (opts, distPath) {
 
     series([
       function (cb) {
-        ncp(path.join(__dirname, 'fixtures', 'basic'), appDir, {dereference: true, stopOnErr: true, filter: function (file) {
+        fs.copy(path.join(__dirname, 'fixtures', 'basic'), appDir, {dereference: true, stopOnErr: true, filter: function (file) {
           return path.basename(file) !== 'node_modules'
         }}, cb)
       },
@@ -440,7 +440,7 @@ function createIgnoreImplicitOutDirTest (opts) {
 
     series([
       function (cb) {
-        ncp(path.join(__dirname, 'fixtures', 'basic'), appDir, {dereference: true, stopOnErr: true, filter: function (file) {
+        fs.copy(path.join(__dirname, 'fixtures', 'basic'), appDir, {dereference: true, stopOnErr: true, filter: function (file) {
           return path.basename(file) !== 'node_modules'
         }}, cb)
       },

diff --git a/test/fixtures/basic/package.json b/test/fixtures/basic/package.json
@@ -4,6 +4,8 @@
   "dependencies": {
     "run-series": "^1.1.1"
   },
+  "//": "ncp used to test https://github.com/electron-userland/electron-packager/pull/186",
+  "///": "(a module (with zero dependencies) that creates a file in node_modules/.bin)",
   "devDependencies": {
     "ncp": "^2.0.0",
     "run-waterfall": "^1.1.1",