From 2b77d8d42d40d579832948c6d54fb4af82e69bf2 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Thu, 6 Oct 2022 11:51:13 -0700
Subject: [PATCH 1/2] feat: use kubo-rpc-client

fixes https://github.com/ipfs/js-kubo-rpc-client/issues/37
---
 examples/browser-ipns-publish/package.json        | 2 +-
 examples/browser-ipns-publish/tests/test.js       | 4 ++--
 examples/http-client-browser-pubsub/package.json  | 3 ++-
 examples/http-client-browser-pubsub/tests/test.js | 4 +++-
 examples/http-client-name-api/package.json        | 2 +-
 examples/http-client-name-api/tests/test.js       | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json
index 852c589b..f9916ae3 100644
--- a/examples/browser-ipns-publish/package.json
+++ b/examples/browser-ipns-publish/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@libp2p/websockets": "^3.0.3",
     "ipfs-core": "^0.16.0",
-    "ipfs-http-client": "^58.0.0",
+    "kubo-rpc-client": "^1.0.1",
     "ipfs-utils": "^9.0.6",
     "ipns": "^2.0.3",
     "it-last": "^1.0.4",
diff --git a/examples/browser-ipns-publish/tests/test.js b/examples/browser-ipns-publish/tests/test.js
index 381a8107..b0ddcb1a 100644
--- a/examples/browser-ipns-publish/tests/test.js
+++ b/examples/browser-ipns-publish/tests/test.js
@@ -1,14 +1,14 @@
 import { test, expect } from '@playwright/test'
 import { playwright } from 'test-util-ipfs-example'
 import * as goIpfsModule from 'go-ipfs'
-import * as ipfsHttpModule from 'ipfs-http-client'
+import * as kuboRpcModule from 'kubo-rpc-client'
 
 // Setup
 const play = test.extend({
   ...playwright.servers(),
   ...playwright.daemons(
     {
-      ipfsHttpModule,
+      kuboRpcModule,
       ipfsBin: goIpfsModule.path(),
       args: [
         "--enable-pubsub-experiment",
diff --git a/examples/http-client-browser-pubsub/package.json b/examples/http-client-browser-pubsub/package.json
index c5366b63..9149d31d 100644
--- a/examples/http-client-browser-pubsub/package.json
+++ b/examples/http-client-browser-pubsub/package.json
@@ -15,7 +15,8 @@
   },
   "browserslist": "last 1 Chrome version",
   "dependencies": {
-    "ipfs-http-client": "^58.0.0"
+    "ipfs-http-client": "^58.0.0",
+    "kubo-rpc-client": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.14.8",
diff --git a/examples/http-client-browser-pubsub/tests/test.js b/examples/http-client-browser-pubsub/tests/test.js
index 93d6692d..0a4e300b 100644
--- a/examples/http-client-browser-pubsub/tests/test.js
+++ b/examples/http-client-browser-pubsub/tests/test.js
@@ -2,6 +2,7 @@ import { test } from '@playwright/test';
 import { playwright } from 'test-util-ipfs-example'
 import * as ipfsModule from 'ipfs'
 import * as ipfsHttpModule from 'ipfs-http-client'
+import * as kuboRpcModule from 'kubo-rpc-client'
 import * as goIpfsModule from 'go-ipfs'
 
 // Setup
@@ -9,14 +10,15 @@ const play = test.extend({
   ...playwright.servers(),
   ...playwright.daemons(
     {
-      ipfsHttpModule,
     },
     {
       js: {
+        ipfsHttpModule,
         ipfsBin: ipfsModule.path()
       },
       go: {
         ipfsBin: goIpfsModule.path(),
+        kuboRpcModule,
         args: ['--enable-pubsub-experiment']
       }
     },
diff --git a/examples/http-client-name-api/package.json b/examples/http-client-name-api/package.json
index 10128cae..995a5ba2 100644
--- a/examples/http-client-name-api/package.json
+++ b/examples/http-client-name-api/package.json
@@ -15,7 +15,7 @@
   },
   "browserslist": "last 1 Chrome version",
   "dependencies": {
-    "ipfs-http-client": "^58.0.0"
+    "kubo-rpc-client": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.14.8",
diff --git a/examples/http-client-name-api/tests/test.js b/examples/http-client-name-api/tests/test.js
index 4f6e3d73..a852f036 100644
--- a/examples/http-client-name-api/tests/test.js
+++ b/examples/http-client-name-api/tests/test.js
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { playwright } from 'test-util-ipfs-example';
-import * as ipfsHttpModule from 'ipfs-http-client'
+import * as kuboRpcModule from 'kubo-rpc-client'
 import * as goIpfsModule from 'go-ipfs'
 
 // Setup
@@ -8,7 +8,7 @@ const play = test.extend({
   ...playwright.servers(),
   ...playwright.daemons(
     {
-      ipfsHttpModule,
+      kuboRpcModule,
       ipfsBin: goIpfsModule.path(),
       args: ['--enable-pubsub-experiment']
     },

From 770401813d56112bd7ecd7701e2dbef58ccd6c77 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Fri, 14 Oct 2022 13:19:07 -0700
Subject: [PATCH 2/2] fix(http-client-name-api): re-add ipfs-http-client

---
 examples/http-client-name-api/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/http-client-name-api/package.json b/examples/http-client-name-api/package.json
index 995a5ba2..ca49ba5b 100644
--- a/examples/http-client-name-api/package.json
+++ b/examples/http-client-name-api/package.json
@@ -15,6 +15,7 @@
   },
   "browserslist": "last 1 Chrome version",
   "dependencies": {
+    "ipfs-http-client": "^58.0.0",
     "kubo-rpc-client": "^1.0.1"
   },
   "devDependencies": {