chore: migrate to typescript v6, update pnpm dependencies (#84)

google-labs-jules[bot] · web-flow · commit 5db889f090c8 · 2026-06-08T23:56:43.000+02:00
* chore: migrate to typescript v6, update pnpm dependencies

* test: fix mock timeout issue when migrating to typescript 6

* ci: pin pnpm version in github action config

---------

Co-authored-by: google-labs-jules[bot] &lt;161369871+google-labs-jules[bot]@users.noreply.github.com&gt;
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -37,6 +37,7 @@ jobs:
         id: pnpm-install
         with:
           run_install: true
+          version: 9.15.4
 
       - name: Get pnpm store directory
         id: pnpm-cache
@@ -66,6 +67,7 @@ jobs:
         id: pnpm-install
         with:
           run_install: true
+          version: 9.15.4
       - id: set-matrix
         run: |
           export MATRIX=$(pnpm -s m ls --depth -1 -F "./packages/**" --json | jq -c)
@@ -147,6 +149,7 @@ jobs:
         id: pnpm-install
         with:
           run_install: true
+          version: 9.15.4
 
       - name: Get pnpm store directory
         id: pnpm-cache
diff --git a/.github/workflows/build_and_test/action.yml b/.github/workflows/build_and_test/action.yml
@@ -32,12 +32,12 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
 
-    - uses: pnpm/action-setup@v2
+    - uses: pnpm/action-setup@v4
       name: Install pnpm
       id: pnpm-install
       with:
         run_install: true
-        version: latest
+        version: 9.15.4
 
     - name: Get pnpm store directory
       id: pnpm-cache
diff --git a/dev/raw/package.json b/dev/raw/package.json
@@ -12,14 +12,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/node": "22.7.6",
+    "@types/node": "25.9.2",
     "crowdsec-client": "workspace:^",
     "crowdsec-client-scenarios": "workspace:^",
     "crowdsec-http-middleware": "workspace:^"
   },
   "devDependencies": {
-    "@types/express": "5.0.0",
-    "dotenv": "16.4.5",
+    "@types/express": "5.0.6",
+    "dotenv": "17.4.2",
     "source-map-support": "0.5.21"
   }
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,40 @@
+const {
+    defineConfig,
+    globalIgnores,
+} = require("eslint/config");
+
+const tsParser = require("@typescript-eslint/parser");
+const js = require("@eslint/js");
+
+const {
+    FlatCompat,
+} = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+module.exports = defineConfig([{
+    files: ["packages/**/*.ts", "dev/**/*.ts", "examples/**/*.ts"],
+    languageOptions: {
+        parser: tsParser,
+        ecmaVersion: 2018,
+        sourceType: "module",
+        parserOptions: {},
+    },
+
+    extends: compat.extends("plugin:prettier/recommended", "prettier"),
+
+    rules: {
+        camelcase: "off",
+        "@typescript-eslint/camelcase": "off",
+        "@typescript-eslint/interface-name-prefix": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        indent: "off",
+        "@typescript-eslint/no-object-literal-type-assertion": "off",
+        "@typescript-eslint/no-inferrable-types": "off",
+        "@typescript-eslint/ban-ts-ignore": "off",
+    },
+}, globalIgnores(["**/*.hbs", "**/*.md"])]);
diff --git a/examples/express-bouncer-cjs/package.json b/examples/express-bouncer-cjs/package.json
@@ -11,11 +11,11 @@
   "license": "ISC",
   "dependencies": {
     "crowdsec-client": "workspace:^",
-    "express": "^4.21.1"
+    "express": "^5.2.1"
   },
   "devDependencies": {
-    "@types/express": "^5.0.0",
-    "dotenv": "^16.4.5",
+    "@types/express": "^5.0.6",
+    "dotenv": "^17.4.2",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/examples/express-bouncer/package.json b/examples/express-bouncer/package.json
@@ -12,11 +12,11 @@
   "license": "ISC",
   "dependencies": {
     "crowdsec-client": "workspace:^",
-    "express": "^4.21.1"
+    "express": "^5.2.1"
   },
   "devDependencies": {
-    "@types/express": "^5.0.0",
-    "dotenv": "^16.4.5",
+    "@types/express": "^5.0.6",
+    "dotenv": "^17.4.2",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/examples/express-web-parser/package.json b/examples/express-web-parser/package.json
@@ -12,11 +12,11 @@
   "license": "ISC",
   "dependencies": {
     "crowdsec-client": "workspace:^",
-    "express": "^4.21.1"
+    "express": "^5.2.1"
   },
   "devDependencies": {
-    "@types/express": "^5.0.0",
-    "dotenv": "^16.4.5",
+    "@types/express": "^5.0.6",
+    "dotenv": "^17.4.2",
     "source-map-support": "^0.5.21"
   }
 }
diff --git a/package.json b/package.json
@@ -9,17 +9,20 @@
     "generate:documentation": "typedoc"
   },
   "devDependencies": {
-    "@tsconfig/node-lts": "20.1.3",
-    "@types/jest": "29.5.14",
-    "@types/node": "22.7.6",
-    "@typescript-eslint/parser": "7.0.2",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "prettier": "3.2.5",
+    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/js": "^10.0.1",
+    "@tsconfig/node-lts": "24.0.0",
+    "@types/jest": "30.0.0",
+    "@types/node": "25.9.2",
+    "@typescript-eslint/parser": "8.60.1",
+    "eslint": "10.4.1",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-prettier": "5.5.6",
+    "prettier": "3.8.3",
+    "ts-jest": "^29.4.11",
     "ts-node": "10.9.2",
-    "typedoc": "0.26.10",
-    "typescript": "5.6.3"
+    "typedoc": "0.28.19",
+    "typescript": "6.0.3"
   },
   "packageManager": "pnpm@9.15.4"
 }
