From 024992f3ce648511121d6783b8e80bd3e0e528c8 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Tue, 12 Nov 2024 21:26:32 +0900 Subject: [PATCH 1/3] base: remove top-level import_map.json. --- deno.json | 18 +++++++++++++++++- deno.lock | 17 +++++++++++++++++ import_map.json | 16 ---------------- packages/chacha20poly1305/deno.json | 2 +- packages/common/deno.json | 2 +- packages/core/deno.json | 2 +- packages/dhkem-secp256k1/deno.json | 2 +- packages/dhkem-x25519/deno.json | 2 +- packages/dhkem-x448/deno.json | 2 +- packages/hpke-js/deno.json | 2 +- packages/hybridkem-x-wing/deno.json | 2 +- packages/hybridkem-x25519-kyber768/deno.json | 2 +- packages/ml-kem/deno.json | 2 +- 13 files changed, 44 insertions(+), 27 deletions(-) delete mode 100644 import_map.json diff --git a/deno.json b/deno.json index ae369c7c5..425b35eda 100644 --- a/deno.json +++ b/deno.json @@ -20,6 +20,22 @@ "./packages/hpke-js/samples/deno", "./packages/ml-kem/samples/deno" ], + "imports": { + "@dajiaji/mlkem": "npm:mlkem@^2.3.0", + "@deno/dnt": "jsr:@deno/dnt@^0.41.3", + "@noble/ciphers/chacha": "npm:@noble/ciphers@^1.0.0/chacha", + "@noble/curves/ed25519": "npm:@noble/curves@^1.6.0/ed25519", + "@noble/curves/ed448": "npm:@noble/curves@^1.6.0/ed448", + "@noble/curves/secp256k1": "npm:@noble/curves@^1.6.0/secp256k1", + "@noble/hashes/hmac": "npm:@noble/hashes@^1.5.0/hmac", + "@noble/hashes/sha256": "npm:@noble/hashes@^1.5.0/sha256", + "@noble/hashes/sha512": "npm:@noble/hashes@^1.5.0/sha512", + "@noble/hashes/sha3": "npm:@noble/hashes@^1.5.0/sha3", + "@std/assert": "jsr:@std/assert@1.0.0", + "@std/fs": "jsr:@std/fs@^1.0.4", + "@std/path": "jsr:@std/path@^1.0.3", + "@std/testing/bdd": "jsr:@std/testing@^1.0.0/bdd" + }, "fmt": { "exclude": [ "npm/", @@ -50,7 +66,7 @@ }, "tasks": { "test:all": "deno task test && deno task npm && deno task test:cloudflare && deno task bun-link && deno task test:bun", - "test": "deno fmt && deno lint && deno test --import-map=./import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:common": "cd packages/common && deno task test", "test:core": "cd packages/core && deno task test", "test:chacha20poly1305": "cd packages/chacha20poly1305 && deno task test", diff --git a/deno.lock b/deno.lock index e560f61b0..dfe938902 100644 --- a/deno.lock +++ b/deno.lock @@ -46,6 +46,12 @@ "npm:mlkem@^2.3.0": "2.3.0" }, "jsr": { + "@dajiaji/mlkem@2.3.0": { + "integrity": "4c44a371b61d79fa128562c76634399c6f80a894bd01aeffbbda5aa6324b0b18", + "dependencies": [ + "npm:@noble/hashes@^1.5.0" + ] + }, "@david/code-block-writer@13.0.2": { "integrity": "14dd3baaafa3a2dea8bf7dfbcddeccaa13e583da2d21d666c01dc6d681cd74ad" }, @@ -312,6 +318,17 @@ "https://deno.land/x/hpke@1.2.9/x/hybridkem-x25519-kyber768/mod.ts": "4e2f654c400cae7dd5f0ba9657733f46059d57212a02064d48a4b855f2123189" }, "workspace": { + "dependencies": [ + "jsr:@deno/dnt@~0.41.3", + "jsr:@std/assert@1.0.0", + "jsr:@std/fs@^1.0.4", + "jsr:@std/path@^1.0.3", + "jsr:@std/testing@1", + "npm:@noble/ciphers@1", + "npm:@noble/curves@^1.6.0", + "npm:@noble/hashes@^1.5.0", + "npm:mlkem@^2.3.0" + ], "members": { "packages/chacha20poly1305": { "dependencies": [ diff --git a/import_map.json b/import_map.json deleted file mode 100644 index 4f4ab398d..000000000 --- a/import_map.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "imports": { - "@dajiaji/mlkem": "npm:mlkem@^2.3.0", - "@noble/ciphers/chacha": "npm:@noble/ciphers@^1.0.0/chacha", - "@noble/curves/ed25519": "npm:@noble/curves@^1.6.0/ed25519", - "@noble/curves/ed448": "npm:@noble/curves@^1.6.0/ed448", - "@noble/curves/secp256k1": "npm:@noble/curves@^1.6.0/secp256k1", - "@noble/hashes/hmac": "npm:@noble/hashes@^1.5.0/hmac", - "@noble/hashes/sha256": "npm:@noble/hashes@^1.5.0/sha256", - "@noble/hashes/sha512": "npm:@noble/hashes@^1.5.0/sha512", - "@noble/hashes/sha3": "npm:@noble/hashes@^1.5.0/sha3", - "@std/assert": "jsr:@std/assert@1.0.0", - "@std/path": "jsr:@std/path@^1.0.3", - "@std/testing/bdd": "jsr:@std/testing@^1.0.0/bdd" - } -} diff --git a/packages/chacha20poly1305/deno.json b/packages/chacha20poly1305/deno.json index e5cb2aca8..27b4f5cae 100644 --- a/packages/chacha20poly1305/deno.json +++ b/packages/chacha20poly1305/deno.json @@ -46,7 +46,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/chacha20poly1305 && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/common/deno.json b/packages/common/deno.json index 4b9bbf1f8..86e987855 100644 --- a/packages/common/deno.json +++ b/packages/common/deno.json @@ -40,7 +40,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "cov": "deno coverage ./coverage --lcov --exclude='test'", "dnt": "deno run --import-map=../../npm/import_map.json -A dnt.ts", "minify": "esbuild ../../npm/packages/common/esm/mod.js --bundle --format=esm --minify" diff --git a/packages/core/deno.json b/packages/core/deno.json index 8dad016ba..70c07e0f4 100644 --- a/packages/core/deno.json +++ b/packages/core/deno.json @@ -43,7 +43,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/core && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/dhkem-secp256k1/deno.json b/packages/dhkem-secp256k1/deno.json index 9795e225b..ecbe4d49c 100644 --- a/packages/dhkem-secp256k1/deno.json +++ b/packages/dhkem-secp256k1/deno.json @@ -46,7 +46,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/dhkem-secp256k1 && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/dhkem-x25519/deno.json b/packages/dhkem-x25519/deno.json index dea68bcee..a97fa5359 100644 --- a/packages/dhkem-x25519/deno.json +++ b/packages/dhkem-x25519/deno.json @@ -47,7 +47,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/dhkem-x25519 && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/dhkem-x448/deno.json b/packages/dhkem-x448/deno.json index 183c73c72..4c5b4f3e2 100644 --- a/packages/dhkem-x448/deno.json +++ b/packages/dhkem-x448/deno.json @@ -47,7 +47,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/dhkem-x448 && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/hpke-js/deno.json b/packages/hpke-js/deno.json index fde619cd9..4d19acfe9 100644 --- a/packages/hpke-js/deno.json +++ b/packages/hpke-js/deno.json @@ -46,7 +46,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link hpke-js && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/hybridkem-x-wing/deno.json b/packages/hybridkem-x-wing/deno.json index 5fa5ba769..10d27ed1e 100644 --- a/packages/hybridkem-x-wing/deno.json +++ b/packages/hybridkem-x-wing/deno.json @@ -47,7 +47,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/hybridkem-x-wing && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/hybridkem-x25519-kyber768/deno.json b/packages/hybridkem-x25519-kyber768/deno.json index e54a1623a..e863f5ca4 100644 --- a/packages/hybridkem-x25519-kyber768/deno.json +++ b/packages/hybridkem-x25519-kyber768/deno.json @@ -46,7 +46,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/hybridkem-x25519-kyber768 && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", diff --git a/packages/ml-kem/deno.json b/packages/ml-kem/deno.json index b035b90e6..b1bc94bb0 100644 --- a/packages/ml-kem/deno.json +++ b/packages/ml-kem/deno.json @@ -46,7 +46,7 @@ ] }, "tasks": { - "test": "deno fmt && deno lint && deno test --import-map=../../import_map.json --fail-fast --doc --coverage=coverage --cached-only --parallel --allow-read", + "test": "deno fmt && deno lint && deno test --fail-fast --doc --coverage=coverage --cached-only --parallel --allow-read", "test:cloudflare": "cd test/runtimes/cloudflare && npm install && npm link @hpke/common @hpke/ml-kem && npm run test", "test:bun": "cd test/runtimes/bun && bun install && bun test", "cov": "deno coverage ./coverage --lcov --exclude='test'", From 3adb815a314ab1f0279cf021af7ac0cad165ed11 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Tue, 12 Nov 2024 21:27:21 +0900 Subject: [PATCH 2/3] hybridkem-x-wing: add bun.lockb --- .../test/runtimes/bun/bun.lockb | Bin 3792 -> 3774 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/hybridkem-x-wing/test/runtimes/bun/bun.lockb b/packages/hybridkem-x-wing/test/runtimes/bun/bun.lockb index 558dbfccee637f47b004a441369a8b98d1b01aa8..509177fd1f7a24792b1285c3f9b9e41761f8bb8f 100755 GIT binary patch delta 364 zcmca0yH9q4o?_|dYYB;JE52_lZrbK?Y@rA%?}N4M3uaymwS6x5)6gweZ=%0tfCmEu zgBSxtgEElj0@6SXrY8ewP9XmQkmd%`s*DT_JV5$7R2)cw)w%NWT*=*5CAX)e^NsUF z&w`0J8aQBPP8MV|m^^{egE4OMO-6ghIg=%s>=|EAjs%j1lV<|SqRBUbvBshFU6b~B{0Q$XV1ONa4 delta 382 zcmdlddqH-Bo}%WNt~ELun}74Cttk)Gn78in8#1@1sFG}F`ilOFwx&KAdrE9 zL7su3K^aJM0cjux(@TLgCy@UMNOJ>eb4CUR9w7Y^Dh{N;>RfqwuH+B7N%zyEBO9d0KEtT7Lx^e xvUH71O${w|vn!KQi_Fa|95M>BQ}r_{lZrA^vQu+)D^R5;ui{nOyn~002>_nvXmtPp From 6c7d7dc74144bf8f6c5b9bf14ab0213bdf95cf34 Mon Sep 17 00:00:00 2001 From: Ajitomi Daisuke Date: Tue, 12 Nov 2024 21:27:37 +0900 Subject: [PATCH 3/3] ml-kem: add bun.lockb --- packages/ml-kem/test/runtimes/bun/bun.lockb | Bin 3792 -> 3754 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/ml-kem/test/runtimes/bun/bun.lockb b/packages/ml-kem/test/runtimes/bun/bun.lockb index 558dbfccee637f47b004a441369a8b98d1b01aa8..1efae7a2645a93c8d1943527411b4a79f6c07a07 100755 GIT binary patch delta 355 zcmca0yGnL~o}$e=0TJbIysd$jWdZwJQ&xS6@7VRR!R-3-O*^N}+S$%2HPPQPz>a}| zfro*iK^aJM0cjux)Ac}_6UaXUq`85#AR|QGVW>Ee0;_Z7<++l(txE1jo<+`4#%+xg zZ!~bg%$zL9XfSyKqX(nc3Q94E2o67#Lu#S$uj%<@~HmnM{mz7J8<7h6W60 zChKxbO2b^unQwFKRp6}MKzUQ3Mm-atd?NRB$w^ROwOE**VXWZ$X8{Zf5D=Oy$P+J= bo1>eZn(L5Jke#XzVNc$}tF-wP4;vEz3GrZ4 delta 393 zcmZ1_dqH-Bo}%WNt~ELun}74Cttk)Gn78in8#1@1sFG}F`ilOFwx&KAdrE9 zL7su3K^aJM0cjux(@TLgCy@UMNOJ>eb4CUR9w7Y^Dh{N;>RfqwuH+B7N%zyEBO9d0KEtT7Lx^e x;w>^NlZrA^vQu+)D~wD{4J~!EE0a=-%*`wuG77R&^>Ip1KENZrc`gqx697kXY`*{i