Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Commit

Permalink
Release 1.13.0 (#705)
Browse files Browse the repository at this point in the history
## 1.13.0 - 2022-04-08
Chore: Update cd.yml (#704)
Chore: Replace a / b with math.div(a, b) on SCSS files (#702)
[IMPROVE] Centralized e-mail validation under a library function #693
[FIX] Fixes broken triggers. #695
[IMPROVE] Add TypeScript (#694)
[IMPROVE] Replace i18n package (#657)
[FIX] Prevent html rendering on messages (#701)
  • Loading branch information
tiagoevanp committed Apr 8, 2022
1 parent efa1456 commit 75bcc3b
Show file tree
Hide file tree
Showing 175 changed files with 7,272 additions and 11,109 deletions.
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,5 @@ insert_final_newline = true
[*.{js,coffee,html,less,css,scss,json}]
indent_style = tab

[*.i18n.json]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/build/*
/src/i18n/index.js
!/.storybook

src/i18next.js
22 changes: 16 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,23 @@
"react/require-render-return": "error",
"react/self-closing-comp": "error",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
"react-hooks/exhaustive-deps": "warn",
"no-sequences": "off"
},
"settings": {
"react": {
"pragma": "h",
"pragmaFrag": "Fragment",
"version": "detect"
}
"import/resolver": {
"node": {
"extensions": [
".js",
".ts",
".tsx"
]
}
},
"react": {
"pragma": "h",
"pragmaFrag": "Fragment",
"version": "detect"
}
}
}
10 changes: 10 additions & 0 deletions .github/pr-title-checker-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"LABEL": {
"name": "Invalid PR Title",
"color": "B60205"
},
"CHECKS": {
"regexp": "^(?:(?:\\[(NEW|BREAK|IMPROVE|FIX)\\](\\[(ENTERPRISE|APPS)\\])?|(?:Regression|Chore|Bump):) .+|Release [0-9]+\\.[0-9]+\\.[0-9]+)",
"ignoreLabels" : ["[ignore-title]"]
}
}
4 changes: 3 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ jobs:
- run: yarn publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
- run: yarn release
- run: yarn release -y
env:
GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_TOKEN }}

publish-to-gh-pages:
name: Publish to GitHub Pages
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/pr-title-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: "PR Title Checker"
on:
pull_request:
types: [opened, edited]

jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: thehanimo/pr-title-checker@v1.2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Binary file modified .loki/reference/chrome_Messages_MessageList_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_MessageList_with_system_message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_MessageList_with_typing_users.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_MessageTime_today.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_MessageTime_yesterday.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_grouping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_markdown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_me.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_with_UiKit_blocks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_with_files_attachments.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_with_image_attachment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Messages_Message_with_quotation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Chat_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Chat_with_trigger_messages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Chat_with_typing_user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Leave_a_message_loading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_Leave_a_message_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_TriggerMessage_multiple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .loki/reference/chrome_Routes_TriggerMessage_single.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ module.exports = ({ config }) => {
[require.resolve('../src/lib/uiKit')]: require.resolve('./mocks/uiKit'),
};

const babelRule = config.module.rules.find((rule) => Array.isArray(rule.use) && rule.use.find(({ loader }) => loader === 'babel-loader'));
babelRule.use.push({ loader: 'preact-i18nline/webpack-loader' });

config.module.rules = config.module.rules.filter(({ loader }) => !/json-loader/.test(loader));

const fileLoader = config.module.rules.find(({ loader }) => /file-loader/.test(loader));
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## 1.13.0 - 2022-04-08
Chore: Update cd.yml (#704)
Chore: Replace a / b with math.div(a, b) on SCSS files (#702)
[IMPROVE] Centralized e-mail validation under a library function #693
[FIX] Fixes broken triggers. #695
[IMPROVE] Add TypeScript (#694)
[IMPROVE] Replace i18n package (#657)
[FIX] Prevent html rendering on messages (#701)

## 1.12.2 - 2022-03-29
[FIX] Revert: LoadConfig after registering guest #696

Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ yarn test
# run the storybook
yarn storybook

# before commit run
yarn i18n
```

## Screens:
![image](https://user-images.githubusercontent.com/5263975/44279585-497b2980-a228-11e8-81a2-36bc3389549e.png)
![image](https://user-images.githubusercontent.com/5263975/44279599-5730af00-a228-11e8-8873-553ef53ee25a.png)
Expand Down
16 changes: 6 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/livechat",
"version": "1.12.2",
"version": "1.13.0",
"files": [
"/build"
],
Expand All @@ -21,7 +21,6 @@
"eslint": "eslint src",
"stylelint": "stylelint 'src/**/*.scss'",
"storybook": "start-storybook -p 9001 -c .storybook",
"i18n": "i18nline synch && node_modules/.bin/eslint --fix src/i18n/index.js",
"deploy-storybook": "storybook-to-ghpages",
"release": "gh-release -c master --assets build.tar.gz",
"loki:test": "loki test --chromeDockerImage=chinello/alpine-chrome:latest --chromeFlags=\"--headless --no-sandbox --disable-gpu --disable-features=VizDisplayCompositor\" --verboseRenderer --requireReference --reactUri file:./storybook-static",
Expand Down Expand Up @@ -62,7 +61,6 @@
"loki": "^0.24.0",
"lorem-ipsum": "^2.0.3",
"mini-css-extract-plugin": "^0.11.0",
"node-sass": "^4.14.1",
"npm-run-all": "^4.1.5",
"postcss-css-variables": "^0.17.0",
"postcss-dir-pseudo-class": "^5.0.0",
Expand All @@ -72,12 +70,15 @@
"postcss-logical": "^4.0.2",
"postcss-selector-not": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.49.10",
"sass-loader": "^9.0.2",
"serve": "^11.3.2",
"style-loader": "^1.2.1",
"stylelint": "^13.6.1",
"stylelint-order": "^4.1.0",
"svg-loader": "^0.0.2",
"ts-loader": "^8.3.0",
"typescript": "^4.6.3",
"url-loader": "^4.1.0",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
Expand All @@ -93,14 +94,14 @@
"desvg": "^1.0.2",
"emoji-mart": "^3.0.0",
"history": "^5.0.0",
"i18nline": "^2.0.1",
"i18next": "^21.3.3",
"markdown-it": "^11.0.0",
"mem": "^6.1.0",
"mitt": "^2.1.0",
"preact": "^10.4.6",
"preact-i18nline": "^2.0.0",
"preact-router": "^3.2.1",
"query-string": "^6.13.1",
"react-i18next": "^11.13.0",
"whatwg-fetch": "^3.4.0"
},
"browserslist": [
Expand All @@ -113,11 +114,6 @@
"gitEmail": "guilherme.gazzo@rocket.chat",
"commitMessage": "Deploy Storybook to GitHub Pages [skip ci]"
},
"husky": {
"hooks": {
"pre-commit": "run-s i18n && git add -A src/i18n"
}
},
"houston": {
"updateFiles": [
"package.json"
Expand Down
10 changes: 6 additions & 4 deletions src/components/Alert/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { h, Component } from 'preact';
import { withTranslation } from 'react-i18next';

import I18n from '../../i18n';
import CloseIcon from '../../icons/close.svg';
import { createClassName } from '../helpers';
import styles from './styles.scss';


export class Alert extends Component {
class Alert extends Component {
static defaultProps = {
timeout: 3000,
hideCloseButton: false,
Expand All @@ -28,7 +28,7 @@ export class Alert extends Component {
clearTimeout(this.dismissTimeout);
}

render = ({ success, warning, error, color, hideCloseButton, className, style = {}, children }) => (
render = ({ success, warning, error, color, hideCloseButton, className, style = {}, children, t }) => (
<div
role='alert'
className={createClassName(styles, 'alert', { success, warning, error }, [className])}
Expand All @@ -44,11 +44,13 @@ export class Alert extends Component {
<button
onClick={this.handleDismiss}
className={createClassName(styles, 'alert__close')}
aria-label={I18n.t('Dismiss this alert')}
aria-label={t('dismiss_this_alert')}
>
<CloseIcon width={20} height={20} />
</button>
)}
</div>
)
}

export default withTranslation()(Alert);
2 changes: 1 addition & 1 deletion src/components/Alert/stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { withKnobs, boolean, color, text } from '@storybook/addon-knobs';
import { storiesOf } from '@storybook/react';
import { h } from 'preact';

import { Alert } from '.';
import Alert from '.';
import { screenCentered, loremIpsum } from '../../helpers.stories';


Expand Down
Loading

0 comments on commit 75bcc3b

Please sign in to comment.