2026: add missing types and improve typescript setup

digitalfabrik · Oct 12, 2023 · 2f13996 · 2f13996
1 parent 5fdf268
commit 2f13996
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -477,7 +477,7 @@ jobs:
                 command: yarn workspace web stylelint
                 name: Stylelint
             - run:
-                command: yarn workspaces foreach run tsc --build
+                command: yarn workspaces foreach --verbose run tsc --build
                 name: TS check
             - run:
                 command: yarn tsc --build

diff --git a/.circleci/src/jobs/check.yml b/.circleci/src/jobs/check.yml
@@ -23,7 +23,7 @@ steps:
       command: yarn workspace web stylelint
   - run:
       name: TS check
-      command: yarn workspaces foreach run tsc --build
+      command: yarn workspaces foreach --verbose run tsc --build
   - run:
       name: TS check native
       command: yarn tsc --build

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/api-client/package.json b/api-client/package.json
@@ -8,7 +8,8 @@
   "peerDependencies": {
     "@types/luxon": "3",
     "luxon": ">=3.4",
-    "react": "^18.2"
+    "react": "^18.2",
+    "rrule": "2"
   },
   "dependencies": {
     "@turf/distance": "^6.5.0",
@@ -17,7 +18,6 @@
     "lodash": "^4.17.21",
     "normalize-path": "^3.0.0",
     "normalize-strings": "^1.1.1",
-    "rrule": "2.7.2",
     "seedrandom": "^3.0.5",
     "uuid": "^9.0.0"
   },
@@ -36,6 +36,7 @@
     "jest-mock": "^29.7.0",
     "luxon": "^3.4.2",
     "md5": "^2.3.0",
-    "react": "^18.2.0"
+    "react": "^18.2.0",
+    "rrule": "^2.7.2"
   }
 }
diff --git a/e2e-tests/native/capabilities.ts b/e2e-tests/native/capabilities.ts
@@ -3,7 +3,7 @@ import { Capabilities } from '@wdio/types'
 import { getGitBranch, getGitHeadReference } from '../shared/git'
 
 const browserstackCaps = (
-  config: Capabilities.AppiumW3CCapabilities | Capabilities.AppiumXCUITestCapabilities,
+  config: Capabilities.AppiumCapabilities | Capabilities.AppiumXCUITestCapabilities,
   platformName: 'ios' | 'android',
 ): Capabilities.Capabilities => {
   // is set by circleci https://github.com/circleci/circleci-docs/blob/master/jekyll/_cci1/environment-variables.md

diff --git a/native/tsconfig.json b/native/tsconfig.json
@@ -10,6 +10,7 @@
     "module": "es2020",
     "outDir": "dist",
     "paths": {
+      "react-native": ["./node_modules/@types/react-native"],
       "normalize-strings": ["../api-client/src/@types/normalize-strings"],
       "@dr.pogodin/react-native-static-server": ["src/@types/react-native-static-server"],
       "@react-native-async-storage/async-storage/jest/async-storage-mock": ["src/@types/untyped"]

diff --git a/native/yarn.lock b/native/yarn.lock
@@ -3947,13 +3947,13 @@ __metadata:
     lodash: ^4.17.21
     normalize-path: ^3.0.0
     normalize-strings: ^1.1.1
-    rrule: 2.7.2
     seedrandom: ^3.0.5
     uuid: ^9.0.0
   peerDependencies:
     "@types/luxon": 3
     luxon: ">=3.4"
     react: ^18.2
+    rrule: 2
   languageName: node
   linkType: soft
 

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "circleci:update-config": "cd $PROJECT_CWD && { cat .circleci/autogenerated_header.yml; circleci config pack .circleci/src; } > .circleci/config.yml && circleci config validate",
     "prettier:check": "cd $PROJECT_CWD && prettier --ignore-path .prettierignore --check $PWD",
     "prettier:write": "cd $PROJECT_CWD && prettier --ignore-path .prettierignore --write $PWD",
-    "ts:check": "cd $INIT_CWD && yarn run -T tsc --build",
+    "ts:check": "tsc --build",
     ":native": "cd $PROJECT_CWD/native && yarn",
     "postinstall": "husky install"
   },

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,5 +13,14 @@
     "target": "ESNext",
     "useDefineForClassFields": false
   },
-  "include": ["jest.config.ts", ".prettierrc.js", ".eslintrc.js"]
+  "include": ["jest.config.ts", ".prettierrc.js", ".eslintrc.js"],
+  "references": [
+    { "path": "api-client" },
+    { "path": "build-configs"},
+    { "path": "e2e-tests"},
+    { "path": "native"},
+    { "path": "tools"},
+    { "path": "translations"},
+    { "path": "web"}
+  ]
 }
diff --git a/web/package.json b/web/package.json
@@ -50,6 +50,7 @@
     "react-map-gl": "^7.1.5",
     "react-router-dom": "^6.15.0",
     "react-spring-bottom-sheet": "^3.4.1",
+    "rrule": "^2.7.2",
     "schema-dts": "^1.1.2",
     "styled-components": "^5.3.11",
     "translations": "workspace:*",

diff --git a/yarn.lock b/yarn.lock
@@ -3732,13 +3732,14 @@ __metadata:
     normalize-path: ^3.0.0
     normalize-strings: ^1.1.1
     react: ^18.2.0
-    rrule: 2.7.2
+    rrule: ^2.7.2
     seedrandom: ^3.0.5
     uuid: ^9.0.0
   peerDependencies:
     "@types/luxon": 3
     luxon: ">=3.4"
     react: ^18.2
+    rrule: 2
   languageName: unknown
   linkType: soft
 
@@ -13528,7 +13529,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rrule@npm:2.7.2":
+"rrule@npm:^2.7.2":
   version: 2.7.2
   resolution: "rrule@npm:2.7.2"
   dependencies:
@@ -15812,6 +15813,7 @@ __metadata:
     react-refresh-typescript: ^2.0.9
     react-router-dom: ^6.15.0
     react-spring-bottom-sheet: ^3.4.1
+    rrule: ^2.7.2
     schema-dts: ^1.1.2
     style-loader: ^3.3.3
     styled-components: ^5.3.11