fix: remove node globals

still work in progress, needs ipfs-repo first

Author: hugomrdias

Diff for: package.json

@@ -22,7 +22,8 @@
   "browser": {
     "./src/endpoint/server.js": "./src/endpoint/server.browser.js",
     "./src/utils.js": "./src/utils.browser.js",
-    "./src/ipfsd-daemon.js": "./src/ipfsd-client.js"
+    "./src/ipfsd-daemon.js": "./src/ipfsd-client.js",
+    "go-ipfs-dep": false
   },
   "husky": {
     "hooks": {

Diff for: test/controller.spec.js

@@ -8,6 +8,9 @@ const chaiPromise = require('chai-as-promised')
 const { createFactory, createController } = require('../src')
 const { repoExists } = require('../src/utils')
 const { isBrowser, isWebWorker, isNode } = require('ipfs-utils/src/env')
+const pathJoin = require('ipfs-utils/src/path-join')
+
+/** @typedef {import("../src/index").ControllerOptions} ControllerOptions */
 
 const expect = chai.expect
 chai.use(dirtyChai)
@@ -52,14 +55,11 @@ describe('Controller API', function () {
 
   const factory = createFactory({
     test: true,
-    ipfsHttpModule: require('ipfs-http-client')
+    ipfsHttpModule: require('ipfs-http-client'),
+    ipfsModule: require('ipfs')
   }, {
     js: {
-      ipfsBin: require.resolve('ipfs/src/cli/bin.js'),
-      ipfsModule: require('ipfs')
-    },
-    proc: {
-      ipfsModule: require('ipfs')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
     },
     go: {
       ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined
@@ -238,7 +238,10 @@ describe('Controller API', function () {
         it(`type: ${opts.type} remote: ${Boolean(opts.remote)}`, async () => {
           const ctl = await factory.spawn(merge(opts, {
             disposable: false,
-            test: true
+            test: true,
+            ipfsOptions: {
+              repo: await factory.tmpDir()
+            }
           }))
 
           await ctl.init()

Diff for: test/create.spec.js

@@ -4,6 +4,7 @@
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const { isNode, isBrowser, isWebWorker } = require('ipfs-utils/src/env')
+const pathJoin = require('ipfs-utils/src/path-join')
 const { createFactory, createController, createServer } = require('../src')
 const Client = require('../src/ipfsd-client')
 const Daemon = require('../src/ipfsd-daemon')
@@ -19,7 +20,7 @@ describe('`createController` should return the correct class', () => {
       disposable: false,
       ipfsModule: require('ipfs'),
       ipfsHttpModule: require('ipfs-http-client'),
-      ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
     })
 
     if (!isNode) {
@@ -54,7 +55,7 @@ describe('`createController` should return the correct class', () => {
       disposable: false,
       ipfsModule: require('ipfs'),
       ipfsHttpModule: require('ipfs-http-client'),
-      ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
     })
 
     expect(f).to.be.instanceOf(Client)
@@ -70,7 +71,7 @@ const types = [{
   type: 'js',
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined,
@@ -87,7 +88,7 @@ const types = [{
   test: true,
   remote: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined,

Diff for: test/factory.spec.js

@@ -4,6 +4,7 @@
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const { isNode } = require('ipfs-utils/src/env')
+const pathJoin = require('ipfs-utils/src/path-join')
 const { createFactory } = require('../src')
 
 const expect = chai.expect
@@ -18,7 +19,7 @@ const types = [{
   type: 'js',
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined,
@@ -35,7 +36,7 @@ const types = [{
   remote: true,
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs-dep').path() : undefined,
@@ -92,7 +93,7 @@ describe('`Factory spawn()` ', function () {
           remote: opts.remote,
           ipfsModule: require('ipfs'),
           ipfsHttpModule: require('ipfs-http-client'),
-          ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+          ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
         })
         expect(ctl).to.exist()
         expect(ctl.opts.test).to.be.true()