Skip to content

Commit

Permalink
Merge branch 'main' into fix/italics-mentions
Browse files Browse the repository at this point in the history
  • Loading branch information
tassoevan authored Nov 13, 2023
2 parents 4399622 + 0030022 commit 62ac927
Show file tree
Hide file tree
Showing 141 changed files with 5,324 additions and 2,477 deletions.
12 changes: 9 additions & 3 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/changelog-git",
"changelog": [
"@changesets/changelog-github",
{ "repo": "RocketChat/fuselage" }
],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "develop",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
"ignore": [],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}
}
40 changes: 23 additions & 17 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ name: Continuous Delivery
on:
push:
branches:
- master
- develop
- main

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
build-and-test:
Expand Down Expand Up @@ -46,8 +47,8 @@ jobs:
packages/fuselage/storybook-static
packages/onboarding-ui/storybook-static
packages/layout/storybook-static
- if: github.ref == 'refs/heads/master'
uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v2
with:
name: docs
path: |
Expand Down Expand Up @@ -88,21 +89,26 @@ jobs:
path: packages
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
- run: yarn resolve-workspace-deps
if: github.ref == 'refs/heads/master'
- uses: changesets/action@v1

- name: Create Release Pull Request
id: changesets
uses: changesets/action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Resolve workspace dependencies
if: steps.changesets.outputs.hasChangesets == 'false'
run: yarn resolve-workspace-deps

- name: Publish to npm
if: steps.changesets.outputs.hasChangesets == 'false'
uses: changesets/action@v1
with:
publish: yarn release
if: github.ref == 'refs/heads/master'
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: yarn bump-next
if: github.ref == 'refs/heads/develop'
- run: yarn release-next
if: github.ref == 'refs/heads/develop'
env:
YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

publish-to-gh-pages:
name: Publish to GitHub Pages
Expand All @@ -120,8 +126,8 @@ jobs:
with:
name: storybooks
path: packages
- if: github.ref == 'refs/heads/master'
uses: actions/download-artifact@v2

- uses: actions/download-artifact@v2
with:
name: docs
path: .
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "develop", "master" ]
branches: "main"
pull_request:
branches: [ "develop" ]
branches: "main"
schedule:
- cron: "54 21 * * 4"

Expand All @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ javascript ]
language: [javascript]

