Update bun CI.

Author: dajiaji

.github/workflows/ci_bun.yml

@@ -30,40 +30,24 @@ jobs:
           bun-version: ${{ matrix.bun-version }}
       - name: Install esbuild
         run: npm install -g esbuild
-      - name: Prepare test for hpke-js
-        working-directory: ./
-        run: |
-          pwd
-          deno run -A dnt.ts 0.0.0
-          deno task minify > test/runtimes/hpke.js
-      - name: Run npm pack for hpke-js
-        working-directory: ./npm
-        run: npm pack
-      - name: Prepare test for core
-        working-directory: ./core
+      - name: Prepare test for ./x/core
+        working-directory: ./x/core
         run: |
           deno run -A dnt.ts 0.0.0
-          deno task minify > ../x/dhkem-x25519/test/runtimes/hpke-core.js
-          deno task minify > ../x/dhkem-x448/test/runtimes/hpke-core.js
-          deno task minify > ../x/hybridkem-x25519-kyber768/test/runtimes/hpke-core.js
-          deno task minify > ../x/dhkem-secp256k1/test/runtimes/hpke-core.js
-      - name: Run npm pack for core
-        working-directory: ./core/npm
+          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
+          deno task minify > ../dhkem-secp256k1/test/runtimes/hpke-core.js
+      - name: Run npm pack for ./x/core
+        working-directory: ./npm-packages/x/core
         run: npm pack
-      - name: Run test for core
-        working-directory: ./core/test/runtimes/bun
+      - name: Run test for ./x/core
+        working-directory: ./x/core/test/runtimes/bun
         run: |
           bun install
           nohup bun src/index.ts &
           sleep 3
           deno test core.spec.ts --allow-net --config ../../../deno.json
-      - name: Run test for hpke-js
-        working-directory: ./test/runtimes/bun
-        run: |
-          bun install
-          nohup bun run src/index.ts &
-          sleep 3
-          deno test hpke.spec.ts --allow-net --config ../../../deno.json
       - working-directory: ./x/dhkem-x25519
         run: |
           deno task dnt
@@ -84,14 +68,14 @@ jobs:
           nohup bun src/index.js &
           sleep 3
           deno test dhkem-x448.spec.ts --allow-net
-      - working-directory: ./x/chacha20poly1305
+      - name: Prepare test for ./x/chacha20poly1305
+        working-directory: ./x/chacha20poly1305
         run: |
-          deno task dnt
           deno run -A dnt.ts 0.0.0
-      - name: Run npm pack for chacha20poly1305
-        working-directory: ./x/chacha20poly1305/npm
+      - name: Run npm pack for ./x/chacha20poly1305
+        working-directory: ./npm-packages/x/chacha20poly1305
         run: npm pack
-      - name: Run test for chacha20poly1305
+      - name: Run test for ./x/chacha20poly1305
         working-directory: ./x/chacha20poly1305/test/runtimes/bun
         run: |
           bun install
@@ -117,4 +101,19 @@ jobs:
         run: |
           nohup bun src/index.js &
           sleep 3
-          deno test dhkem-secp256k1.spec.ts --allow-net
+          deno test dhkem-secp256k1.spec.ts --allow-net
+      - name: Prepare test for hpke-js
+        working-directory: ./x/hpke-js
+        run: |
+          deno run -A dnt.ts 0.0.0
+          deno task minify > test/runtimes/hpke.js
+      - name: Run npm pack for hpke-js
+        working-directory: ./npm-packages/x/hpke-js
+        run: npm pack
+      - name: Run test for hpke-js
+        working-directory: ./x/hpke-js/test/runtimes/bun
+        run: |
+          bun install
+          nohup bun run src/index.ts &
+          sleep 3
+          deno test hpke.spec.ts --allow-net --config ../../../deno.json

x/chacha20poly1305/dnt.ts

@@ -28,14 +28,14 @@ await build({
     homepage:
       "https://github.com/dajiaji/hpke-js/tree/main/x/chacha20poly1305#readme",
     license: "MIT",
-    module: "./esm/x/chacha20poly1305/mod.js",
-    main: "./script/x/chacha20poly1305/mod.js",
-    types: "./esm/x/chacha20poly1305/mod.d.ts",
+    module: "./esm/chacha20poly1305/mod.js",
+    main: "./script/chacha20poly1305/mod.js",
+    types: "./esm/chacha20poly1305/mod.d.ts",
     sideEffects: false,
     exports: {
       ".": {
-        "import": "./esm/x/chacha20poly1305/mod.js",
-        "require": "./script/x/chacha20poly1305/mod.js",
+        "import": "./esm/chacha20poly1305/mod.js",
+        "require": "./script/chacha20poly1305/mod.js",
       },
       "./package.json": "./package.json",
     },

x/chacha20poly1305/test/runtimes/bun/bun.lockb

@@ -9,7 +9,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hpke/chacha20poly1305": "file:../../../npm/hpke-chacha20poly1305-0.0.0.tgz",
-    "@hpke/core": "file:../../../../../core/npm/hpke-core-0.0.0.tgz"
+    "@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"
   }
 }

x/chacha20poly1305/test/runtimes/bun/package.json

@@ -9,6 +9,6 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hpke/core": "file:../../../npm/hpke-core-0.0.0.tgz"
+    "@hpke/core": "file:../../../../../npm-packages/x/core/hpke-core-0.0.0.tgz"
   }
 }

x/core/test/runtimes/bun/bun.lockb

@@ -27,14 +27,14 @@ await build({
     },
     homepage: "https://github.com/dajiaji/hpke-js#readme",
     license: "MIT",
-    module: "./esm/x/hpke-js/mod.js",
-    main: "./script/x/hpke-js/mod.js",
-    types: "./esm/x/hpke-js/mod.d.ts",
+    module: "./esm/hpke-js/mod.js",
+    main: "./script/hpke-js/mod.js",
+    types: "./esm/hpke-js/mod.d.ts",
     sideEffects: false,
     exports: {
       ".": {
-        "import": "./esm/x/hpke-js/mod.js",
-        "require": "./script/x/hpke-js/mod.js",
+        "import": "./esm/hpke-js/mod.js",
+        "require": "./script/hpke-js/mod.js",
       },
       "./package.json": "./package.json",
     },

x/core/test/runtimes/bun/package.json

@@ -9,7 +9,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@dajiaji/hpke": "file:../../../npm/hpke-js-0.0.0.tgz",
-    "@hpke/core": "file:../../../core/npm/hpke-core-0.0.0.tgz"
+    "@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"
   }
 }

x/hpke-js/dnt.ts

@@ -1,4 +1,4 @@
-import { CipherSuite } from "@dajiaji/hpke";
+import { CipherSuite } from "@hpke/hpke-js";
 
 export async function testServer(request: Request): Promise<Response> {
   const url = new URL(request.url);