chore(typescript): change moduleResolution

alexandre-abrioux · alexandre-abrioux · commit 4ce46f30c266 · 2025-04-14T09:26:07.000+02:00
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "npm-package-json-lint": "5.1.0",
     "prettier": "2.8.8",
     "prettier-plugin-solidity": "1.0.0-beta.19",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "resolutions": {
     "underscore": "^1.12.1",
@@ -69,5 +69,6 @@
     "semver": "https://github.com/RequestNetwork/requestNetwork/security/dependabot/197",
     "json-schema": "https://github.com/RequestNetwork/requestNetwork/security/dependabot/51",
     "json5": "https://github.com/RequestNetwork/requestNetwork/security/dependabot/165"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/packages/advanced-logic/package.json b/packages/advanced-logic/package.json
@@ -51,7 +51,7 @@
     "jest-junit": "16.0.0",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/currency/package.json b/packages/currency/package.json
@@ -59,6 +59,6 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/data-access/package.json b/packages/data-access/package.json
@@ -52,7 +52,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/data-format/package.json b/packages/data-format/package.json
@@ -48,7 +48,7 @@
     "@types/node": "18.11.9",
     "jest-junit": "16.0.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/epk-cipher/package.json b/packages/epk-cipher/package.json
@@ -61,7 +61,7 @@
     "ts-jest": "29.1.0",
     "ts-loader": "8.4.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"
diff --git a/packages/epk-decryption/package.json b/packages/epk-decryption/package.json
@@ -60,7 +60,7 @@
     "ts-jest": "29.1.0",
     "ts-loader": "8.4.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"
diff --git a/packages/epk-signature/package.json b/packages/epk-signature/package.json
@@ -59,7 +59,7 @@
     "ts-jest": "29.1.0",
     "ts-loader": "8.4.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"
diff --git a/packages/ethereum-storage/package.json b/packages/ethereum-storage/package.json
@@ -61,7 +61,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "web3-providers-http": "1.3.6"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
diff --git a/packages/integration-test/package.json b/packages/integration-test/package.json
@@ -74,6 +74,6 @@
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "tslib": "2.5.0",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/lit-protocol-cipher/package.json b/packages/lit-protocol-cipher/package.json
@@ -59,6 +59,6 @@
     "jest-junit": "16.0.0",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/multi-format/package.json b/packages/multi-format/package.json
@@ -50,6 +50,6 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/payment-detection/package.json b/packages/payment-detection/package.json
@@ -57,7 +57,7 @@
     "@graphql-codegen/cli": "4.0.1",
     "@graphql-codegen/typescript": "4.0.1",
     "@graphql-codegen/typescript-document-nodes": "4.0.1",
-    "@graphql-codegen/typescript-graphql-request": "6.0.1",
+    "@graphql-codegen/typescript-graphql-request": "6.2.0",
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@graphql-codegen/typescript-resolvers": "4.0.1",
     "@jridgewell/gen-mapping": "0.3.2",
@@ -68,6 +68,6 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/payment-detection/src/thegraph/client.ts b/packages/payment-detection/src/thegraph/client.ts
@@ -2,9 +2,8 @@
 import { CurrencyTypes } from '@requestnetwork/types';
 import { NearChains } from '@requestnetwork/currency';
 import { GraphQLClient } from 'graphql-request';
-import { Block_Height, Maybe, getSdk } from './generated/graphql';
+import { Block_Height, getSdk, Maybe } from './generated/graphql';
 import { getSdk as getNearSdk } from './generated/graphql-near';
-import { RequestConfig } from 'graphql-request/src/types';
 
 const THE_GRAPH_STUDIO_URL =
   'https://api.studio.thegraph.com/query/67444/request-payments-$NETWORK/version/latest';
@@ -41,6 +40,8 @@ export type TheGraphQueryOptions = {
   blockFilter?: Maybe<Block_Height>;
 };
 
+type RequestConfig = (typeof GraphQLClient.prototype)['requestConfig'];
+
 export type TheGraphClientOptions = RequestConfig & {
   /** constraint to select indexers that have at least parsed this block */
   minIndexedBlock?: number | undefined;
diff --git a/packages/payment-detection/src/thegraph/superfluid.ts b/packages/payment-detection/src/thegraph/superfluid.ts
@@ -1,6 +1,5 @@
 import { GraphQLClient } from 'graphql-request';
 import { getSdk } from './generated/graphql-superfluid';
-import { RequestConfig } from 'graphql-request/src/types';
 
 const BASE_URL = `https://subgraph-endpoints.superfluid.dev`;
 const NETWORK_TO_URL: Record<string, string> = {
@@ -16,6 +15,8 @@ const NETWORK_TO_URL: Record<string, string> = {
   xdai: 'xdai-mainnet',
 };
 
+type RequestConfig = (typeof GraphQLClient.prototype)['requestConfig'];
+
 // NB: the GraphQL client is automatically generated based on files present in ./queries,
 // using graphql-codegen.
 // To generate types, run `yarn codegen`, then open the generated files so that the code editor picks up the changes.
diff --git a/packages/payment-processor/package.json b/packages/payment-processor/package.json
@@ -58,6 +58,6 @@
     "jest-junit": "16.0.0",
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/request-client.js/package.json b/packages/request-client.js/package.json
@@ -73,7 +73,7 @@
     "ts-jest": "29.1.0",
     "ts-loader": "8.4.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"
diff --git a/packages/request-logic/package.json b/packages/request-logic/package.json
@@ -55,7 +55,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/request-node/package.json b/packages/request-node/package.json
@@ -56,7 +56,7 @@
     "@requestnetwork/utils": "0.54.0",
     "chalk": "4.1.0",
     "cors": "2.8.5",
-    "dotenv": "8.2.0",
+    "dotenv": "16.5.0",
     "ethers": "5.7.2",
     "express": "4.21.0",
     "graphql": "16.8.1",
@@ -90,7 +90,7 @@
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "ts-node-dev": "1.0.0-pre.62",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/smart-contracts/package.json b/packages/smart-contracts/package.json
@@ -78,7 +78,7 @@
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.9",
     "chai": "4.3.4",
-    "dotenv": "10.0.0",
+    "dotenv": "16.5.0",
     "ethereum-waffle": "3.4.4",
     "ethers": "5.7.2",
     "ganache-cli": "6.12.0",
diff --git a/packages/thegraph-data-access/package.json b/packages/thegraph-data-access/package.json
@@ -55,7 +55,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/thegraph-data-access/src/subgraph-client.ts b/packages/thegraph-data-access/src/subgraph-client.ts
@@ -1,5 +1,5 @@
 import { DataAccessTypes, StorageTypes } from '@requestnetwork/types';
-import { GraphQLClient } from 'graphql-request';
+import { GraphQLClient, Variables } from 'graphql-request';
 import {
   GetBlockQuery,
   GetTransactionByDataHashQuery,
@@ -10,12 +10,11 @@ import {
   Transaction,
   TransactionsBody,
 } from './queries';
-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 RequestConfig = (typeof GraphQLClient.prototype)['requestConfig'];
 type ClientConfig = Omit<RequestConfig, 'headers'> & { headers?: Record<string, string> };
 
 export class SubgraphClient implements StorageTypes.IIndexer {
diff --git a/packages/thegraph-data-access/src/types.ts b/packages/thegraph-data-access/src/types.ts
@@ -1,7 +1,8 @@
-import { StorageTypes } from '@requestnetwork/types';
-import { DataAccessBaseOptions } from '@requestnetwork/data-access';
-import { RequestConfig } from 'graphql-request/build/legacy/helpers/types';
+import type { StorageTypes } from '@requestnetwork/types';
+import type { DataAccessBaseOptions } from '@requestnetwork/data-access';
+import type { GraphQLClient } from 'graphql-request';
 
+type RequestConfig = (typeof GraphQLClient.prototype)['requestConfig'];
 export type TheGraphDataAccessOptions = DataAccessBaseOptions & {
   graphql: { url: string } & Omit<RequestConfig, 'headers'> & { headers?: Record<string, string> };
   storage?: StorageTypes.IStorageWrite;
diff --git a/packages/toolbox/package.json b/packages/toolbox/package.json
@@ -61,6 +61,6 @@
     "@types/yargs": "17.0.14",
     "cross-env": "7.0.2",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/transaction-manager/package.json b/packages/transaction-manager/package.json
@@ -51,7 +51,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "ts-node": "10.9.1",
     "typed-emitter": "2.1.0",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/usage-examples/package.json b/packages/usage-examples/package.json
@@ -43,6 +43,6 @@
   },
   "devDependencies": {
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -53,7 +53,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3"
+    "typescript": "5.8.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/web3-signature/package.json b/packages/web3-signature/package.json
@@ -60,7 +60,7 @@
     "ts-jest": "29.1.0",
     "ts-loader": "8.4.0",
     "ts-node": "10.9.1",
-    "typescript": "5.1.3",
+    "typescript": "5.8.3",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es2015",
     "module": "commonjs",
+    "moduleResolution": "node16",
     "importHelpers": true,
     "composite": true,
     "declaration": true,
@@ -10,7 +11,6 @@
     "strict": true,
     "baseUrl": "./packages",
     "skipLibCheck": true,
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "useUnknownInCatchVariables": false,
     "lib": ["es2019"]
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`"jest-junit": "16.0.0",`
`52`	`52`	`"ts-jest": "29.1.0",`
`53`	`53`	`"ts-node": "10.9.1",`
`54`		`- "typescript": "5.1.3"`
	`54`	`+ "typescript": "5.8.3"`
`55`	`55`	`},`
`56`	`56`	`"gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@`
`59`	`59`	`"source-map-support": "0.5.19",`
`60`	`60`	`"ts-jest": "29.1.0",`
`61`	`61`	`"ts-node": "10.9.1",`
`62`		`- "typescript": "5.1.3"`
	`62`	`+ "typescript": "5.8.3"`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"source-map-support": "0.5.19",`
`53`	`53`	`"ts-jest": "29.1.0",`
`54`	`54`	`"ts-node": "10.9.1",`
`55`		`- "typescript": "5.1.3"`
	`55`	`+ "typescript": "5.8.3"`
`56`	`56`	`},`
`57`	`57`	`"gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`"@types/node": "18.11.9",`
`49`	`49`	`"jest-junit": "16.0.0",`
`50`	`50`	`"ts-node": "10.9.1",`
`51`		`- "typescript": "5.1.3"`
	`51`	`+ "typescript": "5.8.3"`
`52`	`52`	`},`
`53`	`53`	`"gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@`
`74`	`74`	`"ts-jest": "29.1.0",`
`75`	`75`	`"ts-node": "10.9.1",`
`76`	`76`	`"tslib": "2.5.0",`
`77`		`- "typescript": "5.1.3"`
	`77`	`+ "typescript": "5.8.3"`
`78`	`78`	`}`
`79`	`79`	`}`