Merge branch 'main' into kyle/subnet-keys-expirable-map

dfinity · Nov 13, 2023 · dbf8ad8 · dbf8ad8
2 parents 60e28d5 + 5b36459
commit dbf8ad8
Show file tree

Hide file tree

Showing 73 changed files with 8,661 additions and 13,581 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -19,7 +19,7 @@ jobs:
         spec:
           - '0.16.1'
         node:
-          - 16
+          - 18
 
     steps:
       - uses: actions/checkout@v2
@@ -28,9 +28,11 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm install -g npm@9
+      - run: npm install -g npm
 
       - run: npm install
+      - run: pushd e2e/browser && npm install && popd
+      - run: pushd e2e/node && npm install && popd
 
       # build monorepo incl. each subpackage
       - run: npm run build --workspaces --if-present

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,13 +17,13 @@ jobs:
         spec:
           - release-0.16 # https://github.com/dfinity-lab/ic-ref/tree/release-0.16
         node:
-          - 14
+          - 20
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install -g npm@9
+      - run: npm install -g npm
       - run: npm install
       - run: npm run lint --workspaces --if-present
diff --git a/.github/workflows/mitm.yml b/.github/workflows/mitm.yml
@@ -20,7 +20,7 @@ jobs:
         spec:
           - '0.16.1'
         node:
-          - 16
+          - 20
 
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm install -g npm@9
+      - run: npm install -g npm
 
       - run: npm install
 

diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -17,15 +17,15 @@ jobs:
         spec:
           - release-0.16 # https://github.com/dfinity-lab/ic-ref/tree/release-0.16
         node:
-          - 14
+          - 20
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install -g npm@9
-      - run: npm install prettier pretty-quick
+      - run: npm install -g npm
+      - run: npm ci
       - run: npm run prettier:check
 
   aggregate:

diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml
@@ -7,7 +7,7 @@ jobs:
       CI_JOB_NUMBER: 1
     steps:
       - uses: actions/checkout@v1
-      - run: npm install -g npm@9
+      - run: npm install -g npm
       # - run: npm run size-limit --workspaces --if-present
 
       # commented out until the job can be configured

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -19,8 +19,8 @@ jobs:
         spec:
           - '0.16.1'
         node:
-          - 14
-          - 16
+          - 18
+          - 20
 
     steps:
       - uses: actions/checkout@v2
@@ -29,9 +29,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm install -g npm@9
+      - run: npm install -g npm
 
-      - run: npm ci
+      - run: npm install
 
       # build monorepo incl. each subpackage
       - run: npm run build --workspaces --if-present

diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.16
+v20.9.0
diff --git a/demos/sample-javascript/package.json b/demos/sample-javascript/package.json
@@ -24,8 +24,8 @@
     "stream-browserify": "^3.0.0",
     "ts-node": "^10.8.2",
     "util": "^0.12.3",
+    "webpack": "^5.76.0",
     "webpack-cli": "^4.5.0",
-    "webpack-dev-server": "^4.0.0-beta.0",
-    "webpack": "^5.76.0"
+    "webpack-dev-server": "^4.0.0-beta.0"
   }
 }
diff --git a/docs/generated/changelog.html b/docs/generated/changelog.html
@@ -13,6 +13,7 @@ <h1>Agent-JS Changelog</h1>
       <h2>Version x.x.x</h2>
       <ul>
         <li>feat: uses expirable map for subnet keys in agent-js, with a timeout of 1 hour</li>
+        <li>chore: cleanup for node 20 development in agent-js</li>
         <li>fix: canisterStatus returns full list of controllers</li>
         <ul>
           <strong>feat!: node signature verification</strong

diff --git a/e2e/node/package.json b/e2e/node/package.json
@@ -40,7 +40,7 @@
     "size-limit": "^8.2.6",
     "text-encoding": "^0.7.0",
     "ts-node": "^10.8.2",
-    "typescript": "^4.7.4",
+    "typescript": "^5.2.2",
     "vitest": "^0.34.6",
     "webcrypto-core": "^1.7.5"
   }

diff --git a/jest.config.base.ts b/jest.config.base.ts
@@ -1,7 +1,6 @@
 import type { Config } from '@jest/types';
 
 const config: Config.InitialOptions = {
-  verbose: true,
   testPathIgnorePatterns: ['/node_modules/', '/lib/', '/dist/', '/docs/'],
   testMatch: ['**/src/**/?(*.)+(spec|test).[jt]s?(x)'],
 };