diff --git a/.changeset/afraid-socks-work.md b/.changeset/afraid-socks-work.md new file mode 100644 index 0000000000..b4dbe6c335 --- /dev/null +++ b/.changeset/afraid-socks-work.md @@ -0,0 +1,5 @@ +--- +"@evmts/tsconfig": patch +--- + +Updated shared tsconfig to default to NodeNext diff --git a/.changeset/rich-ants-clean.md b/.changeset/rich-ants-clean.md new file mode 100644 index 0000000000..9443fa17f8 --- /dev/null +++ b/.changeset/rich-ants-clean.md @@ -0,0 +1,5 @@ +--- +"@evmts/ethers": patch +--- + +Converted @evmts/ethers to NodeNext. This will help compatibility diff --git a/blockexplorer/tsconfig.json b/blockexplorer/tsconfig.json index c3f9457933..e0ca1234e4 100644 --- a/blockexplorer/tsconfig.json +++ b/blockexplorer/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "module": "NodeNext", - "moduleResolution": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/bun/tsconfig.json b/bundlers/bun/tsconfig.json index f172bf0b2b..34d53a56e6 100644 --- a/bundlers/bun/tsconfig.json +++ b/bundlers/bun/tsconfig.json @@ -5,12 +5,12 @@ "composite": true, "outDir": "types", "skipLibCheck": true, - "types": ["bun-types"], - "moduleResolution": "NodeNext", - "module": "NodeNext" + "types": [ + "bun-types" + ] }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/bundler/tsconfig.json b/bundlers/bundler/tsconfig.json index 369dcb2db6..e4a7b177b9 100644 --- a/bundlers/bundler/tsconfig.json +++ b/bundlers/bundler/tsconfig.json @@ -5,9 +5,11 @@ "outDir": "types", "skipLibCheck": true, "allowSyntheticDefaultImports": true, - "resolveJsonModule": true, - "moduleResolution": "NodeNext", - "module": "NodeNext" + "resolveJsonModule": true }, - "include": ["src", "src/**/*.json", "package.json"] -} + "include": [ + "src", + "src/**/*.json", + "package.json" + ] +} \ No newline at end of file diff --git a/bundlers/esbuild/tsconfig.json b/bundlers/esbuild/tsconfig.json index bcd3009f90..e0ca1234e4 100644 --- a/bundlers/esbuild/tsconfig.json +++ b/bundlers/esbuild/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "moduleResolution": "NodeNext", - "module": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/rollup/tsconfig.json b/bundlers/rollup/tsconfig.json index bcd3009f90..e0ca1234e4 100644 --- a/bundlers/rollup/tsconfig.json +++ b/bundlers/rollup/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "moduleResolution": "NodeNext", - "module": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/rspack/tsconfig.json b/bundlers/rspack/tsconfig.json index 1ee749ad43..e0ca1234e4 100644 --- a/bundlers/rspack/tsconfig.json +++ b/bundlers/rspack/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "moduleResolution": "NodeNext", - "module": "NodeNext", "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/vite/tsconfig.json b/bundlers/vite/tsconfig.json index 1ee749ad43..e0ca1234e4 100644 --- a/bundlers/vite/tsconfig.json +++ b/bundlers/vite/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "moduleResolution": "NodeNext", - "module": "NodeNext", "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/bundlers/webpack/tsconfig.json b/bundlers/webpack/tsconfig.json index 1ee749ad43..e0ca1234e4 100644 --- a/bundlers/webpack/tsconfig.json +++ b/bundlers/webpack/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "moduleResolution": "NodeNext", - "module": "NodeNext", "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/config/tsconfig.json b/config/tsconfig.json index ab03d7a0c1..6bf3090098 100644 --- a/config/tsconfig.json +++ b/config/tsconfig.json @@ -3,12 +3,10 @@ "compilerOptions": { "composite": true, "outDir": "types", - "skipLibCheck": true, - "moduleResolution": "NodeNext", - "module": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/core/tsconfig.json b/core/tsconfig.json index f0ce3d58cf..fc6c549671 100644 --- a/core/tsconfig.json +++ b/core/tsconfig.json @@ -6,7 +6,8 @@ "outDir": "types", "skipLibCheck": true, // this should be "Bundler" but don't want to fight a broken type - "moduleResolution": "Node" + "moduleResolution": "Node", + "module": "ESNext" }, "include": [ "src", diff --git a/ethers/src/BaseContractMethod.ts b/ethers/src/BaseContractMethod.ts index 9926f62060..9f2ad28b74 100644 --- a/ethers/src/BaseContractMethod.ts +++ b/ethers/src/BaseContractMethod.ts @@ -1,4 +1,4 @@ -import type { ContractMethodArgs } from './ContractMethodArgs' +import type { ContractMethodArgs } from './ContractMethodArgs.js' import type { BaseContract, ContractTransaction, diff --git a/ethers/src/Contract.spec.ts b/ethers/src/Contract.spec.ts index 97cb7b21ca..8087e394ca 100644 --- a/ethers/src/Contract.spec.ts +++ b/ethers/src/Contract.spec.ts @@ -1,4 +1,4 @@ -import { Contract } from './Contract' +import { Contract } from './Contract.js' import { JsonRpcProvider, ethers } from 'ethers' import { assertType, describe, expect, expectTypeOf, test } from 'vitest' diff --git a/ethers/src/Contract.ts b/ethers/src/Contract.ts index d3a290af11..842d661b45 100644 --- a/ethers/src/Contract.ts +++ b/ethers/src/Contract.ts @@ -1,4 +1,4 @@ -import type { TypesafeEthersContract } from '.' +import type { TypesafeEthersContract } from './TypesafeEthersContract.js' import type { Abi } from 'abitype' import { type Addressable, diff --git a/ethers/src/TypesafeEthersContract.ts b/ethers/src/TypesafeEthersContract.ts index f616ec3e95..1a7e19e8b9 100644 --- a/ethers/src/TypesafeEthersContract.ts +++ b/ethers/src/TypesafeEthersContract.ts @@ -1,4 +1,4 @@ -import type { BaseContractMethod } from './BaseContractMethod' +import type { BaseContractMethod } from './BaseContractMethod.js' import type { Abi, AbiParametersToPrimitiveTypes, diff --git a/ethers/src/index.ts b/ethers/src/index.ts index 857e2c8ee1..1c9a78a9f5 100644 --- a/ethers/src/index.ts +++ b/ethers/src/index.ts @@ -1,4 +1,4 @@ -export * from './TypesafeEthersContract' -export * from './ContractMethodArgs' -export * from './BaseContractMethod' -export * from './Contract' +export * from './TypesafeEthersContract.js' +export * from './ContractMethodArgs.js' +export * from './BaseContractMethod.js' +export * from './Contract.js' diff --git a/experimental/solc/tsconfig.json b/experimental/solc/tsconfig.json index eb11068576..846ee9858e 100644 --- a/experimental/solc/tsconfig.json +++ b/experimental/solc/tsconfig.json @@ -2,10 +2,20 @@ "extends": "@evmts/tsconfig/base.json", "compilerOptions": { "composite": true, - "lib": ["DOM", "DOM.Iterable", "ESNext"], + "lib": [ + "DOM", + "DOM.Iterable", + "ESNext" + ], "outDir": "types", "skipLibCheck": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "moduleResolution": "Bundler", + "module": "ES2020" }, - "include": ["src", "src/**/*.json", "package.json"] -} + "include": [ + "src", + "src/**/*.json", + "package.json" + ] +} \ No newline at end of file diff --git a/revm/tsconfig.json b/revm/tsconfig.json index fc05fdfcd3..e0ca1234e4 100644 --- a/revm/tsconfig.json +++ b/revm/tsconfig.json @@ -4,8 +4,7 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "moduleResolution": "Bundler" + "skipLibCheck": true }, "include": [ "src", diff --git a/schemas/tsconfig.json b/schemas/tsconfig.json index c3f9457933..e0ca1234e4 100644 --- a/schemas/tsconfig.json +++ b/schemas/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "module": "NodeNext", - "moduleResolution": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/state/tsconfig.json b/state/tsconfig.json index bcd3009f90..e0ca1234e4 100644 --- a/state/tsconfig.json +++ b/state/tsconfig.json @@ -4,12 +4,10 @@ "rootDir": "src", "composite": true, "outDir": "types", - "skipLibCheck": true, - "moduleResolution": "NodeNext", - "module": "NodeNext" + "skipLibCheck": true }, "include": [ "src", "src/**/*.json" ] -} +} \ No newline at end of file diff --git a/tsconfig/base.json b/tsconfig/base.json index 74abf94a36..4494bba6cc 100644 --- a/tsconfig/base.json +++ b/tsconfig/base.json @@ -2,15 +2,15 @@ "$schema": "https://json.schemastore.org/tsconfig", "compilerOptions": { "target": "ESNext", - "lib": ["esnext"], - "module": "esnext", - "moduleResolution": "bundler", + "lib": [ + "esnext" + ], + "module": "NodeNext", + "moduleResolution": "NodeNext", "allowJs": true, "checkJs": true, "isolatedModules": true, "incremental": true, - "allowJs": true, - "checkJs": true, "allowUnreachableCode": false, "skipLibCheck": false, "allowUnusedLabels": false, @@ -29,4 +29,4 @@ "noUnusedParameters": true, "strict": true } -} +} \ No newline at end of file