Merge pull request #383 from dajiaji/rename-npm-packages

Rename npm-packages/x to npm/packages.
dajiaji · Sep 1, 2024 · 71a5eca · 71a5eca
2 parents 7b06bf8 + d5cdb58
commit 71a5eca
Show file tree

Hide file tree

Showing 29 changed files with 255 additions and 128 deletions.
diff --git a/.github/workflows/ci_browser.yml b/.github/workflows/ci_browser.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Run dnt
         run: deno task dnt
       - name: Run npm install
-        working-directory: ./npm-packages
+        working-directory: ./npm
         run: npm install
       - name: Create pages directory
         working-directory: ./packages/hpke-js

diff --git a/.github/workflows/ci_node.yml b/.github/workflows/ci_node.yml
@@ -29,55 +29,55 @@ jobs:
         working-directory: ./packages/core
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/core/hpke-core.min.js
+          deno task minify > ../../npm/packages/core/hpke-core.min.js
       - name: Publish to npm (dry) for /packages/core
-        working-directory: ./npm-packages/x/core
+        working-directory: ./npm/packages/core
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/chacha20poly1305
         working-directory: ./packages/chacha20poly1305
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/chacha20poly1305/hpke-chacha20poly1305.min.js
+          deno task minify > ../../npm/packages/chacha20poly1305/hpke-chacha20poly1305.min.js
       - name: Publish to npm (dry) for /packages/chacha20poly1305
-        working-directory: ./npm-packages/x/chacha20poly1305
+        working-directory: ./npm/packages/chacha20poly1305
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/dhkem-x25519
         working-directory: ./packages/dhkem-x25519
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/dhkem-x25519/hpke-dhkem-x25519.min.js
+          deno task minify > ../../npm/packages/dhkem-x25519/hpke-dhkem-x25519.min.js
       - name: Publish to npm (dry) for /packages/dhkem-x25519
-        working-directory: ./npm-packages/x/dhkem-x25519
+        working-directory: ./npm/packages/dhkem-x25519
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/dhkem-x448
         working-directory: ./packages/dhkem-x448
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/dhkem-x448/hpke-dhkem-x448.min.js
+          deno task minify > ../../npm/packages/dhkem-x448/hpke-dhkem-x448.min.js
       - name: Publish to npm (dry) for /packages/dhkem-x448
-        working-directory: ./npm-packages/x/dhkem-x448
+        working-directory: ./npm/packages/dhkem-x448
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/hybridkem-x25519-kyber768
         working-directory: ./packages/hybridkem-x25519-kyber768
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/hybridkem-x25519-kyber768/hpke-hybridkem-x25519-kyber768.min.js
+          deno task minify > ../../npm/packages/hybridkem-x25519-kyber768/hpke-hybridkem-x25519-kyber768.min.js
       - name: Publish to npm (dry) for /packages/hybridkem-x25519-kyber768
-        working-directory: ./npm-packages/x/hybridkem-x25519-kyber768
+        working-directory: ./npm/packages/hybridkem-x25519-kyber768
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/dhkem-secp256k1
         working-directory: ./packages/dhkem-secp256k1
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/dhkem-secp256k1/hpke-dhkem-secp256k1.min.js
+          deno task minify > ../../npm/packages/dhkem-secp256k1/hpke-dhkem-secp256k1.min.js
       - name: Publish to npm (dry) for /packages/dhkem-secp256k1
-        working-directory: ./npm-packages/x/dhkem-secp256k1
+        working-directory: ./npm/packages/dhkem-secp256k1
         run: npm publish --dry-run
       - name: Run dnt & minify for /packages/hpke-js
         working-directory: ./packages/hpke-js
         run: |
           deno task dnt
-          deno task minify > ../../npm-packages/x/hpke-js/hpke.min.js
+          deno task minify > ../../npm/packages/hpke-js/hpke.min.js
       - name: Publish to npm (dry) for /packages/hpke-js
-        working-directory: ./npm-packages/x/hpke-js
+        working-directory: ./npm/packages/hpke-js
         run: npm publish --dry-run
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/core
+        working-directory: ./npm/packages/core
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -58,7 +58,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/chacha20poly1305
+        working-directory: ./npm/packages/chacha20poly1305
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -81,7 +81,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/dhkem-x25519
+        working-directory: ./npm/packages/dhkem-x25519
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -104,7 +104,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/dhkem-x448
+        working-directory: ./npm/packages/dhkem-x448
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -127,7 +127,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/hybridkem-x25519-kyber768
+        working-directory: ./npm/packages/hybridkem-x25519-kyber768
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -150,7 +150,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/dhkem-secp256k1
+        working-directory: ./npm/packages/dhkem-secp256k1
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -173,7 +173,7 @@ jobs:
           npm install -g esbuild
           deno task dnt
       - name: Publish to npm
-        working-directory: ./npm-packages/x/hpke-js
+        working-directory: ./npm/packages/hpke-js
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/.gitignore b/.gitignore
@@ -80,8 +80,7 @@ typings/
 docs/
 
 # npm files generated by dnt
-npm/
-npm-packages/x
+npm/packages
 
 # Gatsby files
 .cache/

