Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Fuselage …
Browse files Browse the repository at this point in the history
…into new/memo
  • Loading branch information
tassoevan committed Feb 5, 2021
2 parents 31c73a0 + 9436d1c commit 62f5fec
Show file tree
Hide file tree
Showing 194 changed files with 1,301 additions and 99 deletions.
41 changes: 25 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- checkout
- run: yarn
- run: yarn lerna run build --stream

- run: yarn lerna run build-storybook:loki --scope @rocket.chat/fuselage --stream
- run:
command: |
Expand All @@ -41,9 +42,18 @@ jobs:
command: yarn run loki:test-ci
working_directory: ~/repo/packages/fuselage

- store_artifacts:
path: ~/repo/packages/fuselage/.loki/difference
- run: yarn lerna run build-storybook:loki --scope @rocket.chat/fuselage-ui-kit --stream
- run:
command: |
cat package.json | sed s/\.docker/.app/ > package.json-new
mv package.json-new package.json
working_directory: ~/repo/packages/fuselage-ui-kit
- run:
command: yarn run loki:test-ci
working_directory: ~/repo/packages/fuselage-ui-kit

- store_artifacts:
path: ~/repo/packages/fuselage-ui-kit/.loki/difference

publish:
docker:
Expand Down Expand Up @@ -78,7 +88,6 @@ jobs:
yarn lerna version --conventional-commits --yes
yarn lerna publish --canary --preid $CIRCLE_PR_NUMBER --dist-tag $CIRCLE_PR_NUMBER --yes
publish-next:
docker:
- image: circleci/node:10.15
Expand All @@ -105,28 +114,28 @@ workflows:
requires:
- loki
filters:
branches:
only: master
tags:
only: /^v.*/
branches:
only: master
tags:
only: /^v.*/
- publish-next:
requires:
- loki
filters:
branches:
only: develop
branches:
only: develop
- publish-alpha:
requires:
- hold
filters:
branches:
only: /feature*/
branches:
only: /feature*/
- hold:
type: approval
requires:
- build
- build
filters:
branches:
ignore:
- master
- develop
branches:
ignore:
- master
- develop
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Bug Fixes

