Merge pull request #68 from PeculiarVentures/update-deps

Update dependencies and fix buffer import
PeculiarVentures · Jan 16, 2024 · 98fa17a · 98fa17a
2 parents ad3a364 + 1b24e46
commit 98fa17a
Show file tree

Hide file tree

Showing 8 changed files with 792 additions and 485 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,7 +23,7 @@ jobs:
           echo 'The pull request has not been merged'
           exit 1
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -33,9 +33,9 @@ jobs:
           git config user.email [email protected]
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
           registry-url: "https://registry.npmjs.org"
 
       - name: Setup .npmrc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,27 +16,27 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [18.x, 20.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        id: yarn-cache
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ runner.os }}-yarn-
 
       - name: Install global dependencies
         run: npm i yarn nyc coveralls -g

diff --git a/package.json b/package.json
@@ -54,24 +54,24 @@
   "homepage": "https://github.com/PeculiarVentures/webcrypto#readme",
   "devDependencies": {
     "@peculiar/webcrypto-test": "^1.0.7",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.5",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
-    "eslint": "^8.36.0",
-    "eslint-plugin-import": "^2.27.5",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.11.4",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
+    "eslint": "^8.56.0",
+    "eslint-plugin-import": "^2.29.1",
     "mocha": "^10.2.0",
-    "rimraf": "^4.4.0",
-    "rollup": "^3.20.0",
-    "rollup-plugin-typescript2": "^0.34.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.2"
+    "rimraf": "^5.0.5",
+    "rollup": "^4.9.5",
+    "rollup-plugin-typescript2": "^0.36.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@peculiar/asn1-schema": "^2.3.6",
+    "@peculiar/asn1-schema": "^2.3.8",
     "@peculiar/json-schema": "^1.1.12",
-    "pvtsutils": "^1.3.2",
-    "tslib": "^2.5.0",
+    "pvtsutils": "^1.3.5",
+    "tslib": "^2.6.2",
     "webcrypto-core": "^1.7.7"
   },
   "nyc": {

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -9,7 +9,7 @@ const banner = [
 ].join("\n");
 const input = "src/index.ts";
 const external = [
-  ...["crypto", "process"],
+  ...["crypto", "process", "buffer"],
   ...Object.keys(pkg.dependencies || {}),
 ];
 

diff --git a/src/mechs/ec/public_key.ts b/src/mechs/ec/public_key.ts
@@ -1,3 +1,4 @@
+import { Buffer } from "buffer";
 import { AsnParser, AsnSerializer } from "@peculiar/asn1-schema";
 import { IJsonConvertible, JsonParser, JsonSerializer } from "@peculiar/json-schema";
 import * as core from "webcrypto-core";

diff --git a/test/crypto.ts b/test/crypto.ts
@@ -80,19 +80,6 @@ context("Crypto", () => {
   (nodeMajorVersion < 14 ? context.skip : context)("EdDSA", () => {
 
     context("generateKey", () => {
-
-      it("RSA 3072bits", async () => {
-        const alg: globalThis.RsaHashedKeyGenParams = {
-          name: "RSASSA-PKCS1-v1_5",
-          hash: "SHA-256",
-          publicExponent: new Uint8Array([1, 0, 1]),
-          modulusLength: 3072,
-        };
-        const keys = await crypto.subtle.generateKey(alg, false, ["sign", "verify"]);
-
-        assert.strictEqual((keys.privateKey.algorithm as RsaHashedKeyAlgorithm).modulusLength, 3072);
-      });
-
       it("Ed25519", async () => {
         const keys = await crypto.subtle.generateKey({ name: "eddsa", namedCurve: "ed25519" } as globalThis.EcKeyGenParams, false, ["sign", "verify"]);
 
@@ -305,4 +292,16 @@ context("Crypto", () => {
       assert.equal(bits.byteLength, 66);
     });
   });
+
+  it("RSA 3072bits", async () => {
+    const alg: globalThis.RsaHashedKeyGenParams = {
+      name: "RSASSA-PKCS1-v1_5",
+      hash: "SHA-256",
+      publicExponent: new Uint8Array([1, 0, 1]),
+      modulusLength: 3072,
+    };
+    const keys = await crypto.subtle.generateKey(alg, false, ["sign", "verify"]);
+
+    assert.strictEqual((keys.privateKey.algorithm as RsaHashedKeyAlgorithm).modulusLength, 3072);
+  }).timeout(5000);
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es2019",
     "module": "commonjs",
+    "moduleResolution": "node",
     "lib": [
       "dom"
     ],