diff --git a/deno.json b/deno.json
@@ -22,23 +22,23 @@
   },
   "fmt": {
     "exclude": [
-      "npm-packages/",
+      "npm/",
       "**/*/*.js",
       "**/*/npm/",
       "coverage/*.json"
     ]
   },
   "lint": {
     "exclude": [
-      "npm-packages/",
+      "npm/",
       "**/*/*.js",
       "**/*/npm/",
       "coverage/*.json"
     ]
   },
   "test": {
     "exclude": [
-      "npm-packages/",
+      "npm/",
       "**/*/*.js",
       "**/*/npm/",
       "coverage/*.json"
@@ -57,28 +57,28 @@
     "dnt:hybridkem-x25519-kyber768": "cd packages/hybridkem-x25519-kyber768 && deno task dnt",
     "dnt:hpke-js": "cd packages/hpke-js && deno task dnt",
     "npm-link": "deno task npm-link:core && deno task npm-link:chacha20poly1305 && deno task npm-link:dhkem-x25519 && deno task npm-link:dhkem-x448 && deno task npm-link:dhkem-secp256k1 && deno task npm-link:hybridkem-x25519-kyber768 && deno task npm-link:hpke-js",
-    "npm-link:core": "cd npm-packages/x/core && npm link",
-    "npm-link:chacha20poly1305": "cd npm-packages/x/chacha20poly1305 && npm link",
-    "npm-link:dhkem-x25519": "cd npm-packages/x/dhkem-x25519 && npm link",
-    "npm-link:dhkem-x448": "cd npm-packages/x/dhkem-x448 && npm link",
-    "npm-link:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && npm link",
-    "npm-link:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && npm link",
-    "npm-link:hpke-js": "cd npm-packages/x/hpke-js && npm link",
+    "npm-link:core": "cd npm/packages/core && npm link",
+    "npm-link:chacha20poly1305": "cd npm/packages/chacha20poly1305 && npm link",
+    "npm-link:dhkem-x25519": "cd npm/packages/dhkem-x25519 && npm link",
+    "npm-link:dhkem-x448": "cd npm/packages/dhkem-x448 && npm link",
+    "npm-link:dhkem-secp256k1": "cd npm/packages/dhkem-secp256k1 && npm link",
+    "npm-link:hybridkem-x25519-kyber768": "cd npm/packages/hybridkem-x25519-kyber768 && npm link",
+    "npm-link:hpke-js": "cd npm/packages/hpke-js && npm link",
     "npm-pack": "deno task npm-pack:core && deno task npm-pack:chacha20poly1305 && deno task npm-pack:dhkem-x25519 && deno task npm-pack:dhkem-x448 && deno task npm-pack:dhkem-secp256k1 && deno task npm-pack:hybridkem-x25519-kyber768 && deno task npm-pack:hpke-js",
-    "npm-pack:core": "cd npm-packages/x/core && npm pack --dry-run",
-    "npm-pack:chacha20poly1305": "cd npm-packages/x/chacha20poly1305 && npm pack --dry-run",
-    "npm-pack:dhkem-x25519": "cd npm-packages/x/dhkem-x25519 && npm pack --dry-run",
-    "npm-pack:dhkem-x448": "cd npm-packages/x/dhkem-x448 && npm pack --dry-run",
-    "npm-pack:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && npm pack --dry-run",
-    "npm-pack:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && npm pack --dry-run",
-    "npm-pack:hpke-js": "cd npm-packages/x/hpke-js && npm pack --dry-run",
+    "npm-pack:core": "cd npm/packages/core && npm pack --dry-run",
+    "npm-pack:chacha20poly1305": "cd npm/packages/chacha20poly1305 && npm pack --dry-run",
+    "npm-pack:dhkem-x25519": "cd npm/packages/dhkem-x25519 && npm pack --dry-run",
+    "npm-pack:dhkem-x448": "cd npm/packages/dhkem-x448 && npm pack --dry-run",
+    "npm-pack:dhkem-secp256k1": "cd npm/packages/dhkem-secp256k1 && npm pack --dry-run",
+    "npm-pack:hybridkem-x25519-kyber768": "cd npm/packages/hybridkem-x25519-kyber768 && npm pack --dry-run",
+    "npm-pack:hpke-js": "cd npm/packages/hpke-js && npm pack --dry-run",
     "bun-link": "deno task bun-link:core && deno task bun-link:chacha20poly1305 && deno task bun-link:dhkem-x25519 && deno task bun-link:dhkem-x448 && deno task bun-link:dhkem-secp256k1 && deno task bun-link:hybridkem-x25519-kyber768 && deno task bun-link:hpke-js",
-    "bun-link:core": "cd npm-packages/x/core && bun link",
-    "bun-link:chacha20poly1305": "cd npm-packages/x/chacha20poly1305 && bun link",
-    "bun-link:dhkem-x25519": "cd npm-packages/x/dhkem-x25519 && bun link",
-    "bun-link:dhkem-x448": "cd npm-packages/x/dhkem-x448 && bun link",
-    "bun-link:dhkem-secp256k1": "cd npm-packages/x/dhkem-secp256k1 && bun link",
-    "bun-link:hybridkem-x25519-kyber768": "cd npm-packages/x/hybridkem-x25519-kyber768 && bun link",
-    "bun-link:hpke-js": "cd npm-packages/x/hpke-js && bun link"
+    "bun-link:core": "cd npm/packages/core && bun link",
+    "bun-link:chacha20poly1305": "cd npm/packages/chacha20poly1305 && bun link",
+    "bun-link:dhkem-x25519": "cd npm/packages/dhkem-x25519 && bun link",
+    "bun-link:dhkem-x448": "cd npm/packages/dhkem-x448 && bun link",
+    "bun-link:dhkem-secp256k1": "cd npm/packages/dhkem-secp256k1 && bun link",
+    "bun-link:hybridkem-x25519-kyber768": "cd npm/packages/hybridkem-x25519-kyber768 && bun link",
+    "bun-link:hpke-js": "cd npm/packages/hpke-js && bun link"
   }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/npm-packages/package.json b/npm-packages/package.json