* AvatarProps declaration ([#361](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/361)) ([6324875](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/6324875c68e0b7b11536e3b766c27eb8e301fe52))
* Banner surface adjustments ([#362](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/362)) ([2d59b7c](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/2d59b7c41962f24aa13face91a9b9f0ea8f1718a))
* Change option styles ([#358](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/358)) ([c479d70](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/c479d7041710e04fe8a9d8e766720ec206464e89))
* Pass appId and blockId from blocks to elements ([#366](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/366)) ([8a1b552](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/8a1b552f8dbc3a9b321d888f4a7e9dc9af2922cf))
* sidebar-item__menu-wraper opacity on IE ([#381](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/381)) ([3038b15](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/3038b15002d6df3d184a2dac2a97f5a3d0aa50f4))
* Temporary fix for auto complete ([#364](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/364)) ([218a8b3](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/218a8b30c42c7a2321f2de3d0cc081131e890834))
* TSConfig es5 target & es6 lib ([#378](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/378)) ([5802499](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/580249900584287203dad5e4da2acc1829759cbd))
* Update Fuselage typings ([#355](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/355)) ([85f9fa1](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/85f9fa13f818703bce1100ad706a66d703c0b0ba))


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))
* linear_scale element ([#365](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/365)) ([43a4c54](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/43a4c54ed10d096ef2259ddcd30c3bbd97ae866a))





## [0.20.3](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.2...v0.20.3) (2021-01-29)


### Bug Fixes

* sidebar-item__menu-wraper opacity on IE ([#381](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/381)) ([e818b5c](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/e818b5cd99b1749997d6f487517c29722c77a23a))





## [0.20.2](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.1...v0.20.2) (2021-01-27)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.20.2",
"version": "0.21.0",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
Expand Down
16 changes: 16 additions & 0 deletions packages/css-in-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Bug Fixes

* TSConfig es5 target & es6 lib ([#378](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/378)) ([5802499](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/580249900584287203dad5e4da2acc1829759cbd))


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))





## [0.20.2](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.1...v0.20.2) (2021-01-27)


Expand Down
4 changes: 2 additions & 2 deletions packages/css-in-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/css-in-js",
"version": "0.20.2",
"version": "0.21.0",
"description": "Toolset to transpile and use CSS on runtime",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down Expand Up @@ -66,7 +66,7 @@
},
"dependencies": {
"@emotion/hash": "^0.8.0",
"@rocket.chat/memo": "^0.20.1",
"@rocket.chat/memo": "^0.21.0",
"stylis": "^4.0.6"
}
}
11 changes: 11 additions & 0 deletions packages/emitter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))





## [0.20.1](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.0...v0.20.1) (2020-12-22)

**Note:** Version bump only for package @rocket.chat/emitter
Expand Down
2 changes: 1 addition & 1 deletion packages/emitter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/emitter",
"version": "0.20.1",
"version": "0.21.0",
"description": "Event Emitter by Rocket.Chat",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
11 changes: 11 additions & 0 deletions packages/fuselage-hooks/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))





## [0.20.1](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.0...v0.20.1) (2020-12-22)

**Note:** Version bump only for package @rocket.chat/fuselage-hooks
Expand Down
4 changes: 2 additions & 2 deletions packages/fuselage-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-hooks",
"version": "0.20.1",
"version": "0.21.0",
"description": "React hooks for Fuselage, Rocket.Chat's design system and UI toolkit",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down Expand Up @@ -82,7 +82,7 @@
"access": "public"
},
"dependencies": {
"@rocket.chat/fuselage-tokens": "^0.20.1",
"@rocket.chat/fuselage-tokens": "^0.21.0",
"use-subscription": "^1.4.1"
}
}
11 changes: 11 additions & 0 deletions packages/fuselage-polyfills/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))





## [0.20.1](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.0...v0.20.1) (2020-12-22)

**Note:** Version bump only for package @rocket.chat/fuselage-polyfills
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-polyfills/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-polyfills",
"version": "0.20.1",
"version": "0.21.0",
"description": "A bundle of useful poly/ponyfills used by fuselage",
"author": {
"name": "Rocket.Chat",
Expand Down
11 changes: 11 additions & 0 deletions packages/fuselage-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))





## [0.20.1](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.0...v0.20.1) (2020-12-22)

**Note:** Version bump only for package @rocket.chat/fuselage-tokens
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-tokens",
"version": "0.20.1",
"version": "0.21.0",
"description": "Design tokens for Fuselage, Rocket.Chat's design system",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
2 changes: 2 additions & 0 deletions packages/fuselage-ui-kit/.loki/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
current
difference
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions packages/fuselage-ui-kit/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import breakpointTokens from '@rocket.chat/fuselage-tokens/breakpoints.json';
import '@rocket.chat/icons/dist/rocketchat.css';
import '@rocket.chat/fuselage-polyfills';
import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks';
import { addParameters } from '@storybook/react';
import 'loki/configure-react';
import 'normalize.css/normalize.css';
import '@rocket.chat/icons/dist/rocketchat.css';
import '@rocket.chat/fuselage-polyfills';

addParameters({
backgrounds: {
Expand Down
26 changes: 26 additions & 0 deletions packages/fuselage-ui-kit/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.21.0](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.3...v0.21.0) (2021-01-31)


### Bug Fixes

* Banner surface adjustments ([#362](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/362)) ([2d59b7c](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/2d59b7c41962f24aa13face91a9b9f0ea8f1718a))
* Pass appId and blockId from blocks to elements ([#366](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/366)) ([8a1b552](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/8a1b552f8dbc3a9b321d888f4a7e9dc9af2922cf))


### Features

* Built modules for design tokens ([#356](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/356)) ([f9c3449](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/f9c344953b8161a4385cab3a3dcc8b6a7210446f))
* linear_scale element ([#365](https://github.com/RocketChat/Rocket.Chat.Fuselage/issues/365)) ([43a4c54](https://github.com/RocketChat/Rocket.Chat.Fuselage/commit/43a4c54ed10d096ef2259ddcd30c3bbd97ae866a))





## [0.20.3](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.2...v0.20.3) (2021-01-29)

**Note:** Version bump only for package @rocket.chat/fuselage-ui-kit





## [0.20.2](https://github.com/RocketChat/Rocket.Chat.Fuselage/compare/v0.20.1...v0.20.2) (2021-01-27)

**Note:** Version bump only for package @rocket.chat/fuselage-ui-kit
Expand Down
20 changes: 13 additions & 7 deletions packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-ui-kit",
"version": "0.20.2",
"version": "0.21.0",
"description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down Expand Up @@ -32,8 +32,13 @@
"lint": "eslint src",
"lint-staged": "lint-staged",
"prettier-format": "prettier --config .prettierrc 'src/**/*' --write",
"loki:test": "loki test --chromeDockerImage=chinello/alpine-chrome:latest --chromeFlags=\"--headless --no-sandbox --disable-gpu --disable-features=VizDisplayCompositor\" --verboseRenderer --requireReference --reactUri file:./storybook-static",
"loki:test-ci": "loki test --chromeFlags=\"--headless --no-sandbox --disable-gpu --disable-features=VizDisplayCompositor\" --verboseRenderer --requireReference --reactUri file:./storybook-static",
"loki:update": "loki update --chromeDockerImage=chinello/alpine-chrome:latest --chromeFlags=\"--headless --no-sandbox --disable-gpu --disable-features=VizDisplayCompositor\" --verboseRenderer --requireReference --reactUri file:./storybook-static",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook"
"build-storybook": "build-storybook",
"build-storybook:loki": "cross-env NODE_ENV=loki build-storybook",
"update-storybook": "cross-env NODE_ENV=loki run-s build-storybook loki:update"
},
"peerDependencies": {
"@rocket.chat/fuselage": "*",
Expand All @@ -52,10 +57,10 @@
"@babel/preset-react": "^7.10.4",
"@rocket.chat/apps-engine": "^1.17.0",
"@rocket.chat/eslint-config": "^0.4.0",
"@rocket.chat/fuselage": "^0.20.2",
"@rocket.chat/fuselage-hooks": "^0.20.1",
"@rocket.chat/icons": "^0.20.1",
"@rocket.chat/ui-kit": "^0.20.1",
"@rocket.chat/fuselage": "^0.21.0",
"@rocket.chat/fuselage-hooks": "^0.21.0",
"@rocket.chat/icons": "^0.21.0",
"@rocket.chat/ui-kit": "^0.21.0",
"@storybook/addon-essentials": "^6.1.11",
"@storybook/addons": "^6.1.11",
"@storybook/react": "^6.1.11",
Expand All @@ -69,6 +74,7 @@
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.0",
"loki": "^0.25.1",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.2",
Expand All @@ -81,6 +87,6 @@
},
"gitHead": "f8467b8ffb6f90d91b46fbcdd5dca169235916a4",
"dependencies": {
"@rocket.chat/fuselage-polyfills": "^0.20.1"
"@rocket.chat/fuselage-polyfills": "^0.21.0"
}
}
Loading

0 comments on commit 62f5fec

Please sign in to comment.