From 6bb9ad301d881a85db47de77258bf889a30df3dd Mon Sep 17 00:00:00 2001 From: Arnaud Brousseau Date: Tue, 12 Dec 2023 17:44:25 -0800 Subject: [PATCH] Upgrade to node 18 --- .nvmrc | 2 +- package.json | 4 +- packages/api-key-stamper/package.json | 2 +- packages/cosmjs/package.json | 2 +- packages/ethers/package.json | 2 +- packages/http/src/universal.ts | 8 +-- packages/iframe-stamper/package.json | 2 +- packages/webauthn-stamper/package.json | 2 +- pnpm-lock.yaml | 76 ++++++++++++++------------ 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.nvmrc b/.nvmrc index dac255d28..bb52a169c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.15.1 +v18.18.2 diff --git a/package.json b/package.json index 4124f8bda..292293500 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=16.0.0", + "node": ">=18.0.0", "npm": "^8.0.0", "pnpm": "^8.0.0" }, @@ -28,7 +28,7 @@ "@rollup/plugin-typescript": "^11.1.5", "@tsconfig/node16-strictest": "^1.0.4", "@turnkey/jest-config": "workspace:*", - "@types/node": "^16.0.0", + "@types/node": "^18.0.0", "jest": "^29.3.1", "prettier": "^2.8.4", "rimraf": "^3.0.2", diff --git a/packages/api-key-stamper/package.json b/packages/api-key-stamper/package.json index f616312a4..ef2f0f252 100644 --- a/packages/api-key-stamper/package.json +++ b/packages/api-key-stamper/package.json @@ -48,7 +48,7 @@ "typecheck": "tsc -p tsconfig.typecheck.json" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "browser": { "crypto": false diff --git a/packages/cosmjs/package.json b/packages/cosmjs/package.json index f6e6c0565..137a3e4d4 100644 --- a/packages/cosmjs/package.json +++ b/packages/cosmjs/package.json @@ -57,6 +57,6 @@ "cosmjs-types": "^0.8.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } } diff --git a/packages/ethers/package.json b/packages/ethers/package.json index e8e2e0bba..419428e02 100644 --- a/packages/ethers/package.json +++ b/packages/ethers/package.json @@ -64,6 +64,6 @@ "hardhat": "^2.12.7" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } } diff --git a/packages/http/src/universal.ts b/packages/http/src/universal.ts index 67d68e186..5b3c4f45a 100644 --- a/packages/http/src/universal.ts +++ b/packages/http/src/universal.ts @@ -1,11 +1,7 @@ /// import { fetch as xFetch } from "cross-fetch"; -let fetch: typeof globalThis.fetch; -if (typeof globalThis?.fetch !== "undefined") { - fetch = globalThis.fetch; -} else { - fetch = xFetch; -} +// This is useful for mocking fetch in tests. +const fetch = xFetch; export { fetch }; diff --git a/packages/iframe-stamper/package.json b/packages/iframe-stamper/package.json index d2f1c3762..b136950a4 100644 --- a/packages/iframe-stamper/package.json +++ b/packages/iframe-stamper/package.json @@ -47,6 +47,6 @@ "typecheck": "tsc -p tsconfig.typecheck.json" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } } diff --git a/packages/webauthn-stamper/package.json b/packages/webauthn-stamper/package.json index f04aa1de8..b89655d47 100644 --- a/packages/webauthn-stamper/package.json +++ b/packages/webauthn-stamper/package.json @@ -47,7 +47,7 @@ "typecheck": "tsc -p tsconfig.typecheck.json" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "dependencies": { "buffer": "^6.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d59aaf05..cfcb58e9e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,11 +28,11 @@ importers: specifier: workspace:* version: link:internal/jest-config '@types/node': - specifier: ^16.0.0 - version: 16.18.12 + specifier: ^18.0.0 + version: 18.0.0 jest: specifier: ^29.3.1 - version: 29.4.3(@types/node@16.18.12) + version: 29.4.3(@types/node@18.0.0) prettier: specifier: ^2.8.4 version: 2.8.4 @@ -617,7 +617,7 @@ importers: version: 29.5.3 jest: specifier: ^29.3.1 - version: 29.4.3(@types/node@16.18.12) + version: 29.4.3(@types/node@18.0.0) viem: specifier: ^1.16.6 version: 1.16.6(typescript@5.1.5) @@ -3223,7 +3223,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 jest-message-util: 29.4.3 jest-util: 29.4.3 @@ -3244,14 +3244,14 @@ packages: '@jest/test-result': 29.4.3 '@jest/transform': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.10 jest-changed-files: 29.4.3 - jest-config: 29.4.3(@types/node@16.18.12) + jest-config: 29.4.3(@types/node@18.0.0) jest-haste-map: 29.4.3 jest-message-util: 29.4.3 jest-regex-util: 29.4.3 @@ -3278,7 +3278,7 @@ packages: dependencies: '@jest/fake-timers': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 jest-mock: 29.4.3 dev: true @@ -3305,7 +3305,7 @@ packages: dependencies: '@jest/types': 29.4.3 '@sinonjs/fake-timers': 10.0.2 - '@types/node': 16.18.12 + '@types/node': 18.0.0 jest-message-util: 29.4.3 jest-mock: 29.4.3 jest-util: 29.4.3 @@ -3338,7 +3338,7 @@ packages: '@jest/transform': 29.4.3 '@jest/types': 29.4.3 '@jridgewell/trace-mapping': 0.3.17 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -3424,7 +3424,7 @@ packages: '@jest/schemas': 29.4.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 16.18.12 + '@types/node': 18.0.0 '@types/yargs': 17.0.22 chalk: 4.1.2 @@ -4584,23 +4584,23 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 /@types/bn.js@5.1.1: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 /@types/bn.js@5.1.2: resolution: {integrity: sha512-dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 dev: false /@types/estree@1.0.5: @@ -4610,7 +4610,7 @@ packages: /@types/graceful-fs@4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 /@types/is-ci@3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} @@ -4654,6 +4654,10 @@ packages: /@types/node@16.18.12: resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==} + dev: true + + /@types/node@18.0.0: + resolution: {integrity: sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==} /@types/node@20.3.1: resolution: {integrity: sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==} @@ -4666,7 +4670,7 @@ packages: /@types/pbkdf2@3.1.0: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 /@types/prettier@2.7.2: resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==} @@ -4700,7 +4704,7 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 safe-buffer: 5.1.2 dev: false @@ -4711,7 +4715,7 @@ packages: /@types/secp256k1@4.0.3: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 /@types/semver@6.2.3: resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==} @@ -4724,7 +4728,7 @@ packages: /@types/ws@7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 dev: false /@types/yargs-parser@21.0.0: @@ -7742,7 +7746,7 @@ packages: '@jest/expect': 29.4.3 '@jest/test-result': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -7761,7 +7765,7 @@ packages: - supports-color dev: true - /jest-cli@29.4.3(@types/node@16.18.12): + /jest-cli@29.4.3(@types/node@18.0.0): resolution: {integrity: sha512-PiiAPuFNfWWolCE6t3ZrDXQc6OsAuM3/tVW0u27UWc1KE+n/HSn5dSE6B2juqN7WP+PP0jAcnKtGmI4u8GMYCg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -7778,7 +7782,7 @@ packages: exit: 0.1.2 graceful-fs: 4.2.10 import-local: 3.1.0 - jest-config: 29.4.3(@types/node@16.18.12) + jest-config: 29.4.3(@types/node@18.0.0) jest-util: 29.4.3 jest-validate: 29.4.3 prompts: 2.4.2 @@ -7789,7 +7793,7 @@ packages: - ts-node dev: true - /jest-config@29.4.3(@types/node@16.18.12): + /jest-config@29.4.3(@types/node@18.0.0): resolution: {integrity: sha512-eCIpqhGnIjdUCXGtLhz4gdDoxKSWXKjzNcc5r+0S1GKOp2fwOipx5mRcwa9GB/ArsxJ1jlj2lmlD9bZAsBxaWQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -7804,7 +7808,7 @@ packages: '@babel/core': 7.20.12 '@jest/test-sequencer': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 babel-jest: 29.4.3(@babel/core@7.20.12) chalk: 4.1.2 ci-info: 3.8.0 @@ -7863,7 +7867,7 @@ packages: '@jest/environment': 29.4.3 '@jest/fake-timers': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 jest-mock: 29.4.3 jest-util: 29.4.3 dev: true @@ -7879,7 +7883,7 @@ packages: dependencies: '@jest/types': 29.4.3 '@types/graceful-fs': 4.1.6 - '@types/node': 16.18.12 + '@types/node': 18.0.0 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.10 @@ -7929,7 +7933,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 jest-util: 29.4.3 dev: true @@ -7983,7 +7987,7 @@ packages: '@jest/test-result': 29.4.3 '@jest/transform': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.10 @@ -8014,7 +8018,7 @@ packages: '@jest/test-result': 29.4.3 '@jest/transform': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -8070,7 +8074,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.10 @@ -8094,7 +8098,7 @@ packages: dependencies: '@jest/test-result': 29.4.3 '@jest/types': 29.4.3 - '@types/node': 16.18.12 + '@types/node': 18.0.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -8106,12 +8110,12 @@ packages: resolution: {integrity: sha512-GLHN/GTAAMEy5BFdvpUfzr9Dr80zQqBrh0fz1mtRMe05hqP45+HfQltu7oTBfduD0UeZs09d+maFtFYAXFWvAA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 16.18.12 + '@types/node': 18.0.0 jest-util: 29.4.3 merge-stream: 2.0.0 supports-color: 8.1.1 - /jest@29.4.3(@types/node@16.18.12): + /jest@29.4.3(@types/node@18.0.0): resolution: {integrity: sha512-XvK65feuEFGZT8OO0fB/QAQS+LGHvQpaadkH5p47/j3Ocqq3xf2pK9R+G0GzgfuhXVxEv76qCOOcMb5efLk6PA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -8124,7 +8128,7 @@ packages: '@jest/core': 29.4.3 '@jest/types': 29.4.3 import-local: 3.1.0 - jest-cli: 29.4.3(@types/node@16.18.12) + jest-cli: 29.4.3(@types/node@18.0.0) transitivePeerDependencies: - '@types/node' - supports-color @@ -9110,7 +9114,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 16.18.12 + '@types/node': 18.0.0 long: 5.2.3 /proxy-from-env@1.1.0: