♻️ chore: Update ethers and tsconfig to NodeNext (#573)

## Description Update ethers and tsconfig to NodeNext ## Testing Explain the quality checks that have been done on the code changes ## Additional Information - [ ] I read the [contributing docs](../docs/contributing.md) (if this is your first contribution) Your ENS/address: --------- Co-authored-by: Will Cory <[email protected]>
evmts · Oct 16, 2023 · a8248fb · a8248fb · vercel · Oct 16, 2023
1 parent eee7e7f
commit a8248fb
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 63 deletions.
diff --git a/.changeset/afraid-socks-work.md 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
@@ -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
@@ -4,12 +4,10 @@
     "rootDir": "src",
     "composite": true,
     "outDir": "types",
-    "skipLibCheck": true,
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext"
+    "skipLibCheck": true
   },
   "include": [
     "src",
     "src/**/*.json"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
+  ]
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
+  ]
+}
diff --git 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
@@ -4,12 +4,10 @@
     "rootDir": "src",
     "composite": true,
     "outDir": "types",
-    "skipLibCheck": true,
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext"
+    "skipLibCheck": true
   },
   "include": [
     "src",
     "src/**/*.json"
   ]
-}
+}
diff --git 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"
   ]
-}
+}
diff --git 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
 	}
-}
+}