diff --git a/packages/crowdsec-client-scenarios/package.json b/packages/crowdsec-client-scenarios/package.json
@@ -19,7 +19,7 @@
         "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
         "test:ci": "npm run jest -- --ci",
         "test:ci:coverage": "npm run jest -- --ci --coverage",
-        "lint": "eslint -f unix \"src/**\"",
+        "lint": "eslint src",
         "lint:fix": "npm lint -- --fix",
         "ci:eslint": "npm run lint -- -f json -o ./coverage/eslint-report.json"
     },
@@ -54,26 +54,26 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "debug": "^4.3.7",
-        "ip-address": "^10.0.1",
-        "lru-cache": "^11.0.1",
-        "maxmind": "^4.3.22"
+        "debug": "^4.4.3",
+        "ip-address": "^10.2.0",
+        "lru-cache": "^11.5.1",
+        "maxmind": "^5.0.6"
     },
     "engines": {
         "node": ">=16"
     },
     "devDependencies": {
-        "@jest/globals": "29.7.0",
-        "@types/debug": "4.1.12",
+        "@jest/globals": "30.4.1",
+        "@types/debug": "4.1.13",
         "crowdsec-client": "workspace:^",
-        "dotenv": "16.4.5",
-        "esbuild": "0.24.0",
-        "jest": "29.7.0",
+        "dotenv": "17.4.2",
+        "esbuild": "0.28.0",
+        "jest": "30.4.2",
         "jest-sonar": "0.2.16",
-        "mmdb-lib": "2.1.1",
-        "rimraf": "6.0.1",
+        "mmdb-lib": "3.0.2",
+        "rimraf": "6.1.3",
         "source-map-support": "0.5.21",
-        "ts-jest": "29.2.5",
+        "ts-jest": "29.4.11",
         "ts-node": "10.9.2"
     },
     "funding": [
diff --git a/packages/crowdsec-client-scenarios/tsconfig.json b/packages/crowdsec-client-scenarios/tsconfig.json
@@ -1,7 +1,8 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "outDir": "./lib"
+        "outDir": "./lib",
+        "rootDir": "./src"
     },
     "include": ["src"],
     "ts-node": {
diff --git a/packages/crowdsec-client/package.json b/packages/crowdsec-client/package.json
@@ -20,7 +20,7 @@
         "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
         "test:ci": "npm run jest -- --ci",
         "test:ci:coverage": "npm run jest -- --ci --coverage",
-        "lint": "eslint -f unix \"src/**\"",
+        "lint": "eslint src",
         "lint:fix": "npm lint -- --fix",
         "ci:eslint": "npm run lint -- -f json -o ./coverage/eslint-report.json"
     },
