fix: typescript type resolution (#8662)

* fix: typeRoots * fix: bad @types/sass package * fix: timeout types * fix: better setTimeout type
flybywiresim · May 27, 2024 · 1a6e658 · 1a6e658
1 parent 7cfdab4
commit 1a6e658
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 33 deletions.
diff --git a/fbw-a32nx/mach.config.js b/fbw-a32nx/mach.config.js
@@ -1,5 +1,5 @@
 const imagePlugin = require('esbuild-plugin-inline-image');
-const postCssPlugin = require('esbuild-style-plugin');
+const postCssPlugin = require('esbuild-style-plugin-v2');
 const tailwind = require('tailwindcss');
 const postCssColorFunctionalNotation = require('postcss-color-functional-notation');
 const postCssInset = require('postcss-inset');

diff --git a/fbw-a32nx/src/systems/atsu/fmsclient/tsconfig.json b/fbw-a32nx/src/systems/atsu/fmsclient/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../../../fbw-common/src/typings"]
+    "typeRoots": [
+      "../../../../fbw-common/src/typings",
+      "../../../../node_modules/@types",
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/fbw-a32nx/src/systems/instruments/src/DCDU/index.tsx b/fbw-a32nx/src/systems/instruments/src/DCDU/index.tsx
@@ -78,7 +78,7 @@ const DCDU: React.FC = () => {
   const [state, setState] = useState(isColdAndDark ? DcduState.Off : DcduState.On);
   const [systemStatusMessage, setSystemStatusMessage] = useState(MailboxStatusMessage.NoMessage);
   const [systemStatusTimer, setSystemStatusTimer] = useState<number | null>(null);
-  const [screenTimeout, setScreenTimeout] = useState<number | null>(null);
+  const [screenTimeout, setScreenTimeout] = useState<ReturnType<typeof setTimeout> | null>(null);
   const [messages, setMessages] = useState(new Map<number, DcduMessageBlock>());
   const publisherRef = useRef<Publisher<AtsuMailboxMessages> | null>();
   const messagesRef = useRef<Map<number, DcduMessageBlock>>();

diff --git a/fbw-a32nx/src/systems/instruments/src/SD/Pages/Eng/Eng.tsx b/fbw-a32nx/src/systems/instruments/src/SD/Pages/Eng/Eng.tsx
@@ -353,7 +353,7 @@ const EngineColumn = ({ x, y, engineNumber, fadecOn }: ComponentPositionProps) =
       setTempAmber(false);
     }
 
-    let timeout: number;
+    let timeout: ReturnType<typeof setTimeout>;
     if (engineOilTemperature > OIL_TEMP_HIGH_ADVISORY) {
       timeout = setTimeout(() => {
         if (engineOilTemperature > OIL_TEMP_HIGH_ADVISORY) {

diff --git a/fbw-a32nx/src/systems/sentry-client/tsconfig.json b/fbw-a32nx/src/systems/sentry-client/tsconfig.json
@@ -4,7 +4,10 @@
       "moduleResolution": "node",
       "target": "ESNext",
       "noEmit": true,
-      "typeRoots": ["../../../../fbw-common/src/typings"]
+      "typeRoots": [
+        "../../../../fbw-common/src/typings",
+        "../../../../node_modules/@types",
+      ]
     },
     "include": [
       "src/**/*",

diff --git a/fbw-a32nx/src/systems/simbridge-client/tsconfig.json b/fbw-a32nx/src/systems/simbridge-client/tsconfig.json
@@ -4,7 +4,10 @@
       "moduleResolution": "node",
       "target": "ESNext",
       "noEmit": true,
-      "typeRoots": ["../../../../fbw-common/src/typings"]
+      "typeRoots": [
+        "../../../../fbw-common/src/typings",
+        "../../../../node_modules/@types",
+      ]
     },
     "include": [
       "src/**/*",

diff --git a/fbw-a32nx/src/systems/tcas/tsconfig.json b/fbw-a32nx/src/systems/tcas/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../../../fbw-common/src/typings"]
+    "typeRoots": [
+      "../../../../fbw-common/src/typings",
+      "../../../../node_modules/@types",
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/fbw-a32nx/src/systems/tsconfig.json b/fbw-a32nx/src/systems/tsconfig.json
@@ -5,7 +5,8 @@
     "resolveJsonModule" : true,
     "skipLibCheck": true,
     "typeRoots": [
-      "../../../fbw-common/src/typings"
+      "../../../fbw-common/src/typings",
+      "../../../node_modules/@types",
     ],
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,

diff --git a/fbw-a380x/mach.config.js b/fbw-a380x/mach.config.js
@@ -1,5 +1,5 @@
 const imagePlugin = require('esbuild-plugin-inline-image');
-const postCssPlugin = require('esbuild-style-plugin');
+const postCssPlugin = require('esbuild-style-plugin-v2');
 const tailwind = require('tailwindcss');
 const postCssColorFunctionalNotation = require('postcss-color-functional-notation');
 const postCssInset = require('postcss-inset');

diff --git a/fbw-a380x/src/systems/atsu/tsconfig.json b/fbw-a380x/src/systems/atsu/tsconfig.json
@@ -4,7 +4,10 @@
       "moduleResolution": "node",
       "target": "ESNext",
       "noEmit": true,
-      "typeRoots": ["../../typings"]
+      "typeRoots": [
+        "../../typings",
+        "../../../../node_modules/@types",
+      ]
     },
     "include": [
       "src/**/*",

diff --git a/fbw-a380x/src/systems/fmgc/tsconfig.json b/fbw-a380x/src/systems/fmgc/tsconfig.json
@@ -4,11 +4,13 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../typings"]
+    "typeRoots": [
+      "../../typings",
+      "../../../../node_modules/@types",
+    ]
   },
   "include": [
       "src/**/*",
       "../../typings/**/*.d.ts",
-      "../../node_modules/@types/jest/index.d.ts"
   ]
-}
+}
diff --git a/fbw-a380x/src/systems/tcas/tsconfig.json b/fbw-a380x/src/systems/tcas/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../typings", "../node_modules/@types"],
+    "typeRoots": [
+      "../../typings",
+      "../../../../node_modules/@types"
+    ],
   },
   "include": [
     "src/**/*",

diff --git a/fbw-a380x/src/systems/tsconfig.json b/fbw-a380x/src/systems/tsconfig.json
@@ -5,7 +5,8 @@
       "resolveJsonModule" : true,
       "skipLibCheck": true,
       "typeRoots": [
-        "../../../fbw-common/src/typings"
+        "../../../fbw-common/src/typings",
+        "../../../node_modules/@types",
       ],
       "moduleResolution": "node",
       "allowSyntheticDefaultImports": true,

diff --git a/fbw-common/src/systems/datalink/aoc/tsconfig.json b/fbw-common/src/systems/datalink/aoc/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../../typings"]
+    "typeRoots": [
+      "../../../typings",
+      "../../../../../node_modules/@types",
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/fbw-common/src/systems/datalink/atc/tsconfig.json b/fbw-common/src/systems/datalink/atc/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../../typings"]
+    "typeRoots": [
+      "../../../typings",
+      "../../../../../node_modules/@types",
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/fbw-common/src/systems/datalink/router/tsconfig.json b/fbw-common/src/systems/datalink/router/tsconfig.json
@@ -4,7 +4,10 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "noEmit": true,
-    "typeRoots": ["../../../typings"]
+    "typeRoots": [
+      "../../../typings",
+      "../../../../../node_modules/@types",
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/fbw-common/src/systems/tsconfig.json b/fbw-common/src/systems/tsconfig.json
@@ -5,6 +5,7 @@
     "resolveJsonModule" : true,
     "typeRoots": [
       "../typings",
+      "../../../node_modules/@types",
     ],
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,

diff --git a/package.json b/package.json
@@ -161,7 +161,7 @@
     "byte-data": "^19.0.1",
     "classnames": "^2.2.6",
     "esbuild-plugin-inline-image": "^0.0.8",
-    "esbuild-style-plugin": "^1.6.0",
+    "esbuild-style-plugin-v2": "^1.6.5",
     "geolib": "^3.3.3",
     "i18next": "^21.6.14",
     "json5": "^2.2.3",
@@ -195,4 +195,4 @@
     "uuid": "^9.0.0",
     "ws": "^7.4.5"
   }
-}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml