diff --git a/packages/fuselage-ui-kit/.babelrc.json b/packages/fuselage-ui-kit/.babelrc.json deleted file mode 100644 index f474986efbca9..0000000000000 --- a/packages/fuselage-ui-kit/.babelrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": [ - "@babel/preset-env", - ["@babel/preset-react", { - "runtime": "automatic" - }], - "@babel/preset-typescript" - ] -} diff --git a/packages/fuselage-ui-kit/.eslintrc.json b/packages/fuselage-ui-kit/.eslintrc.json index 1e9604e324d70..6e0406abd46a7 100644 --- a/packages/fuselage-ui-kit/.eslintrc.json +++ b/packages/fuselage-ui-kit/.eslintrc.json @@ -1,65 +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", "storybook-static", "!.storybook"], - "overrides": [ - { - "files": ["*.ts", "*.tsx"], - "rules": { - "@typescript-eslint/ban-ts-ignore": "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", "plugin:storybook/recommended"], + "ignorePatterns": ["dist", "storybook-static", "!.storybook"] } diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 03aca9bd5867f..9367f06f684de 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -17,21 +17,19 @@ "name": "Rocket.Chat", "url": "https://rocket.chat/" }, - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/esm/index.d.ts", + "main": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "/dist" ], "scripts": { ".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./storybook-static ../../.preview/fuselage-ui-kit", - ".:build:cjs": "tsc -p tsconfig.cjs.json", ".:build:clean": "rimraf dist", - ".:build:esm": "tsc -p tsconfig.esm.json", - "build": "run-s .:build:clean .:build:esm .:build:cjs", + ".:build:tsc": "tsc -p tsconfig.build.json", + "build": "run-s .:build:clean .:build:tsc", "build-preview": "yarn build-storybook", "build-storybook": "NODE_ENV=production storybook build", - "dev": "tsc --watch --preserveWatchOutput -p tsconfig.esm.json", + "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json", "docs": "cross-env NODE_ENV=production storybook build -o ../../static/fuselage-ui-kit", "lint": "eslint --ext .js,.jsx,.ts,.tsx .", "storybook": "storybook dev -p 6006 --no-version-updates", @@ -45,10 +43,6 @@ "@rocket.chat/ui-kit": "workspace:~" }, "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/apps-engine": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", @@ -78,7 +72,6 @@ "@testing-library/user-event": "~14.6.1", "@types/react": "~18.3.26", "@types/react-dom": "~18.3.7", - "babel-loader": "~10.0.0", "cross-env": "^7.0.3", "eslint": "~8.45.0", "eslint-plugin-storybook": "~0.11.6", diff --git a/packages/fuselage-ui-kit/src/elements/IconButtonElement.tsx b/packages/fuselage-ui-kit/src/elements/IconButtonElement.tsx index 3424379344b6d..9926a47159ddd 100644 --- a/packages/fuselage-ui-kit/src/elements/IconButtonElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/IconButtonElement.tsx @@ -1,5 +1,5 @@ import { IconButton } from '@rocket.chat/fuselage'; -import * as UiKit from '@rocket.chat/ui-kit'; +import type * as UiKit from '@rocket.chat/ui-kit'; import type { MouseEventHandler, ReactElement } from 'react'; import { useUiKitState } from '../hooks/useUiKitState'; diff --git a/packages/fuselage-ui-kit/src/elements/IconElement.tsx b/packages/fuselage-ui-kit/src/elements/IconElement.tsx index d81d21cdce81a..9519260e5963d 100644 --- a/packages/fuselage-ui-kit/src/elements/IconElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/IconElement.tsx @@ -1,8 +1,8 @@ import { Icon } from '@rocket.chat/fuselage'; -import * as UiKit from '@rocket.chat/ui-kit'; +import type * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; -import { BlockProps } from '../utils/BlockProps'; +import type { BlockProps } from '../utils/BlockProps'; type IconElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/tsconfig.build.json b/packages/fuselage-ui-kit/tsconfig.build.json new file mode 100644 index 0000000000000..d8a2535364834 --- /dev/null +++ b/packages/fuselage-ui-kit/tsconfig.build.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "ESNext", + "rootDir": "./src", + "outDir": "./dist" + }, + "include": ["src"], + "exclude": ["node_modules", "dist", "src/**/*.stories.tsx", ".storybook/**/*", "./src/**/*.spec.ts", "./src/**/*.spec.tsx"] +} diff --git a/packages/fuselage-ui-kit/tsconfig.cjs.json b/packages/fuselage-ui-kit/tsconfig.cjs.json deleted file mode 100644 index baae5231fec40..0000000000000 --- a/packages/fuselage-ui-kit/tsconfig.cjs.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "rootDir": "./src", - "module": "CommonJS", - "outDir": "./dist/cjs" - }, - "include": ["src"], - "exclude": ["node_modules", "dist", "src/**/*.stories.tsx", ".storybook/**/*", "./src/**/*.spec.ts", "./src/**/*.spec.tsx"] -} diff --git a/packages/fuselage-ui-kit/tsconfig.esm.json b/packages/fuselage-ui-kit/tsconfig.esm.json deleted file mode 100644 index 017766f03607a..0000000000000 --- a/packages/fuselage-ui-kit/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "rootDir": "./src", - "module": "ESNext", - "outDir": "./dist/esm" - }, - "include": ["src"], - "exclude": ["node_modules", "dist", "src/**/*.stories.tsx", ".storybook/**/*", "./src/**/*.spec.ts", "./src/**/*.spec.tsx"] -} diff --git a/packages/fuselage-ui-kit/tsconfig.json b/packages/fuselage-ui-kit/tsconfig.json index e49f8dc78f9cd..b0d14d3e69655 100644 --- a/packages/fuselage-ui-kit/tsconfig.json +++ b/packages/fuselage-ui-kit/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@rocket.chat/tsconfig/client.json", - "compilerOptions": { - "noImplicitReturns": true, - "noImplicitThis": true, - }, + "compilerOptions": { + "noImplicitReturns": true, + "noImplicitThis": true, + }, "include": ["src", ".storybook/**/*", "jest.config.ts"] } diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 04930e90215b4..b48eba3319533 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -56,6 +56,7 @@ "@babel/core": "~7.28.5", "@babel/eslint-parser": "~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/ddp-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 00d427ee6f20c..49b8e415931f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8620,10 +8620,6 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/fuselage-ui-kit@workspace:packages/fuselage-ui-kit" 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/apps-engine": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": "npm:~0.31.25" @@ -8654,7 +8650,6 @@ __metadata: "@testing-library/user-event": "npm:~14.6.1" "@types/react": "npm:~18.3.26" "@types/react-dom": "npm:~18.3.7" - babel-loader: "npm:~10.0.0" cross-env: "npm:^7.0.3" eslint: "npm:~8.45.0" eslint-plugin-storybook: "npm:~0.11.6" @@ -8926,6 +8921,7 @@ __metadata: "@babel/core": "npm:~7.28.5" "@babel/eslint-parser": "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/ddp-client": "workspace:^"