From 301e0fcb8941c0a517d270c9b731b24cbdf00eb9 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 24 Jan 2024 18:05:48 +0000 Subject: [PATCH] fix: allow import memory store in the browser (#1276) `stores.js` was importing code that uses nodejs modules and is not bundleable.... refs https://github.com/web3-storage/w3up/issues/1274#issuecomment-1907561703 --- packages/w3up-client/README.md | 2 +- packages/w3up-client/package.json | 16 ++++++++++++++-- packages/w3up-client/src/stores.js | 5 ----- packages/w3up-client/src/stores/conf.js | 1 + packages/w3up-client/src/stores/index.js | 5 +++++ packages/w3up-client/src/stores/indexeddb.js | 1 + packages/w3up-client/src/stores/memory.js | 1 + 7 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 packages/w3up-client/src/stores.js create mode 100644 packages/w3up-client/src/stores/conf.js create mode 100644 packages/w3up-client/src/stores/index.js create mode 100644 packages/w3up-client/src/stores/indexeddb.js create mode 100644 packages/w3up-client/src/stores/memory.js diff --git a/packages/w3up-client/README.md b/packages/w3up-client/README.md index 51b218b4e..11e0d2a99 100644 --- a/packages/w3up-client/README.md +++ b/packages/w3up-client/README.md @@ -180,7 +180,7 @@ import * as Signer from '@ucanto/principal/ed25519' // Agents on Node should use import { importDAG } from '@ucanto/core/delegation' import { CarReader } from '@ipld/car' import * as Client from '@web3-storage/w3up-client' -import { StoreMemory } from '@web3-storage/w3up-client/stores' +import { StoreMemory } from '@web3-storage/w3up-client/stores/memory' async function main () { // from "bring your own Agent" example in `Creating a client object" section` diff --git a/packages/w3up-client/package.json b/packages/w3up-client/package.json index 1df10d7e4..f8db20db6 100644 --- a/packages/w3up-client/package.json +++ b/packages/w3up-client/package.json @@ -69,8 +69,20 @@ "import": "./dist/src/capability/usage.js" }, "./stores": { - "types": "./dist/src/stores.d.ts", - "import": "./dist/src/stores.js" + "types": "./dist/src/stores/index.d.ts", + "import": "./dist/src/stores/index.js" + }, + "./stores/conf": { + "types": "./dist/src/stores/conf.d.ts", + "import": "./dist/src/stores/conf.js" + }, + "./stores/indexeddb": { + "types": "./dist/src/stores/indexeddb.d.ts", + "import": "./dist/src/stores/indexeddb.js" + }, + "./stores/memory": { + "types": "./dist/src/stores/memory.d.ts", + "import": "./dist/src/stores/memory.js" }, "./types": "./dist/src/types.js" }, diff --git a/packages/w3up-client/src/stores.js b/packages/w3up-client/src/stores.js deleted file mode 100644 index 801b6cdb2..000000000 --- a/packages/w3up-client/src/stores.js +++ /dev/null @@ -1,5 +0,0 @@ -import { StoreMemory } from '@web3-storage/access/stores/store-memory' -import { StoreIndexedDB } from '@web3-storage/access/stores/store-indexeddb' -import { StoreConf } from '@web3-storage/access/stores/store-conf' - -export { StoreConf, StoreIndexedDB, StoreMemory } diff --git a/packages/w3up-client/src/stores/conf.js b/packages/w3up-client/src/stores/conf.js new file mode 100644 index 000000000..809a4eb06 --- /dev/null +++ b/packages/w3up-client/src/stores/conf.js @@ -0,0 +1 @@ +export { StoreConf } from '@web3-storage/access/stores/store-conf' diff --git a/packages/w3up-client/src/stores/index.js b/packages/w3up-client/src/stores/index.js new file mode 100644 index 000000000..73d59123e --- /dev/null +++ b/packages/w3up-client/src/stores/index.js @@ -0,0 +1,5 @@ +import { StoreMemory } from './memory.js' +import { StoreIndexedDB } from './indexeddb.js' +import { StoreConf } from './conf.js' + +export { StoreConf, StoreIndexedDB, StoreMemory } diff --git a/packages/w3up-client/src/stores/indexeddb.js b/packages/w3up-client/src/stores/indexeddb.js new file mode 100644 index 000000000..93a0e31ff --- /dev/null +++ b/packages/w3up-client/src/stores/indexeddb.js @@ -0,0 +1 @@ +export { StoreIndexedDB } from '@web3-storage/access/stores/store-indexeddb' diff --git a/packages/w3up-client/src/stores/memory.js b/packages/w3up-client/src/stores/memory.js new file mode 100644 index 000000000..189451af6 --- /dev/null +++ b/packages/w3up-client/src/stores/memory.js @@ -0,0 +1 @@ +export { StoreMemory } from '@web3-storage/access/stores/store-memory'