Merge branch 'master' of github.com:MaiaVictor/swarm-js into Jonahss-…

…master
VictorTaelin · Aug 30, 2018 · 56da3d3 · 56da3d3
2 parents d5904f1 + 21bc9ed
commit 56da3d3
Show file tree

Hide file tree

Showing 15 changed files with 1,636 additions and 34 deletions.
diff --git a/examples/dapp_uploader_dapp/swarm.min.js b/examples/dapp_uploader_dapp/swarm.min.js
diff --git a/...ples/dapp_uploader_dapp/ethereum_icon.png → examples/uploader_dapp/ethereum_icon.png b/...ples/dapp_uploader_dapp/ethereum_icon.png → examples/uploader_dapp/ethereum_icon.png
diff --git a/examples/dapp_uploader_dapp/index.html → examples/uploader_dapp/index.html b/examples/dapp_uploader_dapp/index.html → examples/uploader_dapp/index.html
diff --git a/examples/dapp_uploader_dapp/index.js → examples/uploader_dapp/index.js b/examples/dapp_uploader_dapp/index.js → examples/uploader_dapp/index.js
diff --git a/examples/uploader_dapp/swarm.min.js b/examples/uploader_dapp/swarm.min.js
diff --git a/lib/api-browser.js b/lib/api-browser.js
@@ -2,7 +2,7 @@ var unavailable = function unavailable() {
   throw "This swarm.js function isn't available on the browser.";
 };
 
-var fsp = { readFile: unavailable };
+var fs = { readFile: unavailable };
 var files = { download: unavailable, safeDownloadArchived: unavailable, directoryTree: unavailable };
 var os = { platform: unavailable, arch: unavailable };
 var path = { join: unavailable, slice: unavailable };
@@ -17,7 +17,7 @@ var pick = require("./pick.js");
 var swarm = require("./swarm");
 
 module.exports = swarm({
-  fsp: fsp,
+  fs: fs,
   files: files,
   os: os,
   path: path,

diff --git a/lib/api-node.js b/lib/api-node.js
@@ -1,4 +1,4 @@
-var fsp = require("fs-promise");
+var fs = require("fs-extra");
 var files = require("./files.js");
 var os = require("os");
 var path = require("path");
@@ -25,7 +25,7 @@ var request = function request(url, params) {
 };
 
 module.exports = swarm({
-  fsp: fsp,
+  fs: fs,
   files: files,
   os: os,
   path: path,

diff --git a/lib/files.js b/lib/files.js
@@ -247,4 +247,4 @@ module.exports = {
   downloadArchived: downloadArchived,
   search: search,
   test: test
-};
+};
diff --git a/lib/swarm.js b/lib/swarm.js
@@ -3,7 +3,7 @@
 // separating the functions that are used on Node.js from the functions that
 // are used only on the browser.
 module.exports = function (_ref) {
-  var fsp = _ref.fsp,
+  var fs = _ref.fs,
       files = _ref.files,
       os = _ref.os,
       path = _ref.path,
@@ -253,7 +253,7 @@ module.exports = function (_ref) {
   // String -> String -> Promise String
   var uploadFileFromDisk = function uploadFileFromDisk(swarmUrl) {
     return function (filePath) {
-      return fsp.readFile(filePath).then(function (data) {
+      return fs.readFile(filePath).then(function (data) {
         return uploadFile(swarmUrl)({ type: mimetype.lookup(filePath), data: data });
       });
     };
@@ -282,7 +282,7 @@ module.exports = function (_ref) {
   // String -> Promise String
   var uploadDataFromDisk = function uploadDataFromDisk(swarmUrl) {
     return function (filePath) {
-      return fsp.readFile(filePath).then(uploadData(swarmUrl));
+      return fs.readFile(filePath).then(uploadData(swarmUrl));
     };
   };
 
@@ -292,7 +292,7 @@ module.exports = function (_ref) {
       return function (dirPath) {
         return files.directoryTree(dirPath).then(function (fullPaths) {
           return Promise.all(fullPaths.map(function (path) {
-            return fsp.readFile(path);
+            return fs.readFile(path);
           })).then(function (datas) {
             var paths = fullPaths.map(function (path) {
               return path.slice(dirPath.length);
@@ -622,4 +622,4 @@ module.exports = function (_ref) {
     fromString: fromString,
     toString: toString
   };
-};
+};