Sync package version and name.

dajiaji · Aug 24, 2024 · e6287f1 · e6287f1
1 parent 706caf8
commit e6287f1
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 33 deletions.
diff --git a/.github/workflows/ci_bun.yml b/.github/workflows/ci_bun.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Prepare test for ./x/core
         working-directory: ./x/core
         run: |
-          deno run -A dnt.ts 0.0.0
+          deno run -A dnt.ts
           deno task minify > ../dhkem-x25519/test/runtimes/hpke-core.js
           deno task minify > ../dhkem-x448/test/runtimes/hpke-core.js
           deno task minify > ../hybridkem-x25519-kyber768/test/runtimes/hpke-core.js
@@ -51,7 +51,7 @@ jobs:
       - name: Prepare test for ./x/chacha20poly1305
         working-directory: ./x/chacha20poly1305
         run: |
-          deno run -A dnt.ts 0.0.0
+          deno run -A dnt.ts
       - name: Run npm pack for ./x/chacha20poly1305
         working-directory: ./npm-packages/x/chacha20poly1305
         run: npm pack
@@ -109,7 +109,7 @@ jobs:
       - name: Prepare test for ./x/hpke-js
         working-directory: ./x/hpke-js
         run: |
-          deno run -A dnt.ts 0.0.0
+          deno run -A dnt.ts
           deno task minify > test/runtimes/hpke.js
       - name: Run npm pack for ./x/hpke-js
         working-directory: ./npm-packages/x/hpke-js

diff --git a/.github/workflows/ci_cloudflare.yml b/.github/workflows/ci_cloudflare.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Prepare test for ./x/core
         working-directory: ./x/core
         run: |
-          deno run -A dnt.ts 0.0.0
+          deno run -A dnt.ts
           deno task minify > ../chacha20poly1305/test/runtimes/hpke-core.js
           deno task minify > ../dhkem-x25519/test/runtimes/hpke-core.js
           deno task minify > ../dhkem-x448/test/runtimes/hpke-core.js
@@ -103,7 +103,7 @@ jobs:
           deno test dhkem-secp256k1.spec.ts --allow-net --config ../../../deno.json
       - name: Prepare test for hpke-js
         working-directory: ./x/hpke-js
-        run: deno run -A dnt.ts 0.0.0
+        run: deno run -A dnt.ts
       - name: Run npm pack for ./x/hpke-js
         working-directory: ./npm-packages/x/hpke-js
         run: npm pack

diff --git a/x/chacha20poly1305/deno.json b/x/chacha20poly1305/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/chacha20poly1305/esm/chacha20poly1305/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/chacha20poly1305/dnt.ts b/x/chacha20poly1305/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/chacha20poly1305");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/chacha20poly1305",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/chacha20poly1305",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module extension for ChaCha20/Poly1305",
     repository: {

diff --git a/x/chacha20poly1305/test/runtimes/bun/package.json b/x/chacha20poly1305/test/runtimes/bun/package.json
@@ -9,7 +9,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hpke/chacha20poly1305": "file:../../../../../npm-packages/x/chacha20poly1305/hpke-chacha20poly1305-0.0.0.tgz",
-    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-0.0.0.tgz"
+    "@hpke/chacha20poly1305": "file:../../../../../npm-packages/x/chacha20poly1305/hpke-chacha20poly1305-1.2.9.tgz",
+    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-1.2.9.tgz"
   }
 }
diff --git a/x/core/deno.json b/x/core/deno.json
@@ -50,7 +50,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/core/esm/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/core/dnt.ts b/x/core/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/core");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/core",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/core",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) core module for various JavaScript runtimes",
     repository: {

diff --git a/x/core/test/runtimes/bun/package.json b/x/core/test/runtimes/bun/package.json
@@ -9,6 +9,6 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-0.0.0.tgz"
+    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-1.2.9.tgz"
   }
 }
diff --git a/x/core/test/runtimes/cloudflare/package.json b/x/core/test/runtimes/cloudflare/package.json
@@ -10,6 +10,6 @@
     "deploy": "wrangler publish"
   },
   "dependencies": {
-    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-0.0.0.tgz"
+    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-1.2.9.tgz"
   }
 }
