Skip to content

Commit d60ea06

Browse files
rvaggrvagg
committed
fix: add "browser" field, remove named local imports
1 parent f2ae077 commit d60ea06

10 files changed

+67
-45
lines changed

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@
144144
"import": "./src/traversal.js"
145145
}
146146
},
147+
"browser": {
148+
"./hashes/sha2": "./src/hashes/sha2-browser.js",
149+
"./src/hashes/sha2.js": "./src/hashes/sha2-browser.js"
150+
},
147151
"eslintConfig": {
148152
"extends": "ipfs",
149153
"parserOptions": {
@@ -244,7 +248,6 @@
244248
"test:browser": "aegir test --target browser"
245249
},
246250
"devDependencies": {
247-
"@ipld/dag-pb": "^2.1.14",
248251
"@stablelib/sha256": "^1.0.1",
249252
"@stablelib/sha512": "^1.0.1",
250253
"@types/chai": "^4.3.0",

‎test/test-block.spec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* globals describe, it */
2-
import * as codec from 'multiformats/codecs/json'
3-
import { sha256 as hasher } from 'multiformats/hashes/sha2'
4-
import * as main from 'multiformats/block'
5-
import { CID, bytes } from 'multiformats'
2+
import * as codec from '../src/codecs/json.js'
3+
import { sha256 as hasher } from '../src/hashes/sha2.js'
4+
import * as main from '../src/block.js'
5+
import { CID, bytes } from '../src/index.js'
66
import chai from 'chai'
77
import chaiAsPromised from 'chai-as-promised'
88

‎test/test-bytes.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* globals describe, it */
2-
import * as bytes from 'multiformats/bytes'
2+
import * as bytes from '../src/bytes.js'
33
import { assert } from 'chai'
44

55
describe('bytes', () => {

‎test/test-cid.spec.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* globals describe, it */
22

3-
import OLDCID from 'cids'
4-
import { fromHex, toHex, equals } from 'multiformats/bytes'
5-
import { varint, CID } from 'multiformats'
6-
import { base58btc } from 'multiformats/bases/base58'
7-
import { base32 } from 'multiformats/bases/base32'
8-
import { base64 } from 'multiformats/bases/base64'
9-
import { sha256, sha512 } from 'multiformats/hashes/sha2'
3+
import { fromHex, toHex, equals } from '../src/bytes.js'
4+
import { varint, CID } from '../src/index.js'
5+
import { base58btc } from '../src/bases/base58.js'
6+
import { base32 } from '../src/bases/base32.js'
7+
import { base64 } from '../src/bases/base64.js'
8+
import { sha256, sha512 } from '../src/hashes/sha2.js'
109
import invalidMultihash from './fixtures/invalid-multihash.js'
10+
import OLDCID from 'cids'
1111
import chai from 'chai'
1212
import chaiAsPromised from 'chai-as-promised'
1313
// Linter can see that API is used in types.

‎test/test-link.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* globals describe, it */
22

3-
import * as Link from 'multiformats/link'
4-
import { CID } from 'multiformats'
3+
import * as Link from '../src/link.js'
4+
import { CID } from '../src/cid.js'
55
import chai from 'chai'
66
import chaiAsPromised from 'chai-as-promised'
7-
import { sha256 } from 'multiformats/hashes/sha2'
7+
import { sha256 } from '../src/hashes/sha2.js'
88

99
chai.use(chaiAsPromised)
1010
const { assert } = chai

‎test/test-multibase-spec.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22

3-
import { bases } from 'multiformats/basics'
4-
import { fromString } from 'multiformats/bytes'
3+
import { bases } from '../src/basics.js'
4+
import { fromString } from '../src/bytes.js'
55
import chai from 'chai'
66
import chaiAsPromised from 'chai-as-promised'
77

‎test/test-multibase.spec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* globals describe, it */
2-
import * as bytes from 'multiformats/bytes'
3-
import * as b2 from 'multiformats/bases/base2'
4-
import * as b8 from 'multiformats/bases/base8'
5-
import * as b10 from 'multiformats/bases/base10'
6-
import * as b16 from 'multiformats/bases/base16'
7-
import * as b32 from 'multiformats/bases/base32'
8-
import * as b36 from 'multiformats/bases/base36'
9-
import * as b58 from 'multiformats/bases/base58'
10-
import * as b64 from 'multiformats/bases/base64'
2+
import * as bytes from '../src/bytes.js'
3+
import * as b2 from '../src/bases/base2.js'
4+
import * as b8 from '../src/bases/base8.js'
5+
import * as b10 from '../src/bases/base10.js'
6+
import * as b16 from '../src/bases/base16.js'
7+
import * as b32 from '../src/bases/base32.js'
8+
import * as b36 from '../src/bases/base36.js'
9+
import * as b58 from '../src/bases/base58.js'
10+
import * as b64 from '../src/bases/base64.js'
1111
import chai from 'chai'
1212
import chaiAsPromised from 'chai-as-promised'
1313

‎test/test-multicodec.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* globals describe, it */
2-
import * as bytes from 'multiformats/bytes'
3-
import * as raw from 'multiformats/codecs/raw'
4-
import * as json from 'multiformats/codecs/json'
2+
import * as bytes from '../src/bytes.js'
3+
import * as raw from '../src/codecs/raw.js'
4+
import * as json from '../src/codecs/json.js'
55
import chai from 'chai'
66
import chaiAsPromised from 'chai-as-promised'
77

‎test/test-multihash.spec.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* globals describe, it */
2-
import { fromHex, fromString } from 'multiformats/bytes'
3-
import { hash as slSha256 } from '@stablelib/sha256'
4-
import { hash as slSha512 } from '@stablelib/sha512'
2+
import { fromHex, fromString } from '../src/bytes.js'
3+
import { sha256, sha512 } from '../src/hashes/sha2.js'
4+
import { identity } from '../src/hashes/identity.js'
5+
import { decode as decodeDigest, create as createDigest } from '../src/hashes/digest.js'
56
import valid from './fixtures/valid-multihash.js'
67
import invalid from './fixtures/invalid-multihash.js'
7-
import { sha256, sha512 } from 'multiformats/hashes/sha2'
8-
import { identity } from 'multiformats/hashes/identity'
9-
import { decode as decodeDigest, create as createDigest } from 'multiformats/hashes/digest'
8+
import { hash as slSha256 } from '@stablelib/sha256'
9+
import { hash as slSha512 } from '@stablelib/sha512'
1010
import chai from 'chai'
1111
import chaiAsPromised from 'chai-as-promised'
1212

‎test/test-traversal.spec.js‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
11
/* globals describe, it */
2-
import * as codec from 'multiformats/codecs/json'
3-
import * as dagPB from '@ipld/dag-pb'
4-
import { sha256 as hasher } from 'multiformats/hashes/sha2'
5-
import * as main from 'multiformats/block'
6-
import { walk } from 'multiformats/traversal'
2+
import * as codec from '../src/codecs/json.js'
3+
import { sha256 as hasher } from '../src/hashes/sha2.js'
4+
import * as main from '../src/block.js'
5+
import { walk } from '../src/traversal.js'
6+
import { fromString } from '../src/bytes.js'
77
import { assert } from 'chai'
8-
import { fromString } from 'multiformats/bytes'
98

10-
const { createLink, createNode } = dagPB
9+
/** @typedef {import('../src/cid.js').CID} CID */
10+
11+
// from dag-pb, simplified
12+
/**
13+
* @param {Uint8Array} data
14+
* @param {{Hash:CID, Name:string, Tsize:number}[]} links
15+
* @returns {{Data:Uint8Array, Links:{Hash:CID, Name:string, Tsize:number}[]}}
16+
*/
17+
function createNode (data, links) {
18+
return { Data: data, Links: links }
19+
}
20+
21+
/**
22+
* @param {string} name
23+
* @param {number} size
24+
* @param {CID} cid
25+
* @returns {{Hash:CID, Name:string, Tsize:number}}
26+
*/
27+
function createLink (name, size, cid) {
28+
return { Hash: cid, Name: name, Tsize: size }
29+
}
1130

1231
describe('traversal', () => {
1332
describe('walk', async () => {
@@ -43,7 +62,7 @@ describe('traversal', () => {
4362
const cidA = blockA.cid
4463

4564
/**
46-
* @param {import('multiformats').CID} cid
65+
* @param {CID} cid
4766
*/
4867
const load = async (cid) => {
4968
if (cid.equals(cidE)) {
@@ -70,7 +89,7 @@ describe('traversal', () => {
7089
*/
7190
const loadWrapper = (load, arr = []) =>
7291
/**
73-
* @param {import('multiformats').CID} cid
92+
* @param {CID} cid
7493
*/
7594
(cid) => {
7695
arr.push(cid.toString())

0 commit comments

Comments
 (0)