diff --git a/packages/ui-composer/.babelrc.json b/packages/ui-composer/.babelrc.json deleted file mode 100644 index f474986efbca9..0000000000000 --- a/packages/ui-composer/.babelrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": [ - "@babel/preset-env", - ["@babel/preset-react", { - "runtime": "automatic" - }], - "@babel/preset-typescript" - ] -} diff --git a/packages/ui-composer/.eslintignore b/packages/ui-composer/.eslintignore deleted file mode 100644 index 608841ff3853c..0000000000000 --- a/packages/ui-composer/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -!.storybook diff --git a/packages/ui-composer/.eslintrc.json b/packages/ui-composer/.eslintrc.json index be0a37f02eb25..341a302833736 100644 --- a/packages/ui-composer/.eslintrc.json +++ b/packages/ui-composer/.eslintrc.json @@ -1,66 +1,4 @@ { - "extends": [ - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/eslint-recommended", - "@rocket.chat/eslint-config/original", - "@rocket.chat/eslint-config/react", - "prettier", - "plugin:anti-trojan-source/recommended", - "plugin:react/jsx-runtime", - "plugin:storybook/recommended" - ], - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint", "prettier"], - "rules": { - "func-call-spacing": "off", - "import/named": "error", - "import/order": [ - "error", - { - "newlines-between": "always", - "groups": ["builtin", "external", "internal", ["parent", "sibling", "index"]], - "alphabetize": { - "order": "asc" - } - } - ], - "indent": "off", - "jsx-quotes": ["error", "prefer-single"], - "new-cap": ["error"], - "no-extra-parens": "off", - "no-spaced-func": "off", - "no-undef": "off", - "no-unused-vars": "off", - "no-useless-constructor": "off", - "no-use-before-define": "off", - "prefer-arrow-callback": ["error", { "allowNamedFunctions": true }], - "prettier/prettier": 2 - }, - "settings": { - "import/resolver": { - "node": { - "extensions": [".js", ".ts", ".tsx"] - } - } - }, - "ignorePatterns": ["**/dist"], - "overrides": [ - { - "files": ["*.ts", "*.tsx"], - "rules": { - "@typescript-eslint/ban-ts-ignore": "off", - "@typescript-eslint/explicit-function-return-type": "off", - "@typescript-eslint/indent": "off", - "@typescript-eslint/no-extra-parens": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-unused-vars": [ - "error", - { - "argsIgnorePattern": "^_" - } - ], - "@typescript-eslint/prefer-optional-chain": "warn" - } - } - ] + "extends": ["@rocket.chat/eslint-config", "@rocket.chat/eslint-config/react"], + "ignorePatterns": ["dist", "storybook-static", "!.storybook"] } diff --git a/packages/ui-composer/.storybook/main.ts b/packages/ui-composer/.storybook/main.ts index 561cd8e5766c5..2f6a7e963dc2f 100644 --- a/packages/ui-composer/.storybook/main.ts +++ b/packages/ui-composer/.storybook/main.ts @@ -7,7 +7,7 @@ const config: StorybookConfig = { addons: [ getAbsolutePath('@storybook/addon-a11y'), getAbsolutePath('@storybook/addon-essentials'), - './webpackAddon', + getAbsolutePath('@storybook/addon-webpack5-compiler-swc'), getAbsolutePath('@storybook/addon-styling-webpack'), ], diff --git a/packages/ui-composer/.storybook/preview.tsx b/packages/ui-composer/.storybook/preview.tsx index 7b379177e448a..3a2059e5bf012 100644 --- a/packages/ui-composer/.storybook/preview.tsx +++ b/packages/ui-composer/.storybook/preview.tsx @@ -1,4 +1,4 @@ -import { Decorator, Parameters } from '@storybook/react'; +import type { Decorator, Parameters } from '@storybook/react'; import '../../../apps/meteor/app/theme/client/main.css'; import 'highlight.js/styles/github.css'; diff --git a/packages/ui-composer/.storybook/webpackAddon.ts b/packages/ui-composer/.storybook/webpackAddon.ts deleted file mode 100644 index 62a0c76db58fc..0000000000000 --- a/packages/ui-composer/.storybook/webpackAddon.ts +++ /dev/null @@ -1,3 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -export * from '@storybook/addon-webpack5-compiler-babel/preset'; diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index 9608675abb952..1e498b2c3e2f8 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -20,7 +20,6 @@ "typecheck": "tsc --noEmit" }, "devDependencies": { - "@babel/core": "~7.28.5", "@react-aria/toolbar": "^3.0.0-nightly.5042", "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/eslint-config": "workspace:^", @@ -35,7 +34,7 @@ "@storybook/addon-docs": "^8.6.14", "@storybook/addon-essentials": "^8.6.14", "@storybook/addon-styling-webpack": "^1.0.1", - "@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", "@types/jest": "~30.0.0", diff --git a/packages/ui-composer/src/MessageComposer/MessageComposerInputExpandable.tsx b/packages/ui-composer/src/MessageComposer/MessageComposerInputExpandable.tsx index 86ed216e699b3..f457f2d639936 100644 --- a/packages/ui-composer/src/MessageComposer/MessageComposerInputExpandable.tsx +++ b/packages/ui-composer/src/MessageComposer/MessageComposerInputExpandable.tsx @@ -1,6 +1,7 @@ import { css } from '@rocket.chat/css-in-js'; import { Box, IconButton } from '@rocket.chat/fuselage'; -import { useState, type ComponentProps, ChangeEvent, forwardRef } from 'react'; +import { useState, forwardRef } from 'react'; +import type { ChangeEvent, ComponentProps } from 'react'; import { useTranslation } from 'react-i18next'; import MessageComposerInput from './MessageComposerInput'; diff --git a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx index 6dbd29627a6c2..93695db9b4b40 100644 --- a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx +++ b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx @@ -2,8 +2,7 @@ import { Button } from '@rocket.chat/fuselage'; import type { ComponentProps } from 'react'; import { forwardRef } from 'react'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface -interface MessageFooterCalloutActionProps extends ComponentProps {} +type MessageFooterCalloutActionProps = ComponentProps; const MessageFooterCalloutAction = forwardRef( function MessageFooterCalloutAction(props, ref) { diff --git a/yarn.lock b/yarn.lock index 558aba26b3d60..3c18f4b862003 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10346,7 +10346,6 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ui-composer@workspace:packages/ui-composer" dependencies: - "@babel/core": "npm:~7.28.5" "@react-aria/toolbar": "npm:^3.0.0-nightly.5042" "@rocket.chat/emitter": "npm:~0.31.25" "@rocket.chat/eslint-config": "workspace:^" @@ -10361,7 +10360,7 @@ __metadata: "@storybook/addon-docs": "npm:^8.6.14" "@storybook/addon-essentials": "npm:^8.6.14" "@storybook/addon-styling-webpack": "npm:^1.0.1" - "@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" "@types/jest": "npm:~30.0.0"