@@ -55,23 +55,23 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "axios": "^1.7.7",
-        "debug": "^4.3.7"
+        "axios": "^1.17.0",
+        "debug": "^4.4.3"
     },
     "engines": {
         "node": ">=18.12"
     },
     "devDependencies": {
-        "@jest/globals": "29.7.0",
-        "@types/debug": "4.1.12",
-        "dotenv": "16.4.5",
-        "esbuild": "0.24.0",
-        "jest": "29.7.0",
+        "@jest/globals": "30.4.1",
+        "@types/debug": "4.1.13",
+        "dotenv": "17.4.2",
+        "esbuild": "0.28.0",
+        "jest": "30.4.2",
         "jest-sonar": "0.2.16",
-        "rimraf": "6.0.1",
+        "rimraf": "6.1.3",
         "source-map-support": "0.5.21",
-        "swagger-typescript-api": "13.0.22",
-        "ts-jest": "29.2.5",
+        "swagger-typescript-api": "13.12.1",
+        "ts-jest": "29.4.11",
         "ts-node": "10.9.2"
     },
     "funding": [
diff --git a/packages/crowdsec-client/src/interfaces/index.ts b/packages/crowdsec-client/src/interfaces/index.ts
@@ -1,7 +1,7 @@
 export * from './ICrowdSecClientOptions.js';
 export * from './IBouncerClientOptions.js';
 export * from './IWatcherClientOptions.js';
-export { ITLSAuthentication } from './ITLSAuthentication.js';
-export { IWatcherAuthentication } from './IWatcherAuthentication.js';
-export { IBouncerAuthentication } from './IBouncerAuthentication.js';
-export { IHTTPOptions } from './IHTTPOptions.js';
+export type { ITLSAuthentication } from './ITLSAuthentication.js';
+export type { IWatcherAuthentication } from './IWatcherAuthentication.js';
+export type { IBouncerAuthentication } from './IBouncerAuthentication.js';
+export type { IHTTPOptions } from './IHTTPOptions.js';
diff --git a/packages/crowdsec-client/src/utils.ts b/packages/crowdsec-client/src/utils.ts
@@ -74,7 +74,7 @@ export const parseExpiration = (duration: string) => {
     return new Date(Date.now() + seconds * multiplier);
 };
 
-export const forceArray = <T>(p: Readonly<T | Array<T>>): Array<T> => (Array.isArray(p) ? p : [p]);
+export const forceArray = <T>(p: Readonly<T | Array<T>>): Array<T> => (Array.isArray(p) ? (p as T[]) : [p as T]);
 
 /**
  * the job of this function, is to unblock the loop when running a long while
diff --git a/packages/crowdsec-client/tests/Clients/WatcherClient.test.ts b/packages/crowdsec-client/tests/Clients/WatcherClient.test.ts
@@ -187,22 +187,22 @@ describe('WatcherClient.test.ts', () => {
 
         describe('_login', () => {
             let _login: WatcherClientType['_login'];
-            const oldSetTimeout = setTimeout;
+            const oldSetTimeout = global.setTimeout;
             const mockSetTimeout = jest.fn();
             const mockSetAuthenticationHeaders = jest.fn();
             beforeEach(() => {
                 // @ts-ignore
                 _login = watcher._login.bind(watcher);
                 // @ts-ignore
-                setTimeout = mockSetTimeout;
+                global.setTimeout = mockSetTimeout as any;
 
                 // @ts-ignore
                 watcher.setAuthenticationHeaders = mockSetAuthenticationHeaders;
             });
 
             afterEach(() => {
                 // @ts-ignore
-                setTimeout = oldSetTimeout;
+                global.setTimeout = oldSetTimeout;
             });
             it('should log in with machineId and password', async () => {
                 httpPostMock.mockImplementationOnce(() => ({
@@ -406,18 +406,18 @@ describe('WatcherClient.test.ts', () => {
         });
         describe('heartbeatLoop', () => {
             let heartbeatLoop: WatcherClientType['heartbeatLoop'];
-            const oldSetTimeout = setTimeout;
+            const oldSetTimeout = global.setTimeout;
             const mockSetTimeout = jest.fn();
             beforeEach(() => {
                 // @ts-ignore
                 heartbeatLoop = watcher.heartbeatLoop.bind(watcher);
                 // @ts-ignore
-                setTimeout = mockSetTimeout;
+                global.setTimeout = mockSetTimeout as any;
             });
 
             afterEach(() => {
                 // @ts-ignore
-                setTimeout = oldSetTimeout;
+                global.setTimeout = oldSetTimeout;
             });
             it('should clear timeout heartbeatLoop', async () => {
                 const [timeout, mockTimeout] = getFakeTimeout();
diff --git a/packages/crowdsec-client/tests/Decisions/DecisionsBouncer.test.ts b/packages/crowdsec-client/tests/Decisions/DecisionsBouncer.test.ts
@@ -64,10 +64,10 @@ describe('DecisionsBouncer', () => {
         const mockSetTimeout = jest.fn();
 
         let localDecisionStream: DecisionsStream;
-        const oldSetTimeout = setTimeout;
+        const oldSetTimeout = global.setTimeout;
         beforeEach(() => {
             // @ts-ignore
-            setTimeout = mockSetTimeout;
+            global.setTimeout = mockSetTimeout as any;
 
             localDecisionStream = {
                 paused: true,
@@ -84,7 +84,7 @@ describe('DecisionsBouncer', () => {
         afterEach(() => {
             // jest.useRealTimers();
             // @ts-ignore
-            setTimeout = oldSetTimeout;
+            global.setTimeout = oldSetTimeout;
             mockTimeoutCleared.mockRestore();
         });
 
diff --git a/packages/crowdsec-client/tsconfig.json b/packages/crowdsec-client/tsconfig.json
@@ -1,7 +1,8 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "outDir": "./lib"
+        "outDir": "./lib",
+        "rootDir": "./src"
     },
     "include": ["src"],
     "ts-node": {
diff --git a/packages/crowdsec-http-middleware/package.json b/packages/crowdsec-http-middleware/package.json
diff --git a/packages/crowdsec-http-middleware/tsconfig.json b/packages/crowdsec-http-middleware/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json
