From 33e5015d75d50ea90ec37d0d0cd5ef8841d73c03 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Tue, 25 Nov 2025 17:03:09 -0300 Subject: [PATCH] chore(ui-avatar): Review build configuration (#37608) --- packages/ui-avatar/.eslintignore | 1 - packages/ui-avatar/.eslintrc.json | 65 +------------------ packages/ui-avatar/package.json | 25 ++++--- .../ui-avatar/src/components/AppAvatar.tsx | 3 +- .../ui-avatar/src/components/RoomAvatar.tsx | 3 +- ...sconfig-build.json => tsconfig.build.json} | 0 yarn.lock | 1 - 7 files changed, 18 insertions(+), 80 deletions(-) delete mode 100644 packages/ui-avatar/.eslintignore rename packages/ui-avatar/{tsconfig-build.json => tsconfig.build.json} (100%) diff --git a/packages/ui-avatar/.eslintignore b/packages/ui-avatar/.eslintignore deleted file mode 100644 index 608841ff385..00000000000 --- a/packages/ui-avatar/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -!.storybook diff --git a/packages/ui-avatar/.eslintrc.json b/packages/ui-avatar/.eslintrc.json index d5db8560f3e..341a3028337 100644 --- a/packages/ui-avatar/.eslintrc.json +++ b/packages/ui-avatar/.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"], - "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"], + "ignorePatterns": ["dist", "storybook-static", "!.storybook"] } diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 8faba0286ed..5d919d7bda9 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -2,8 +2,19 @@ "name": "@rocket.chat/ui-avatar", "version": "20.0.0", "private": true, + "main": "./dist/index.js", + "typings": "./dist/index.d.ts", + "files": [ + "/dist" + ], + "scripts": { + "build": "rm -rf dist && tsc -p tsconfig.build.json", + "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput", + "lint": "eslint --ext .js,.jsx,.ts,.tsx .", + "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix", + "typecheck": "tsc -p tsconfig.json --noEmit" + }, "devDependencies": { - "@babel/core": "~7.28.5", "@rocket.chat/core-typings": "workspace:~", "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/fuselage": "~0.68.1", @@ -23,18 +34,6 @@ "react-virtuoso": "^4.12.0", "typescript": "~5.9.3" }, - "scripts": { - "lint": "eslint --ext .js,.jsx,.ts,.tsx .", - "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix", - "build": "rm -rf dist && tsc -p tsconfig-build.json", - "typecheck": "tsc -p tsconfig.json --noEmit", - "dev": "tsc -p tsconfig-build.json --watch --preserveWatchOutput" - }, - "main": "./dist/index.js", - "typings": "./dist/index.d.ts", - "files": [ - "/dist" - ], "peerDependencies": { "@rocket.chat/fuselage": "*", "@rocket.chat/ui-contexts": "workspace:^", diff --git a/packages/ui-avatar/src/components/AppAvatar.tsx b/packages/ui-avatar/src/components/AppAvatar.tsx index 35ec3e1cdd9..277e3ab5720 100644 --- a/packages/ui-avatar/src/components/AppAvatar.tsx +++ b/packages/ui-avatar/src/components/AppAvatar.tsx @@ -1,6 +1,7 @@ import type { ReactElement } from 'react'; -import BaseAvatar, { BaseAvatarProps } from './BaseAvatar'; +import type { BaseAvatarProps } from './BaseAvatar'; +import BaseAvatar from './BaseAvatar'; type AppAvatarProps = Pick & { iconFileContent: string; diff --git a/packages/ui-avatar/src/components/RoomAvatar.tsx b/packages/ui-avatar/src/components/RoomAvatar.tsx index c9456568662..9632b2bf6b5 100644 --- a/packages/ui-avatar/src/components/RoomAvatar.tsx +++ b/packages/ui-avatar/src/components/RoomAvatar.tsx @@ -2,7 +2,8 @@ import { useRoomAvatarPath } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { memo } from 'react'; -import Avatar, { BaseAvatarProps } from './BaseAvatar'; +import type { BaseAvatarProps } from './BaseAvatar'; +import Avatar from './BaseAvatar'; type RoomAvatarProps = Pick & { url?: string; diff --git a/packages/ui-avatar/tsconfig-build.json b/packages/ui-avatar/tsconfig.build.json similarity index 100% rename from packages/ui-avatar/tsconfig-build.json rename to packages/ui-avatar/tsconfig.build.json diff --git a/yarn.lock b/yarn.lock index 81934e8873a..2a6b0109183 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10266,7 +10266,6 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar" dependencies: - "@babel/core": "npm:~7.28.5" "@rocket.chat/core-typings": "workspace:~" "@rocket.chat/emitter": "npm:~0.31.25" "@rocket.chat/fuselage": "npm:~0.68.1"