feat: upgrade packages to use node 22

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 references:
   working_directory: &working_directory ~/repo
   node_image: &node_image
-    image: cimg/node:18.18
+    image: cimg/node:22.14
     environment:
       NODE_OPTIONS: '--max-old-space-size=4096'
   ipfs_image: &ipfs_image

.npmpackagejsonlintrc.json

@@ -29,7 +29,7 @@
     "repository-type": "error",
     "scripts-type": "error",
     "version-type": "error",
-    "valid-values-engines": ["error", [{ "node": ">=18.0.0" }]],
+    "valid-values-engines": ["error", [{ "node": ">=22.0.0" }]],
     "valid-values-name-scope": ["error", ["@requestnetwork"]],
     "valid-values-author": ["error", ["Request Network"]],
     "valid-values-private": "off",

.nvmrc

@@ -1 +1 @@
-v18.18.0
+v22.14.0

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "homepage": "https://github.com/RequestNetwork/requestNetwork",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "workspaces": [
     "packages/*"

packages/advanced-logic/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/currency/package.json

@@ -20,7 +20,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/data-access/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/data-format/package.json

@@ -20,7 +20,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/epk-cipher/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/epk-decryption/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/epk-signature/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/ethereum-storage/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

packages/integration-test/babel.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
+  plugins: ['@babel/plugin-transform-runtime', '@babel/plugin-transform-modules-commonjs'],
+};

packages/integration-test/jest.config.js

@@ -8,4 +8,18 @@ const jestCommonConfig = require('../../jest.config');
 /** @type {import('jest').Config} */
 module.exports = {
   ...jestCommonConfig,
+  transform: {
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.json',
+      },
+    ],
+    '^.+\\.js$': ['babel-jest', { configFile: './babel.config.js' }],
+  },
+  transformIgnorePatterns: ['/node_modules/(?!(graphql-request|@superfluid-finance/sdk-core)/)'],
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
 };

packages/integration-test/package.json

@@ -17,7 +17,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "directories": {
     "test": "test"
@@ -41,6 +41,11 @@
     "test:lit": "jest test/lit-protocol.test.ts --forceExit"
   },
   "devDependencies": {
+    "@babel/core": "7.23.9",
+    "@babel/plugin-transform-modules-commonjs": "7.23.3",
+    "@babel/plugin-transform-runtime": "7.23.3",
+    "@babel/preset-env": "7.23.3",
+    "@babel/preset-typescript": "7.23.3",
     "@lit-protocol/lit-node-client": "7.0.5",
     "@requestnetwork/advanced-logic": "0.53.0",
     "@requestnetwork/currency": "0.27.0",
@@ -61,6 +66,7 @@
     "@requestnetwork/web3-signature": "0.8.9",
     "@types/jest": "29.5.6",
     "@types/node": "18.11.9",
+    "babel-jest": "29.7.0",
     "ethers": "5.7.2",
     "jest": "29.5.0",
     "jest-junit": "16.0.0",

packages/lit-protocol-cipher/package.json

@@ -21,7 +21,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "directories": {
     "lib": "src",

packages/multi-format/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/payment-detection/package.json

@@ -18,7 +18,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/payment-processor/package.json

@@ -18,7 +18,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/request-client.js/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/request-client.js/src/http-data-access-config.ts

@@ -99,8 +99,10 @@ export class HttpDataAccessConfig {
       },
       ...options,
     });
+
     if (r.ok) {
-      return await r.json();
+      const responseBody = await r.json();
+      return responseBody;
     }
 
     throw Object.assign(new Error(r.statusText), {

packages/request-logic/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/request-node/babel.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
+  plugins: ['@babel/plugin-transform-runtime', '@babel/plugin-transform-modules-commonjs'],
+};

packages/request-node/jest.config.js

@@ -3,4 +3,18 @@ const jestCommonConfig = require('../../jest.config');
 /** @type {import('jest').Config} */
 module.exports = {
   ...jestCommonConfig,
+  transform: {
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.json',
+      },
+    ],
+    '^.+\\.js$': ['babel-jest', { configFile: './babel.config.js' }],
+  },
+  transformIgnorePatterns: ['/node_modules/(?!(graphql-request|@superfluid-finance/sdk-core)/)'],
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
 };

