From 6d922df274856d52a7b2f07325db83982a00a591 Mon Sep 17 00:00:00 2001 From: Tasso Date: Fri, 21 Nov 2025 03:32:48 -0300 Subject: [PATCH] chore(web-ui-registration): Review build configuration --- packages/web-ui-registration/.babelrc.json | 9 -- packages/web-ui-registration/.eslintrc.json | 2 +- .../web-ui-registration/.storybook/main.ts | 3 +- .../.storybook/preview.tsx | 3 +- packages/web-ui-registration/package.json | 12 +- .../web-ui-registration/tsconfig.build.json | 3 - packages/web-ui-registration/tsconfig.json | 3 +- yarn.lock | 144 +++++++++++++++++- 8 files changed, 149 insertions(+), 30 deletions(-) delete mode 100644 packages/web-ui-registration/.babelrc.json diff --git a/packages/web-ui-registration/.babelrc.json b/packages/web-ui-registration/.babelrc.json deleted file mode 100644 index f474986efbca9..0000000000000 --- a/packages/web-ui-registration/.babelrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": [ - "@babel/preset-env", - ["@babel/preset-react", { - "runtime": "automatic" - }], - "@babel/preset-typescript" - ] -} diff --git a/packages/web-ui-registration/.eslintrc.json b/packages/web-ui-registration/.eslintrc.json index 4c413c4080b39..341a302833736 100644 --- a/packages/web-ui-registration/.eslintrc.json +++ b/packages/web-ui-registration/.eslintrc.json @@ -1,4 +1,4 @@ { "extends": ["@rocket.chat/eslint-config", "@rocket.chat/eslint-config/react"], - "ignorePatterns": ["**/dist"] + "ignorePatterns": ["dist", "storybook-static", "!.storybook"] } diff --git a/packages/web-ui-registration/.storybook/main.ts b/packages/web-ui-registration/.storybook/main.ts index 0b3ef2e9ffa02..1eca7fa8f87cc 100644 --- a/packages/web-ui-registration/.storybook/main.ts +++ b/packages/web-ui-registration/.storybook/main.ts @@ -1,4 +1,5 @@ import { dirname, join } from 'path'; + import type { StorybookConfig } from '@storybook/react-webpack5'; export default { @@ -6,7 +7,7 @@ export default { addons: [ getAbsolutePath('@storybook/addon-essentials'), getAbsolutePath('storybook-dark-mode'), - getAbsolutePath('@storybook/addon-webpack5-compiler-babel'), + getAbsolutePath('@storybook/addon-webpack5-compiler-swc'), ], framework: { diff --git a/packages/web-ui-registration/.storybook/preview.tsx b/packages/web-ui-registration/.storybook/preview.tsx index adb8bc2eeb23b..5cd3e45119f71 100644 --- a/packages/web-ui-registration/.storybook/preview.tsx +++ b/packages/web-ui-registration/.storybook/preview.tsx @@ -1,5 +1,6 @@ -import { themes } from '@storybook/theming'; import type { Parameters } from '@storybook/react'; +import { themes } from '@storybook/theming'; + import manifest from '../package.json'; import logo from './logo.svg'; import '@rocket.chat/fuselage/dist/fuselage.css'; diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index bd8310354e06e..d2c7dc09009ad 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -16,11 +16,10 @@ "storybook": "storybook dev -p 6006 --no-version-updates", "typecheck": "tsc --noEmit" }, + "dependencies": { + "dompurify": "~3.2.7" + }, "devDependencies": { - "@babel/core": "~7.28.5", - "@babel/preset-env": "~7.28.5", - "@babel/preset-react": "~7.27.1", - "@babel/preset-typescript": "~7.27.1", "@rocket.chat/core-typings": "workspace:~", "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/emitter": "~0.31.25", @@ -38,7 +37,7 @@ "@storybook/addon-actions": "^8.6.14", "@storybook/addon-docs": "^8.6.14", "@storybook/addon-essentials": "^8.6.14", - "@storybook/addon-webpack5-compiler-babel": "^3.0.6", + "@storybook/addon-webpack5-compiler-swc": "~3.0.0", "@storybook/react": "^8.6.14", "@storybook/react-webpack5": "^8.6.14", "@storybook/theming": "^8.6.14", @@ -70,8 +69,5 @@ }, "volta": { "extends": "../../package.json" - }, - "dependencies": { - "dompurify": "~3.2.7" } } diff --git a/packages/web-ui-registration/tsconfig.build.json b/packages/web-ui-registration/tsconfig.build.json index a175aec991c88..73f50b10a9645 100644 --- a/packages/web-ui-registration/tsconfig.build.json +++ b/packages/web-ui-registration/tsconfig.build.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "module": "ESNext" - }, "include": ["./src/**/*"], "exclude": ["./src/**/*.spec.ts", "./src/**/*.stories.tsx"] } diff --git a/packages/web-ui-registration/tsconfig.json b/packages/web-ui-registration/tsconfig.json index 9099a702aabf0..e1348ec0e2e74 100644 --- a/packages/web-ui-registration/tsconfig.json +++ b/packages/web-ui-registration/tsconfig.json @@ -2,8 +2,7 @@ "extends": "@rocket.chat/tsconfig/client.json", "compilerOptions": { "rootDirs": ["./src","./.storybook"], - "outDir": "./dist", - "module": "CommonJS" + "outDir": "./dist" }, "include": ["./src", "./.storybook"], } diff --git a/yarn.lock b/yarn.lock index fcd91d7e52130..877732a846d59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10675,10 +10675,6 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/web-ui-registration@workspace:packages/web-ui-registration" dependencies: - "@babel/core": "npm:~7.28.5" - "@babel/preset-env": "npm:~7.28.5" - "@babel/preset-react": "npm:~7.27.1" - "@babel/preset-typescript": "npm:~7.27.1" "@rocket.chat/core-typings": "workspace:~" "@rocket.chat/css-in-js": "npm:~0.31.25" "@rocket.chat/emitter": "npm:~0.31.25" @@ -10696,7 +10692,7 @@ __metadata: "@storybook/addon-actions": "npm:^8.6.14" "@storybook/addon-docs": "npm:^8.6.14" "@storybook/addon-essentials": "npm:^8.6.14" - "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.6" + "@storybook/addon-webpack5-compiler-swc": "npm:~3.0.0" "@storybook/react": "npm:^8.6.14" "@storybook/react-webpack5": "npm:^8.6.14" "@storybook/theming": "npm:^8.6.14" @@ -11905,6 +11901,16 @@ __metadata: languageName: node linkType: hard +"@storybook/addon-webpack5-compiler-swc@npm:~3.0.0": + version: 3.0.0 + resolution: "@storybook/addon-webpack5-compiler-swc@npm:3.0.0" + dependencies: + "@swc/core": "npm:^1.10.8" + swc-loader: "npm:^0.2.6" + checksum: 10/c2b0c26d8bf54875297c82d2159aeb62846048dc71d8e953a6d6301d8a5aedc4eb979cc75877b24a2f7e1667a5baa7116286c1da29bff4a1510d2b6ec657392c + languageName: node + linkType: hard + "@storybook/blocks@npm:8.6.14, @storybook/blocks@npm:^8.6.14": version: 8.6.14 resolution: "@storybook/blocks@npm:8.6.14" @@ -12303,6 +12309,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-darwin-arm64@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-darwin-arm64@npm:1.15.3" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@swc/core-darwin-x64@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-darwin-x64@npm:1.12.4" @@ -12317,6 +12330,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-darwin-x64@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-darwin-x64@npm:1.15.3" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@swc/core-linux-arm-gnueabihf@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-linux-arm-gnueabihf@npm:1.12.4" @@ -12331,6 +12351,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-linux-arm-gnueabihf@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.3" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@swc/core-linux-arm64-gnu@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-linux-arm64-gnu@npm:1.12.4" @@ -12345,6 +12372,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-linux-arm64-gnu@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-linux-arm64-gnu@npm:1.15.3" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@swc/core-linux-arm64-musl@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-linux-arm64-musl@npm:1.12.4" @@ -12359,6 +12393,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-linux-arm64-musl@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-linux-arm64-musl@npm:1.15.3" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@swc/core-linux-x64-gnu@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-linux-x64-gnu@npm:1.12.4" @@ -12373,6 +12414,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-linux-x64-gnu@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-linux-x64-gnu@npm:1.15.3" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@swc/core-linux-x64-musl@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-linux-x64-musl@npm:1.12.4" @@ -12387,6 +12435,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-linux-x64-musl@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-linux-x64-musl@npm:1.15.3" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@swc/core-win32-arm64-msvc@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-win32-arm64-msvc@npm:1.12.4" @@ -12401,6 +12456,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-win32-arm64-msvc@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-win32-arm64-msvc@npm:1.15.3" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@swc/core-win32-ia32-msvc@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-win32-ia32-msvc@npm:1.12.4" @@ -12415,6 +12477,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-win32-ia32-msvc@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-win32-ia32-msvc@npm:1.15.3" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@swc/core-win32-x64-msvc@npm:1.12.4": version: 1.12.4 resolution: "@swc/core-win32-x64-msvc@npm:1.12.4" @@ -12429,6 +12498,13 @@ __metadata: languageName: node linkType: hard +"@swc/core-win32-x64-msvc@npm:1.15.3": + version: 1.15.3 + resolution: "@swc/core-win32-x64-msvc@npm:1.15.3" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@swc/core@npm:1.13.19": version: 1.13.19 resolution: "@swc/core@npm:1.13.19" @@ -12475,6 +12551,52 @@ __metadata: languageName: node linkType: hard +"@swc/core@npm:^1.10.8": + version: 1.15.3 + resolution: "@swc/core@npm:1.15.3" + dependencies: + "@swc/core-darwin-arm64": "npm:1.15.3" + "@swc/core-darwin-x64": "npm:1.15.3" + "@swc/core-linux-arm-gnueabihf": "npm:1.15.3" + "@swc/core-linux-arm64-gnu": "npm:1.15.3" + "@swc/core-linux-arm64-musl": "npm:1.15.3" + "@swc/core-linux-x64-gnu": "npm:1.15.3" + "@swc/core-linux-x64-musl": "npm:1.15.3" + "@swc/core-win32-arm64-msvc": "npm:1.15.3" + "@swc/core-win32-ia32-msvc": "npm:1.15.3" + "@swc/core-win32-x64-msvc": "npm:1.15.3" + "@swc/counter": "npm:^0.1.3" + "@swc/types": "npm:^0.1.25" + peerDependencies: + "@swc/helpers": ">=0.5.17" + dependenciesMeta: + "@swc/core-darwin-arm64": + optional: true + "@swc/core-darwin-x64": + optional: true + "@swc/core-linux-arm-gnueabihf": + optional: true + "@swc/core-linux-arm64-gnu": + optional: true + "@swc/core-linux-arm64-musl": + optional: true + "@swc/core-linux-x64-gnu": + optional: true + "@swc/core-linux-x64-musl": + optional: true + "@swc/core-win32-arm64-msvc": + optional: true + "@swc/core-win32-ia32-msvc": + optional: true + "@swc/core-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@swc/helpers": + optional: true + checksum: 10/280330d82328818138ed64fdcf9ea9abde6b6f16eca65a9d4db27dde06a8dfffd2649f3447d2243387277513c7430fa4142cafcfd64e943d682ce6a713cb8c2d + languageName: node + linkType: hard + "@swc/core@npm:^1.5.22": version: 1.12.4 resolution: "@swc/core@npm:1.12.4" @@ -34953,6 +35075,18 @@ __metadata: languageName: node linkType: hard +"swc-loader@npm:^0.2.6": + version: 0.2.6 + resolution: "swc-loader@npm:0.2.6" + dependencies: + "@swc/counter": "npm:^0.1.3" + peerDependencies: + "@swc/core": ^1.2.147 + webpack: ">=2" + checksum: 10/fe90948c02a51bb8ffcff1ce3590e01dc12860b0bb7c9e22052b14fa846ed437781ae265614a5e14344bea22001108780f00a6e350e28c0b3499bc4cd11335fb + languageName: node + linkType: hard + "swiper@npm:11.1.14": version: 11.1.14 resolution: "swiper@npm:11.1.14"