From fb35fca56eacc5b5e7d66213da8a84132449704d Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Wed, 3 Dec 2025 14:53:06 +0100 Subject: [PATCH] Fix build issues --- .drone.yml | 2 ++ matrixgw_frontend/package-lock.json | 35 ++++++++++--------- matrixgw_frontend/src/api/AuthApi.ts | 4 +-- matrixgw_frontend/src/api/MatrixLinkApi.ts | 2 +- matrixgw_frontend/src/api/MatrixSyncApi.ts | 2 +- matrixgw_frontend/src/api/ServerApi.ts | 2 +- matrixgw_frontend/src/api/TokensApi.ts | 14 ++++---- .../src/api/matrix/MatrixApiEvent.ts | 2 +- .../src/api/matrix/MatrixApiProfile.ts | 4 +-- .../src/api/matrix/MatrixApiRoom.ts | 4 +-- 10 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index 611b3a0..fde8374 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,8 @@ steps: - name: web_app path: /tmp/web_build commands: + - node -v + - npm -v - cd matrixgw_frontend - npm install - npm run lint diff --git a/matrixgw_frontend/package-lock.json b/matrixgw_frontend/package-lock.json index 254aaa2..a459209 100644 --- a/matrixgw_frontend/package-lock.json +++ b/matrixgw_frontend/package-lock.json @@ -73,6 +73,7 @@ "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -422,6 +423,7 @@ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -465,6 +467,7 @@ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz", "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -856,6 +859,7 @@ "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.5.tgz", "integrity": "sha512-8VVxFmp1GIm9PpmnQoCoYo0UWHoOrdA57tDL62vkpzEgvb/d71Wsbv4FRg7r1Gyx7PuSo0tflH34cdl/NvfHNQ==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.4", "@mui/core-downloads-tracker": "^7.3.5", @@ -966,6 +970,7 @@ "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.5.tgz", "integrity": "sha512-yPaf5+gY3v80HNkJcPi6WT+r9ebeM4eJzrREXPxMt7pNTV/1eahyODO4fbH3Qvd8irNxDFYn5RQ3idHW55rA6g==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.4", "@mui/private-theming": "^7.3.5", @@ -1642,6 +1647,7 @@ "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -1663,6 +1669,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz", "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==", "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -1732,6 +1739,7 @@ "integrity": "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.2", "@typescript-eslint/types": "8.46.2", @@ -1984,6 +1992,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2127,6 +2136,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.19", "caniuse-lite": "^1.0.30001751", @@ -2311,7 +2321,8 @@ "version": "1.11.19", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/debug": { "version": "4.4.3", @@ -2416,6 +2427,7 @@ "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -3676,6 +3688,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz", "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -3685,6 +3698,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz", "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -4033,6 +4047,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -4093,6 +4108,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4189,6 +4205,7 @@ "integrity": "sha512-eSiiRJmovt8qDJkGyZuLnbxAOAdie6NCmmd0NkTC0RJI9duiSBTfr8X2mBYJOUFzxQa2USaHmL99J9uMxkjCyw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@oxc-project/runtime": "0.92.0", "fdir": "^6.5.0", @@ -4283,6 +4300,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -4323,21 +4341,6 @@ "dev": true, "license": "ISC" }, - "node_modules/yaml": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz", - "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==", - "dev": true, - "license": "ISC", - "optional": true, - "peer": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14.6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/matrixgw_frontend/src/api/AuthApi.ts b/matrixgw_frontend/src/api/AuthApi.ts index bcf6f3d..5d5c926 100644 --- a/matrixgw_frontend/src/api/AuthApi.ts +++ b/matrixgw_frontend/src/api/AuthApi.ts @@ -45,7 +45,7 @@ export class AuthApi { uri: "/auth/start_oidc", method: "GET", }) - ).data; + ).data as { url: string }; } /** @@ -70,7 +70,7 @@ export class AuthApi { uri: "/auth/info", method: "GET", }) - ).data; + ).data as UserInfo; } /** diff --git a/matrixgw_frontend/src/api/MatrixLinkApi.ts b/matrixgw_frontend/src/api/MatrixLinkApi.ts index 12507b7..7fc1f83 100644 --- a/matrixgw_frontend/src/api/MatrixLinkApi.ts +++ b/matrixgw_frontend/src/api/MatrixLinkApi.ts @@ -10,7 +10,7 @@ export class MatrixLinkApi { uri: "/matrix_link/start_auth", method: "POST", }) - ).data; + ).data as { url: string }; } /** diff --git a/matrixgw_frontend/src/api/MatrixSyncApi.ts b/matrixgw_frontend/src/api/MatrixSyncApi.ts index 8e8999c..509ff85 100644 --- a/matrixgw_frontend/src/api/MatrixSyncApi.ts +++ b/matrixgw_frontend/src/api/MatrixSyncApi.ts @@ -29,6 +29,6 @@ export class MatrixSyncApi { method: "GET", uri: "/matrix_sync/status", }); - return res.data.started; + return (res.data as { started: boolean }).started; } } diff --git a/matrixgw_frontend/src/api/ServerApi.ts b/matrixgw_frontend/src/api/ServerApi.ts index eb7d24d..50f52a1 100644 --- a/matrixgw_frontend/src/api/ServerApi.ts +++ b/matrixgw_frontend/src/api/ServerApi.ts @@ -35,7 +35,7 @@ export class ServerApi { uri: "/server/config", method: "GET", }) - ).data; + ).data as ServerConfig; } /** diff --git a/matrixgw_frontend/src/api/TokensApi.ts b/matrixgw_frontend/src/api/TokensApi.ts index acddaf6..92f23c2 100644 --- a/matrixgw_frontend/src/api/TokensApi.ts +++ b/matrixgw_frontend/src/api/TokensApi.ts @@ -28,7 +28,7 @@ export class TokensApi { uri: "/tokens", method: "GET", }) - ).data; + ).data as Token[]; } /** @@ -41,18 +41,16 @@ export class TokensApi { method: "POST", jsonData: t, }) - ).data; + ).data as TokenWithSecret; } /** * Delete a token */ static async Delete(t: Token): Promise { - return ( - await APIClient.exec({ - uri: `/token/${t.id}`, - method: "DELETE", - }) - ).data; + await APIClient.exec({ + uri: `/token/${t.id}`, + method: "DELETE", + }); } } diff --git a/matrixgw_frontend/src/api/matrix/MatrixApiEvent.ts b/matrixgw_frontend/src/api/matrix/MatrixApiEvent.ts index 497dc0d..34d31d7 100644 --- a/matrixgw_frontend/src/api/matrix/MatrixApiEvent.ts +++ b/matrixgw_frontend/src/api/matrix/MatrixApiEvent.ts @@ -74,7 +74,7 @@ export class MatrixApiEvent { `/matrix/room/${encodeURIComponent(room.id)}/events` + (from ? `?from=${from}` : ""), }) - ).data; + ).data as MatrixEventsList; } /** diff --git a/matrixgw_frontend/src/api/matrix/MatrixApiProfile.ts b/matrixgw_frontend/src/api/matrix/MatrixApiProfile.ts index ccb39db..3301c60 100644 --- a/matrixgw_frontend/src/api/matrix/MatrixApiProfile.ts +++ b/matrixgw_frontend/src/api/matrix/MatrixApiProfile.ts @@ -13,13 +13,13 @@ export class MatrixApiProfile { * Get multiple profiles information */ static async GetMultiple(ids: string[]): Promise { - const list: UserProfile[] = ( + const list = ( await APIClient.exec({ method: "POST", uri: "/matrix/profile/get_multiple", jsonData: ids, }) - ).data; + ).data as UserProfile[]; return new Map(list.map((e) => [e.user_id, e])); } diff --git a/matrixgw_frontend/src/api/matrix/MatrixApiRoom.ts b/matrixgw_frontend/src/api/matrix/MatrixApiRoom.ts index 9809143..3d5d116 100644 --- a/matrixgw_frontend/src/api/matrix/MatrixApiRoom.ts +++ b/matrixgw_frontend/src/api/matrix/MatrixApiRoom.ts @@ -57,7 +57,7 @@ export class MatrixApiRoom { method: "GET", uri: "/matrix/room/joined", }) - ).data; + ).data as Room[]; } /** @@ -69,6 +69,6 @@ export class MatrixApiRoom { method: "GET", uri: `/matrix/room/${room.id}/receipts`, }) - ).data; + ).data as Receipt[]; } }