diff --git a/x/dhkem-secp256k1/deno.json b/x/dhkem-secp256k1/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/dhkem-secp256k1/esm/dhkem-secp256k1/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/dhkem-secp256k1/dnt.ts b/x/dhkem-secp256k1/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/dhkem-secp256k1");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/dhkem-secp256k1",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/dhkem-secp256k1",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module extension for secp256k1 curve (EXPERIMENTAL)",
     repository: {

diff --git a/x/dhkem-x25519/deno.json b/x/dhkem-x25519/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/dhkem-x25519/esm/dhkem-x25519/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/dhkem-x25519/dnt.ts b/x/dhkem-x25519/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/dhkem-x25519");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/dhkem-x25519",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/dhkem-x25519",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module extension for X25519",
     repository: {

diff --git a/x/dhkem-x448/deno.json b/x/dhkem-x448/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/dhkem-x448/esm/dhkem-x448/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/dhkem-x448/dnt.ts b/x/dhkem-x448/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/dhkem-x448");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/dhkem-x448",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/dhkem-x448",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module extension for X448",
     repository: {

diff --git a/x/hpke-js/deno.json b/x/hpke-js/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/hpke-js/esm/hpke-js/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/hpke-js/dnt.ts b/x/hpke-js/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/hpke-js");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/hpke-js",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "hpke-js",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module for various JavaScript runtimes",
     repository: {

diff --git a/x/hpke-js/test/runtimes/bun/package.json b/x/hpke-js/test/runtimes/bun/package.json
@@ -9,7 +9,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hpke/hpke-js": "file:../../../../../npm-packages/x/hpke-js/hpke-js-0.0.0.tgz",
-    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-0.0.0.tgz"
+    "@hpke/hpke-js": "file:../../../../../npm-packages/x/hpke-js/hpke-js-1.2.9.tgz",
+    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-1.2.9.tgz"
   }
 }
diff --git a/x/hpke-js/test/runtimes/cloudflare/package.json b/x/hpke-js/test/runtimes/cloudflare/package.json
@@ -10,6 +10,6 @@
     "deploy": "wrangler publish"
   },
   "dependencies": {
-    "@hpke/hpke-js": "file:../../../../../npm-packages/x/hpke-js/hpke-js-0.0.0.tgz"
+    "@hpke/hpke-js": "file:../../../../../npm-packages/x/hpke-js/hpke-js-1.2.9.tgz"
   }
 }
diff --git a/x/hybridkem-x25519-kyber768/deno.json b/x/hybridkem-x25519-kyber768/deno.json
@@ -46,7 +46,7 @@
   "tasks": {
     "test": "deno fmt && deno lint && deno test test -A --fail-fast --doc --coverage=coverage --parallel --allow-read",
     "cov": "deno coverage ./coverage --lcov --exclude='test'",
-    "dnt": "deno run -A dnt.ts $(git describe --tags $(git rev-list --tags --max-count=1))",
+    "dnt": "deno run -A dnt.ts",
     "minify": "esbuild ../../npm-packages/x/hybridkem-x25519-kyber768/esm/hybridkem-x25519-kyber768/mod.js --bundle --format=esm --minify"
   }
 }
diff --git a/x/hybridkem-x25519-kyber768/dnt.ts b/x/hybridkem-x25519-kyber768/dnt.ts
@@ -2,6 +2,8 @@ import { build, emptyDir } from "@deno/dnt";
 
 await emptyDir("../../npm-packages/x/hybridkem-x25519-kyber768");
 
+const denoPkg = JSON.parse(await Deno.readTextFile("./deno.json"));
+
 await build({
   entryPoints: ["./mod.ts"],
   outDir: "../../npm-packages/x/hybridkem-x25519-kyber768",
@@ -17,8 +19,8 @@ await build({
     deno: "dev",
   },
   package: {
-    name: "@hpke/hybridkem-x25519-kyber768",
-    version: Deno.args[0],
+    name: denoPkg.name,
+    version: denoPkg.version,
     description:
       "A Hybrid Public Key Encryption (HPKE) module extension for a hybrid post-quantum KEM, X25519Kyber768Draft00",
     repository: {