Skip to content

Commit

Permalink
Upgrade dependencies, move to Yarn 4.x
Browse files Browse the repository at this point in the history
Remove NPM packages 'blake3' and 'sodium'. They were unmaintained and
weren't building.
  • Loading branch information
cakoose committed Feb 2, 2024
1 parent 451976d commit 6c7bff1
Show file tree
Hide file tree
Showing 9 changed files with 3,276 additions and 1,437 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Yarn
/node_modules
/yarn-error.log
/.pnp.*
/.yarn/*
!/.yarn/patches
!/.yarn/plugins
!/.yarn/releases
!/.yarn/sdks
!/.yarn/versions

# TypeScript build output
/dist
Expand Down
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.1.0.cjs
22 changes: 0 additions & 22 deletions impls/blake3.ts

This file was deleted.

2 changes: 1 addition & 1 deletion impls/node-crypto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const register = async (r: Registry): Promise<void> => {
try {
plainTextFinal = decipher.final();
} catch (err) {
if (err.message === AEAD_AUTH_FAILED_EXCEPTION_MESSAGE) return null;
if ((err as any).message === AEAD_AUTH_FAILED_EXCEPTION_MESSAGE) return null;
throw err;
}
assert(plainTextFinal.length === 0);
Expand Down
107 changes: 0 additions & 107 deletions impls/sodium.ts

This file was deleted.

4 changes: 0 additions & 4 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ import {Algo, HashImpl, Registry} from './impl';

import {register as registerBlake2} from './impls/blake2';
import {register as registerBlake2Wasm} from './impls/blake2.wasm';
import {register as registerBlake3} from './impls/blake3';
import {register as registerChachaNative} from './impls/chacha-native';
import {register as registerEd25519Supercop} from './impls/ed25519-supercop';
import {register as registerJsSha3} from './impls/js-sha3';
import {register as registerJssha} from './impls/jssha';
import {register as registerKeccak} from './impls/keccak';
import {register as registerNodeCrypto} from './impls/node-crypto';
import {register as registerSha3} from './impls/sha3';
import {register as registerSodium} from './impls/sodium';
import {register as registerSodiumNative} from './impls/sodium-native';

const BIG_INPUT_THRESHOLD = 4 * 1024;
Expand Down Expand Up @@ -51,15 +49,13 @@ async function mainAsync(progName: string, args: Array<string>) {

await registerBlake2(r);
await registerBlake2Wasm(r);
await registerBlake3(r);
await registerChachaNative(r);
await registerEd25519Supercop(r);
await registerJsSha3(r);
await registerJssha(r);
await registerKeccak(r);
await registerNodeCrypto(r);
await registerSha3(r);
await registerSodium(r);
await registerSodiumNative(r);

r.hashAlgos.sort(compareAlgos);
Expand Down
45 changes: 24 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,34 @@
"dependencies": {
"argparse": "2.0.1",
"benchmark": "2.1.4",
"blake2": "4.0.2",
"blake2": "5.0.0",
"blake2.wasm": "0.1.0",
"blake3": "2.1.4",
"chacha-native": "2.0.3",
"ed25519-supercop": "2.0.1",
"js-sha3": "0.8.0",
"jssha": "3.2.0",
"keccak": "3.0.1",
"semver": "7.3.5",
"js-sha3": "0.9.3",
"jssha": "3.3.1",
"keccak": "3.0.4",
"semver": "7.5.4",
"sha3": "2.1.4",
"sodium": "3.0.2",
"sodium-native": "3.2.1"
"sodium-native": "4.0.6"
},
"devDependencies": {
"@types/argparse": "2.0.8",
"@types/benchmark": "2.1.0",
"@types/ed25519": "0.0.0",
"@types/node": "14.14.31",
"@types/semver": "7.3.6",
"@typescript-eslint/eslint-plugin": "4.26.0",
"@typescript-eslint/parser": "4.26.0",
"eslint": "7.27.0",
"microtime": "^3.0.0",
"source-map-support": "0.5.19",
"ts-node": "10.0.0",
"typescript": "4.3.2"
}
"@types/argparse": "2.0.14",
"@types/benchmark": "2.1.5",
"@types/ed25519": "0.0.3",
"@types/node": "20.11.16",
"@types/semver": "7.5.6",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"eslint": "8.56.0",
"microtime": "^3.1.1",
"source-map-support": "0.5.21",
"ts-node": "10.9.2",
"typescript": "5.3.3"
},
"resolutions": {
"@c4312/blake3-internal": "3.0.0",
"node-gyp-build": "4.8.0"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 6c7bff1

Please sign in to comment.