From d0e2eeadf71e17a354e97901b16c727dbc0662f8 Mon Sep 17 00:00:00 2001 From: Steven Vandevelde Date: Wed, 13 Dec 2023 14:57:06 +0100 Subject: [PATCH] refactor: clean up dependencies --- packages/nest/package.json | 12 +++++------- packages/nest/src/crypto-browser.ts | 1 + packages/nest/src/crypto.ts | 3 +++ packages/nest/src/rng.ts | 2 +- packages/nest/src/root-tree/basic.ts | 2 +- pnpm-lock.yaml | 24 +----------------------- 6 files changed, 12 insertions(+), 32 deletions(-) create mode 100644 packages/nest/src/crypto-browser.ts create mode 100644 packages/nest/src/crypto.ts diff --git a/packages/nest/package.json b/packages/nest/package.json index 7d83fd5..e216c1a 100644 --- a/packages/nest/package.json +++ b/packages/nest/package.json @@ -3,12 +3,12 @@ "type": "module", "version": "0.0.1", "description": "Example package description.", - "author": "Hugo Dias (hugodias.me)", + "author": "Steven Vandevelde (tokono.ma)", "license": "(Apache-2.0 AND MIT)", - "homepage": "https://github.com/fission-codes/js-template/tree/main/packages/package1", + "homepage": "https://github.com/wnfs-wg/nest/tree/main/packages/nest", "repository": { - "url": "fission-codes/js-template", - "directory": "packages/package1" + "url": "wnfs-wg/nest", + "directory": "packages/nest" }, "exports": { ".": { @@ -41,7 +41,6 @@ "test:browser": "playwright-test 'test/**/!(*.node).test.ts' --timeout 30000" }, "dependencies": { - "@ipld/dag-cbor": "^9.0.6", "@ipld/dag-pb": "^4.0.6", "compare-versions": "^6.1.0", "debounce": "^2.0.0", @@ -50,11 +49,10 @@ "ipfs-unixfs": "^11.1.0", "ipfs-unixfs-exporter": "^13.2.2", "ipfs-unixfs-importer": "^15.2.1", - "iso-base": "^2.0.1", "it-all": "^3.0.4", "multiformats": "^12.1.3", "uint8arrays": "^5.0.0", - "wnfs": "^0.1.27" + "wnfs": "0.1.27" }, "devDependencies": { "@types/assert": "^1.5.9", diff --git a/packages/nest/src/crypto-browser.ts b/packages/nest/src/crypto-browser.ts new file mode 100644 index 0000000..12ecc0f --- /dev/null +++ b/packages/nest/src/crypto-browser.ts @@ -0,0 +1 @@ +export const webcrypto = globalThis.crypto diff --git a/packages/nest/src/crypto.ts b/packages/nest/src/crypto.ts new file mode 100644 index 0000000..aeef901 --- /dev/null +++ b/packages/nest/src/crypto.ts @@ -0,0 +1,3 @@ +import crypto from 'crypto' + +export const webcrypto = /** @type {Crypto} */ crypto.webcrypto diff --git a/packages/nest/src/rng.ts b/packages/nest/src/rng.ts index 7fad503..1a48071 100644 --- a/packages/nest/src/rng.ts +++ b/packages/nest/src/rng.ts @@ -1,4 +1,4 @@ -import { webcrypto } from 'iso-base/crypto' +import { webcrypto } from './crypto.js' export interface Rng { randomBytes: (count: number) => Uint8Array diff --git a/packages/nest/src/root-tree/basic.ts b/packages/nest/src/root-tree/basic.ts index 90a44e2..e10549c 100644 --- a/packages/nest/src/root-tree/basic.ts +++ b/packages/nest/src/root-tree/basic.ts @@ -5,7 +5,6 @@ import * as DagPB from '@ipld/dag-pb' import * as Raw from 'multiformats/codecs/raw' import * as Uint8Arrays from 'uint8arrays' -import { webcrypto } from 'iso-base/crypto' import { CID } from 'multiformats/cid' import { PrivateForest, PublicDirectory } from 'wnfs' @@ -20,6 +19,7 @@ import type { FileSystemChange } from '../types.js' import { RootBranch } from '../path.js' import { makeRngInterface } from '../rng.js' +import { webcrypto } from '../crypto.js' // CLASS diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 331d856..979c725 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,9 +57,6 @@ importers: packages/nest: dependencies: - '@ipld/dag-cbor': - specifier: ^9.0.6 - version: 9.0.6 '@ipld/dag-pb': specifier: ^4.0.6 version: 4.0.6 @@ -84,9 +81,6 @@ importers: ipfs-unixfs-importer: specifier: ^15.2.1 version: 15.2.1 - iso-base: - specifier: ^2.0.1 - version: 2.0.1 it-all: specifier: ^3.0.4 version: 3.0.4 @@ -97,7 +91,7 @@ importers: specifier: ^5.0.0 version: 5.0.0 wnfs: - specifier: ^0.1.27 + specifier: 0.1.27 version: 0.1.27 devDependencies: '@types/assert': @@ -1857,18 +1851,9 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: true - /base-x@4.0.0: - resolution: {integrity: sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==} - dev: false - /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - /bigint-mod-arith@3.3.1: - resolution: {integrity: sha512-pX/cYW3dCa87Jrzv6DAr8ivbbJRzEX5yGhdt8IutnX/PCIXfpx+mabWNK/M8qqh+zQ0J3thftUBHW0ByuUlG0w==} - engines: {node: '>=10.4.0'} - dev: false - /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} @@ -3867,13 +3852,6 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true - /iso-base@2.0.1: - resolution: {integrity: sha512-ip0nUW9oZP+LG6mslSgdJPt9NWZOq1qIOKpoUIdm8sq/87VwY8WZXw9ptCkhdJclY+r4feFbZuu9P/OFDqCvkQ==} - dependencies: - base-x: 4.0.0 - bigint-mod-arith: 3.3.1 - dev: false - /istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'}