fix: resolve ERR_PACKAGE_PATH_NOT_EXPORTED in electron

.aegir.cjs

@@ -3,7 +3,7 @@
 const path = require('path')
 const signaller = require('libp2p-webrtc-star-signalling-server')
 
-/** @type {import('aegir').Options["build"]["config"]} */
+/** @type {import('esbuild').BuildOptions} */
 const esbuild = {
   inject: [path.join(__dirname, 'scripts/node-globals.js')],
   plugins: [

.github/workflows/test.yml

@@ -114,6 +114,9 @@ jobs:
         type:
           - electron-main
           - electron-renderer
+        moduleType:
+          - cjs
+          - esm
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -130,7 +133,7 @@ jobs:
             ./scripts/custom-runtime.sh
       - uses: GabrielBB/xvfb-action@v1
         with:
-          run: npm run test -- -t ${{ matrix.type }} --bail -f dist/cjs/node-test/*js
+          run: npm run test -- -t ${{ matrix.type }} --bail -f dist/${{matrix.moduleType}}/node-test/*js
 
   release:
     needs: [test-node, test-browser, test-electron]

package.json

@@ -200,7 +200,8 @@
   "devDependencies": {
     "go-ipfs": "^0.12.2",
     "ipfs": "^0.61.0",
-    "ipfs-http-client": "^55.0.0"
+    "ipfs-http-client": "^55.0.0",
+    "ipfsd-ctl-wrapper": "file:test/packages/ipfsd-ctl-wrapper"
   },
   "browser": {
     "go-ipfs": false,

test/packages/ipfsd-ctl-wrapper/cjs-index.cjs

@@ -0,0 +1 @@
+module.exports = async () => await import('ipfsd-ctl')

test/packages/ipfsd-ctl-wrapper/esm-index.mjs

@@ -0,0 +1,5 @@
+import * as ipfsdCtl from 'ipfsd-ctl'
+
+// export default ipfsdCtl
+// export const createFactory = ipfsdCtl.createFactory
+export default async () => ipfsdCtl

test/packages/ipfsd-ctl-wrapper/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "ipfsd-ctl-wrapper",
+  "exports": {
+    ".": {
+      "import": "./esm-index.mjs",
+      "require": "./cjs-index.cjs",
+      "default": "./cjs-index.cjs"
+    }
+  }
+}

test/pubsub.js

@@ -76,7 +76,7 @@ describe('pubsub', function () {
         const data = uint8ArrayFromString('hello world')
         const topic = 'pubsub-ascii'
 
-        const subscriber = () => new Promise((resolve) => {
+        const subscriber = () => /** @type {Promise<void>} */(new Promise((resolve) => {
           daemon2.api.pubsub.subscribe(topic, (msg) => {
             expect(uint8ArrayEquals(data, msg.data)).to.be.true()
             expect(msg).to.have.property('seqno')
@@ -85,7 +85,7 @@ describe('pubsub', function () {
             expect(msg).to.have.property('from', daemon1.peer.id)
             resolve()
           })
-        })
+        }))
 
         const publisher = async () => {
           await waitForTopicPeer(topic, daemon2.peer, daemon1)
@@ -102,7 +102,7 @@ describe('pubsub', function () {
         const data = uint8ArrayFromString('你好世界 zażółć gęślą jaźń')
         const topic = 'pubsub-non-ascii'
 
-        const subscriber = () => new Promise((resolve) => {
+        const subscriber = () => /** @type {Promise<void>} */(new Promise((resolve) => {
           daemon2.api.pubsub.subscribe(topic, (msg) => {
             expect(uint8ArrayEquals(data, msg.data)).to.be.true()
             expect(msg).to.have.property('seqno')
@@ -111,7 +111,7 @@ describe('pubsub', function () {
             expect(msg).to.have.property('from', daemon1.peer.id)
             resolve()
           })
-        })
+        }))
 
         const publisher = async () => {
           await waitForTopicPeer(topic, daemon2.peer, daemon1)
@@ -128,7 +128,7 @@ describe('pubsub', function () {
         const data = uint8ArrayFromString('a36161636179656162830103056164a16466666666f400010203040506070809', 'base16')
         const topic = 'pubsub-binary'
 
-        const subscriber = () => new Promise((resolve) => {
+        const subscriber = () => /** @type {Promise<void>} */(new Promise((resolve) => {
           daemon2.api.pubsub.subscribe(topic, (msg) => {
             expect(uint8ArrayEquals(data, msg.data)).to.be.true()
             expect(msg).to.have.property('seqno')
@@ -137,7 +137,7 @@ describe('pubsub', function () {
             expect(msg).to.have.property('from', daemon1.peer.id)
             resolve()
           })
-        })
+        }))
 
         const publisher = async () => {
           await waitForTopicPeer(topic, daemon2.peer, daemon1)
@@ -154,7 +154,7 @@ describe('pubsub', function () {
         const data = uint8ArrayFromString('你好世界\nzażółć\r\ngęślą\njaźń')
         const topic = 'pubsub\n你好世界\r\njaźń'
 
-        const subscriber = () => new Promise((resolve) => {
+        const subscriber = () => /** @type {Promise<void>} */(new Promise((resolve) => {
           daemon2.api.pubsub.subscribe(topic, (msg) => {
             expect(uint8ArrayEquals(data, msg.data)).to.be.true()
             expect(msg).to.have.property('seqno')
@@ -163,7 +163,7 @@ describe('pubsub', function () {
             expect(msg).to.have.property('from', daemon1.peer.id)
             resolve()
           })
-        })
+        }))
 
         const publisher = async () => {
           await waitForTopicPeer(topic, daemon2.peer, daemon1)

test/utils/daemon-factory.js

@@ -1,10 +1,11 @@
 
-import { createFactory } from 'ipfsd-ctl'
 import isNode from 'detect-node'
+import ipfsdWrapper from 'ipfsd-ctl-wrapper'
 
 export async function daemonFactory () {
   let ipfsHttpModule
   let ipfsModule
+  const { createFactory } = await ipfsdWrapper()
 
   try {
     ipfsHttpModule = await import(process.env.IPFS_JS_HTTP_MODULE)

tsconfig.json

@@ -7,4 +7,4 @@
     "src",
     "test"
   ]
-}
+}