From 38a0c238acf2bc0700338e8f88ceb544bc3c44db Mon Sep 17 00:00:00 2001 From: Tasso Date: Mon, 24 Nov 2025 15:37:47 -0300 Subject: [PATCH] chore(federation-matrix): Review build configuration --- ee/packages/federation-matrix/babel.config.js | 3 - ee/packages/federation-matrix/jest.config.ts | 6 +- ee/packages/federation-matrix/package.json | 13 ++--- .../tests/end-to-end/room.spec.ts | 6 +- .../federation-matrix/tsconfig.build.json | 9 +-- ee/packages/federation-matrix/tsconfig.json | 5 +- yarn.lock | 55 +------------------ 7 files changed, 13 insertions(+), 84 deletions(-) delete mode 100644 ee/packages/federation-matrix/babel.config.js diff --git a/ee/packages/federation-matrix/babel.config.js b/ee/packages/federation-matrix/babel.config.js deleted file mode 100644 index 7672dadf24ca2..0000000000000 --- a/ee/packages/federation-matrix/babel.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'], -}; diff --git a/ee/packages/federation-matrix/jest.config.ts b/ee/packages/federation-matrix/jest.config.ts index 6d8be003a50e3..fcd10a6d91d5f 100644 --- a/ee/packages/federation-matrix/jest.config.ts +++ b/ee/packages/federation-matrix/jest.config.ts @@ -3,11 +3,7 @@ import type { Config } from 'jest'; export default { preset: server.preset, - transformIgnorePatterns: [ - '/node_modules/@babel', - '/node_modules/@jest', - '/node_modules/(?!marked|@testing-library/)', - ], + transformIgnorePatterns: ['/node_modules/@babel', '/node_modules/@jest', '/node_modules/(?!marked|@testing-library/)'], // Exclude integration/e2e tests from unit test runs testPathIgnorePatterns: ['/tests/end-to-end/'], } satisfies Config; diff --git a/ee/packages/federation-matrix/package.json b/ee/packages/federation-matrix/package.json index 7f8193d441254..e3b951b24afce 100644 --- a/ee/packages/federation-matrix/package.json +++ b/ee/packages/federation-matrix/package.json @@ -9,14 +9,14 @@ ], "scripts": { "build": "rm -rf dist && tsc -p tsconfig.build.json", - "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput", - "lint": "eslint src", - "lint:fix": "eslint src --fix", + "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput", + "lint": "eslint .", + "lint:fix": "eslint --fix .", "test": "jest", "test:integration": "./tests/scripts/run-integration-tests.sh", "test:federation": "jest --config jest.config.federation.ts", "testunit": "jest", - "typecheck": "tsc --noEmit --skipLibCheck" + "typecheck": "tsc --noEmit" }, "dependencies": { "@rocket.chat/core-services": "workspace:^", @@ -38,16 +38,11 @@ "tweetnacl": "^1.0.3" }, "devDependencies": { - "@babel/cli": "~7.28.3", - "@babel/core": "~7.28.5", - "@babel/preset-env": "~7.28.5", - "@babel/preset-typescript": "~7.27.1", "@rocket.chat/ddp-client": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", "@types/emojione": "^2.2.9", "@types/node": "~22.16.5", "@types/sanitize-html": "~2.16.0", - "babel-jest": "~30.2.0", "eslint": "~8.45.0", "jest": "~30.2.0", "jest-qase-reporter": "^2.1.4", diff --git a/ee/packages/federation-matrix/tests/end-to-end/room.spec.ts b/ee/packages/federation-matrix/tests/end-to-end/room.spec.ts index 8a76d7ef1a4e4..bfade515738a8 100644 --- a/ee/packages/federation-matrix/tests/end-to-end/room.spec.ts +++ b/ee/packages/federation-matrix/tests/end-to-end/room.spec.ts @@ -1605,7 +1605,7 @@ import { SynapseClient } from '../helper/synapse-client'; expect(pendingInvitation).not.toBeUndefined(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - rid = pendingInvitation?.rid!; + rid = pendingInvitation!.rid!; await acceptRoomInvite(rid, rc1AdminRequestConfig); }, 15000); @@ -1644,7 +1644,7 @@ import { SynapseClient } from '../helper/synapse-client'; expect(pendingInvitation).not.toBeUndefined(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - rid = pendingInvitation?.rid!; + rid = pendingInvitation!.rid!; }, 15000); it('should allow RC user to reject the invite and remove the subscription', async () => { @@ -1678,7 +1678,7 @@ import { SynapseClient } from '../helper/synapse-client'; expect(pendingInvitation).not.toBeUndefined(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - rid = pendingInvitation?.rid!; + rid = pendingInvitation!.rid!; // hs1 revokes the invitation by kicking the invited user await hs1AdminApp.matrixClient.kick(matrixRoomId, federationConfig.rc1.adminMatrixUserId, 'Invitation revoked'); diff --git a/ee/packages/federation-matrix/tsconfig.build.json b/ee/packages/federation-matrix/tsconfig.build.json index 9f4e58a941b1d..2fa783c0c1a37 100644 --- a/ee/packages/federation-matrix/tsconfig.build.json +++ b/ee/packages/federation-matrix/tsconfig.build.json @@ -1,12 +1,9 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "noEmit": false, - "skipLibCheck": true, + "outDir": "./dist", "isolatedModules": true, - "allowJs": false, - "checkJs": false, - "esModuleInterop": true + "declaration": true, }, "include": [ "src/**/*.ts" @@ -18,4 +15,4 @@ "**/*.test.ts", "../../../../**/*", ] -} \ No newline at end of file +} diff --git a/ee/packages/federation-matrix/tsconfig.json b/ee/packages/federation-matrix/tsconfig.json index ec29e1bc668ec..69b44262ebd00 100644 --- a/ee/packages/federation-matrix/tsconfig.json +++ b/ee/packages/federation-matrix/tsconfig.json @@ -1,12 +1,9 @@ { "extends": "@rocket.chat/tsconfig/server.json", "compilerOptions": { + "rootDir": "./src", "strictPropertyInitialization": false, - "skipLibCheck": true, "experimentalDecorators": true, - "declaration": true, - "rootDir": "./src", - "outDir": "./dist" }, "files": ["./src/index.ts"] } diff --git a/yarn.lock b/yarn.lock index 36545d2a25bb3..58c4e80aac1f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -587,33 +587,6 @@ __metadata: languageName: node linkType: hard -"@babel/cli@npm:~7.28.3": - version: 7.28.3 - resolution: "@babel/cli@npm:7.28.3" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.28" - "@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3" - chokidar: "npm:^3.6.0" - commander: "npm:^6.2.0" - convert-source-map: "npm:^2.0.0" - fs-readdir-recursive: "npm:^1.1.0" - glob: "npm:^7.2.0" - make-dir: "npm:^2.1.0" - slash: "npm:^2.0.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - dependenciesMeta: - "@nicolo-ribaudo/chokidar-2": - optional: true - chokidar: - optional: true - bin: - babel: ./bin/babel.js - babel-external-helpers: ./bin/babel-external-helpers.js - checksum: 10/abde275866845bf0c86c090e23373e747da12e49776a879d7e5b4e55528e8a8ccc341b2e3f908d5bb3632b19c663000dca1ac5495d8805f5ce63e037b64e2b85 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.25.7, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.27.1": version: 7.27.1 resolution: "@babel/code-frame@npm:7.27.1" @@ -5104,13 +5077,6 @@ __metadata: languageName: node linkType: hard -"@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3": - version: 2.1.8-no-fsevents.3 - resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3" - checksum: 10/c6e83af3b5051a3f6562649ff8fe37de9934a4cc02138678ed1badbd13ed3334f7ae5f63f2bbc3432210f6b245f082ac97e9b2afe0c13730c9838b295658c185 - languageName: node - linkType: hard - "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1": version: 5.1.1-v1 resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1" @@ -8486,10 +8452,6 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/federation-matrix@workspace:ee/packages/federation-matrix" dependencies: - "@babel/cli": "npm:~7.28.3" - "@babel/core": "npm:~7.28.5" - "@babel/preset-env": "npm:~7.28.5" - "@babel/preset-typescript": "npm:~7.27.1" "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/ddp-client": "workspace:^" @@ -8504,7 +8466,6 @@ __metadata: "@types/emojione": "npm:^2.2.9" "@types/node": "npm:~22.16.5" "@types/sanitize-html": "npm:~2.16.0" - babel-jest: "npm:~30.2.0" emojione: "npm:^4.5.0" eslint: "npm:~8.45.0" jest: "npm:~30.2.0" @@ -18181,7 +18142,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^6.1.0, commander@npm:^6.2.0": +"commander@npm:^6.1.0": version: 6.2.1 resolution: "commander@npm:6.2.1" checksum: 10/25b88c2efd0380c84f7844b39cf18510da7bfc5013692d68cdc65f764a1c34e6c8a36ea6d72b6620e3710a930cf8fab2695bdec2bf7107a0f4fa30a3ef3b7d0e @@ -22407,13 +22368,6 @@ __metadata: languageName: node linkType: hard -"fs-readdir-recursive@npm:^1.1.0": - version: 1.1.0 - resolution: "fs-readdir-recursive@npm:1.1.0" - checksum: 10/d5e3fd8456b8e5d57a43f169a9eaf65c70fa82c4a22f1d4361cdba4ea5e61c60c5c2b4ac481ea137a4d43b2b99b3ea2fae95ac2730255c4206d61af645866c3a - languageName: node - linkType: hard - "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -33641,13 +33595,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 10/512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0"