packages/request-node/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/bin",
   "bin": {
@@ -69,13 +69,19 @@
     "yargs": "17.6.2"
   },
   "devDependencies": {
+    "@babel/core": "7.23.9",
+    "@babel/plugin-transform-modules-commonjs": "7.23.3",
+    "@babel/plugin-transform-runtime": "7.23.3",
+    "@babel/preset-env": "7.23.3",
+    "@babel/preset-typescript": "7.23.3",
     "@types/cors": "2.8.9",
     "@types/express": "4.17.17",
     "@types/jest": "29.5.6",
     "@types/morgan": "1.9.9",
     "@types/node": "18.11.9",
     "@types/supertest": "2.0.10",
     "@types/yargs": "17.0.14",
+    "babel-jest": "29.7.0",
     "jest": "29.5.0",
     "jest-junit": "16.0.0",
     "msw": "2.0.6",

packages/request-node/src/request/getTransactionsByChannelId.ts

@@ -36,7 +36,6 @@ export default class GetTransactionsByChannelIdHandler {
       serverResponse.status(StatusCodes.OK).send(transactions);
     } catch (e) {
       this.logger.error(`getTransactionsByChannelId error: ${e}`);
-
       serverResponse.status(StatusCodes.INTERNAL_SERVER_ERROR).send(e);
     }
   }

packages/smart-contracts/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/src/lib/index.js",
   "types": "dist/src/lib/index.d.ts",

packages/thegraph-data-access/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
     "@requestnetwork/types": "0.53.0",
     "@requestnetwork/utils": "0.53.0",
     "ethers": "5.7.2",
-    "graphql-request": "6.1.0",
+    "graphql-request": "7.1.2",
     "tslib": "2.5.0"
   },
   "devDependencies": {

packages/thegraph-data-access/src/subgraph-client.ts

@@ -10,19 +10,22 @@ import {
   Transaction,
   TransactionsBody,
 } from './queries';
-import { Variables, RequestConfig } from 'graphql-request/build/cjs/types';
+import { Variables } from 'graphql-request/build/cjs/types';
+import { RequestConfig } from 'graphql-request/build/legacy/helpers/types';
 
 // Max Int value (as supported by grapqhl types)
 const MAX_INT_VALUE = 0x7fffffff;
 
+type ClientConfig = Omit<RequestConfig, 'headers'> & { headers?: Record<string, string> };
+
 export class SubgraphClient implements StorageTypes.IIndexer {
   private graphql: GraphQLClient;
   public readonly endpoint: string;
 
   private readonly DEFAULT_PAGE_SIZE = 100;
   private readonly MAX_PAGE_SIZE = 1000;
 
-  constructor(endpoint: string, options?: RequestConfig) {
+  constructor(endpoint: string, options?: ClientConfig) {
     this.endpoint = endpoint;
     this.graphql = new GraphQLClient(endpoint, options);
   }

packages/thegraph-data-access/src/types.ts

@@ -1,9 +1,8 @@
 import { StorageTypes } from '@requestnetwork/types';
 import { DataAccessBaseOptions } from '@requestnetwork/data-access';
-
-import { RequestConfig } from 'graphql-request/build/cjs/types';
+import { RequestConfig } from 'graphql-request/build/legacy/helpers/types';
 
 export type TheGraphDataAccessOptions = DataAccessBaseOptions & {
-  graphql: { url: string } & RequestConfig;
+  graphql: { url: string } & Omit<RequestConfig, 'headers'> & { headers?: Record<string, string> };
   storage?: StorageTypes.IStorageWrite;
 };

packages/toolbox/package.json

@@ -17,7 +17,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/transaction-manager/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/types/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/usage-examples/package.json

@@ -17,7 +17,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",

packages/utils/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/web3-signature/package.json

@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",