steps:
- name: Checkout
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@rocket.chat/fuselage-root",
"name": "@rocket.chat/fuselage-monorepo",
"private": true,
"version": "0.31.25",
"workspaces": [
"packages/*",
"tools/*"
],
"devDependencies": {
"@changesets/changelog-github": "~0.4.8",
"@changesets/cli": "~2.26.2",
"bump": "workspace:~",
"husky": "~7.0.4",
Expand All @@ -31,7 +31,8 @@
"resolve-workspace-deps": "yarn workspace scripts run resolve-workspace-deps",
"create-package": "hygen create-package",
"bump-next": "yarn workspaces foreach --no-private -v run bump-next",
"release": "yarn changesets publish",
"release": "yarn changeset publish",
"changeset": "changeset",
"release-next": "yarn workspaces foreach --no-private -v npm publish --tag next --tolerate-republish"
},
"devEngines": {
Expand Down
14 changes: 14 additions & 0 deletions packages/fuselage-hooks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Change Log

## 0.32.1

### Patch Changes

- [`a97c7f086`](https://github.com/RocketChat/fuselage/commit/a97c7f08633e6e36a39c8933b530f9acacb83af0) Thanks [@dougfabris](https://github.com/dougfabris)! - chore: resolve-workspace-deps to publish pkg versions

## 0.32.0

### Minor Changes

- [`a04f9089d`](https://github.com/RocketChat/fuselage/commit/a04f9089d19ba32d2b2e80738d2d5f4dac0d3e0c) Thanks [@dougfabris](https://github.com/dougfabris)! - feat: create useElementIsVisible

- [`a04f9089d`](https://github.com/RocketChat/fuselage/commit/a04f9089d19ba32d2b2e80738d2d5f4dac0d3e0c) Thanks [@dougfabris](https://github.com/dougfabris)! - fix(fuselage-hooks): usePosition fallback positioning

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

Expand Down
2 changes: 1 addition & 1 deletion 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.31.25",
"version": "0.32.1",
"description": "React hooks for Fuselage, Rocket.Chat's design system and UI toolkit",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
"author": {
Expand Down
6 changes: 6 additions & 0 deletions packages/fuselage-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 0.32.0

### Minor Changes

- [#1128](https://github.com/RocketChat/fuselage/pull/1128) [`6db5cb214`](https://github.com/RocketChat/fuselage/commit/6db5cb2141bf42c9622c5846701e5b26392a1ada) Thanks [@juliajforesti](https://github.com/juliajforesti)! - feat(fuselage, fuselage-tokens): Update primitive tokens

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

Expand Down
198 changes: 70 additions & 128 deletions packages/fuselage-tokens/colors.js
Original file line number Diff line number Diff line change
@@ -1,132 +1,74 @@
'use strict';

module.exports = {
'd100': '#FFE9EC',
'd200': '#FFC1C9',
'd300': '#F98F9D',
'd400': '#F5495F',
'd500': '#EC0D2A',
'd550': '#F5455C',
'd600': '#D40C26',
'd650': '#DA1F37',
'd700': '#BB0B21',
'd800': '#9B1325',
'd900': '#8B0719',
'i100': '#E8F2FF',
'i200': '#D1EBFE',
'i300': '#76B7FC',
'i400': '#549DF9',
'i500': '#156FF5',
'i600': '#095AD2',
'i700': '#10529E',
'i800': '#01336B',
'i900': '#012247',
'n100': '#f7f8fa',
'n200': '#f2f3f5',
'n250': '#EBECEF',
'n300': '#eeeff1',
'n400': '#e4e7ea',
'n450': '#d7dbe0',
'n500': '#cbced1',
'n600': '#9ea2a8',
'n700': '#6c727a',
'n800': '#2f343d',
'n850': '#2f343d80',
'n900': '#1f2329',
'p100': '#E8F2FF',
'p200': '#D1EBFE',
'p300': '#76B7FC',
'p400': '#549DF9',
'p500': '#156FF5',
'p550': '#1D74F5',
'p600': '#095AD2',
'p700': '#10529E',
'p800': '#01336B',
'p900': '#012247',
's100': '#E5FBF4',
's200': '#C0F6E4',
's300': '#96F0D2',
's400': '#6CE9C0',
's500': '#2DE0A5',
's600': '#1ECB92',
's650': '#158D65',
's700': '#19AC7C',
's800': '#148660',
's900': '#106D4F',
's1000': '#0D5940',
's1-100': '#FDE8D7',
's1-200': '#FAD1B0',
's1-300': '#F7B27B',
's1-400': '#F59B53',
's1-500': '#F38C39',
's1-600': '#E26D0E',
's1-700': '#BD5A0B',
's1-800': '#974809',
's1-900': '#713607',
's2-100': '#F9EFFC',
's2-200': '#EDD0F7',
's2-300': '#DCA0EF',
's2-400': '#CA71E7',
's2-500': '#9F22C7',
's2-600': '#7F1B9F',
's2-700': '#5F1477',
's2-800': '#4A105D',
's2-900': '#350B42',
'w100': '#FFF6D6',
'w150': '#FFF8E0',
'w200': '#FFECAD',
'w300': '#FFE383',
'w400': '#FFD95A',
'w500': '#FFD031',
'w600': '#F3BE08',
'w650': '#AC892F',
'w700': '#DFAC00',
'w800': '#B68D00',
'w900': '#8E6300',
'white': '#ffffff',
'b100': '#e8f2ff',
'b200': '#d1ebfe',
'b300': '#76b7fc',
'b400': '#549df9',
'b500': '#1d74f5',
'b600': '#095ad2',
'b700': '#10529e',
'b800': '#01336b',
'b900': '#012247',
'g100': '#e5fbf4',
'g200': '#c0f6e4',
'g300': '#96f0d2',
'g400': '#6ce9c0',
'g500': '#2de0a5',
'g600': '#1ecb92',
'g700': '#19ac7c',
'g800': '#158d65',
'g900': '#106d4f',
'r100': '#fddade',
'r200': '#fbb5be',
'r300': '#f98f9d',
'r400': '#f76a7d',
'r500': '#f5455c',
'r600': '#db0c27',
'r700': '#b30a20',
'r800': '#8b0719',
'r900': '#630512',
'y100': '#fff6d6',
'y200': '#ffecad',
'y300': '#ffe383',
'y400': '#ffd95a',
'y500': '#ffd031',
'y600': '#f3be08',
'y700': '#dfac00',
'y800': '#b68d00',
'y900': '#8e6d00',
'o100': '#fde8d7',
'o200': '#fad1b0',
'o300': '#f7b27b',
'o400': '#f59b53',
'o500': '#f38c39',
'o600': '#e26d0e',
'o700': '#bd5a0b',
'o800': '#974809',
'o900': '#713607',
white: '#FFFFFF',
n100: '#F7F8FA',
n200: '#F2F3F5',
n250: '#EBECEF',
n300: '#EEEFF1',
n400: '#E4E7EA',
n450: '#D7DBE0',
n500: '#CBCED1',
n600: '#9EA2A8',
n700: '#6C737A',
n800: '#2F343D',
n900: '#1F2329',
r100: '#FFE9EC',
r200: '#FFC1C9',
r300: '#F98F9D',
r400: '#F5455C',
r500: '#EC0D2A',
r600: '#D40C26',
r700: '#BB0B21',
r800: '#9B1325',
r900: '#8B0719',
r1000: '#6B0513',
o100: '#FDE8D7',
o200: '#FAD1B0',
o300: '#F7B27B',
o400: '#F59B53',
o500: '#F38C39',
o600: '#E26D0E',
o700: '#BD5A0B',
o800: '#974809',
o900: '#713607',
o1000: '#5B2C06',
p100: '#F9EFFC',
p200: '#EDD0F7',
p300: '#DCA0EF',
p400: '#CA71E7',
p500: '#9F22C7',
p600: '#7F1B9F',
p700: '#5F1477',
p800: '#4A105D',
p900: '#350B42',
y100: '#FFF8E0',
y200: '#FFECAD',
y300: '#FFE383',
y400: '#FFD95A',
y500: '#FFD031',
y600: '#F3BE08',
y700: '#DFAC00',
y800: '#AC892F',
y900: '#8E6300',
y1000: '#573D00',
g100: '#E5FBF4',
g200: '#C0F6E4',
g300: '#96F0D2',
g400: '#6CE9C0',
g500: '#2DE0A5',
g600: '#1ECB92',
g700: '#19AC7C',
g800: '#148660',
g900: '#106D4F',
g1000: '#0D5940',
b100: '#E8F2FF',
b200: '#D1EBFE',
b300: '#76B7FC',
b400: '#549DF9',
b500: '#156FF5',
b600: '#095AD2',
b700: '#10529E',
b800: '#01336B',
b900: '#012247',
};
Loading

0 comments on commit 62ac927

Please sign in to comment.