pr followup + add tsconfig paths to examples

latticexyz · May 23, 2024 · f400d7e · f400d7e
1 parent 3bf8220
commit f400d7e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 71 deletions.
diff --git a/examples/minimal/packages/client-phaser/tsconfig.json b/examples/minimal/packages/client-phaser/tsconfig.json
@@ -1,20 +1,9 @@
 {
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/examples/minimal/packages/client-react/tsconfig.json b/examples/minimal/packages/client-react/tsconfig.json
@@ -1,20 +1,9 @@
 {
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/examples/minimal/packages/client-vanilla/tsconfig.json b/examples/minimal/packages/client-vanilla/tsconfig.json
@@ -1,20 +1,9 @@
 {
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "skipLibCheck": true
+    "lib": ["ESNext", "DOM"]
   },
   "include": ["src"]
 }
diff --git a/examples/minimal/packages/contracts/tsconfig.json b/examples/minimal/packages/contracts/tsconfig.json
@@ -1,12 +1,3 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "Bundler"
-  }
+  "extends": "../../../../tsconfig.json"
 }
diff --git a/examples/multiple-accounts/packages/client/tsconfig.json b/examples/multiple-accounts/packages/client/tsconfig.json
@@ -1,17 +1,10 @@
 {
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["vite/client"],
     "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
     "lib": ["ESNext", "DOM"],
     "moduleResolution": "Bundler",
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   },

diff --git a/examples/multiple-accounts/packages/contracts/tsconfig.json b/examples/multiple-accounts/packages/contracts/tsconfig.json
@@ -1,12 +1,3 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "Preserve",
-    "strict": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "Bundler"
-  }
+  "extends": "../../../../tsconfig.json"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -71,7 +71,7 @@
     "@types/debug": "^4.1.7",
     "@types/ejs": "^3.1.1",
     "@types/glob": "^7.2.0",
-    "@types/node": " 20.12.12",
+    "@types/node": "^18.15.11",
     "@types/openurl": "^1.0.0",
     "@types/throttle-debounce": "^5.0.0",
     "@types/toposort": "^2.0.6",

diff --git a/packages/schema-type/tsconfig.json b/packages/schema-type/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "types": []
+    "outDir": "dist"
   },
   "include": ["src"]
 }
diff --git a/packages/world/ts/worldEvents.test.ts b/packages/world/ts/worldEvents.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import IWorldFactoryAbi from "../out/IWorldFactory.sol/IWorldFactory.abi.json";
 import IBaseWorldAbi from "../out/IBaseWorld.sol/IBaseWorld.abi.json";
-import { helloWorldEvent, worldDeployedEvent } from "./worldEvents.js";
+import { helloWorldEvent, worldDeployedEvent } from "./worldEvents";
 import { parseAbiItem, AbiEvent } from "abitype";
 
 function normalizeAbiEvent(event: AbiEvent) {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml