Merge branch 'main' into dependabot/npm_and_yarn/webpack-5.94.0

.github/workflows/cd.yml

@@ -17,19 +17,12 @@ jobs:
  outputs:
  branch-name: ${{ steps.set-branch-name.outputs.branch-name }}
  steps:
- - uses: actions/setup-node@v2
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
  with:
  node-version: "22.2.0"
- - uses: actions/checkout@v2
- - name: Turbo Cache
- id: turbo-cache
- uses: actions/cache@v2
- with:
- path: .turbo
- key: turbo-${{ runner.os }}-${{ github.job }}
- restore-keys: |
- turbo-${{ runner.os }}-
- - uses: actions/cache@v2
+ cache: "yarn"
+ - uses: actions/cache@v3
  id: yarn-cache
  with:
  path: |
@@ -40,15 +33,15 @@ jobs:
  if: steps.yarn-cache.outputs.cache-hit != 'true'
  - run: yarn run ci
  - run: yarn run docs
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
  with:
  name: storybooks
  path: |
  packages/fuselage/storybook-static
  packages/onboarding-ui/storybook-static
  packages/layout/storybook-static
 
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
  with:
  name: docs
  path: |
@@ -57,7 +50,7 @@ jobs:
  ref='${{ github.ref }}'
  echo "::set-output name=branch-name::$(echo "${ref:11}")"
  id: set-branch-name
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
  with:
  name: build
  path: packages/**/dist/*
@@ -68,22 +61,23 @@ jobs:
  needs:
  - build-and-test
  steps:
- - uses: actions/setup-node@v2
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-node@v3
  with:
  node-version: "22.2.0"
  registry-url: "https://registry.npmjs.org"
  scope: "@rocket.chat"
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- - uses: actions/cache@v2
+ cache: "yarn"
+ - uses: actions/cache@v3
  id: yarn-cache
  with:
  path: |
  **/node_modules
  .yarn/cache
  key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- - uses: actions/download-artifact@v2
+ - uses: actions/download-artifact@v3
  with:
  name: build
  path: packages
@@ -119,15 +113,15 @@ jobs:
  name: github-pages
  url: "https://rocketchat.github.io/fuselage/fuselage/${{ needs.build-and-test.outputs.branch-name }}"
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  with:
  ref: gh-pages
- - uses: actions/download-artifact@v2
+ - uses: actions/download-artifact@v3
  with:
  name: storybooks
  path: packages
 
- - uses: actions/download-artifact@v2
+ - uses: actions/download-artifact@v3
  with:
  name: docs
  path: .

.github/workflows/ci-pr.yml

@@ -19,11 +19,12 @@ jobs:
  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
  runs-on: ubuntu-latest
  steps:
- - uses: actions/setup-node@v2
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: "22.2.0"
- - uses: actions/checkout@v2
- - uses: actions/cache@v2
+  cache: "yarn"
+ - uses: actions/cache@v3
  id: yarn-cache
  with:
  path: |
@@ -32,7 +33,7 @@ jobs:
  key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
  - name: Turbo Cache
  id: turbo-cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: .turbo
  key: turbo-${{ runner.os }}-${{ github.job }}
@@ -41,7 +42,7 @@ jobs:
  - run: yarn install
  if: steps.yarn-cache.outputs.cache-hit != 'true'
  - run: yarn run ci
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
  with:
  name: "storybooks-${{ github.event.number }}"
  path: |

packages/css-in-js/package.json

@@ -54,7 +54,7 @@
  "jest": "~29.7.0",
  "lint-all": "workspace:~",
  "prettier": "~2.8.7",
- "rollup": "~2.67.3",
+ "rollup": "~2.79.2",
  "rollup-plugin-terser": "~7.0.2",
  "ts-jest": "~29.2.4",
  "typedoc": "~0.25.13",

packages/emitter/package.json

@@ -54,7 +54,7 @@
  "lint-all": "workspace:~",
  "npm-run-all": "^4.1.5",
  "prettier": "~2.8.7",
- "rollup": "~2.67.3",
+ "rollup": "~2.79.2",
  "rollup-plugin-terser": "~7.0.2",
  "ts-jest": "~29.2.4",
  "typedoc": "~0.25.13",

packages/fuselage-hooks/package.json

@@ -65,7 +65,7 @@
  "prettier": "~2.8.7",
  "react": "^17.0.2",
  "rimraf": "~5.0.0",
- "rollup": "~2.67.3",
+ "rollup": "~2.79.2",
  "rollup-plugin-terser": "~7.0.2",
  "testing-utils": "workspace:~",
  "ts-jest": "~29.2.4",

packages/fuselage/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.59.1
+
+### Patch Changes
+
+- [`1d038fdc`](https://github.com/RocketChat/fuselage/commit/1d038fdc5645d3afad000b6f255dc0a644cbb838) Thanks [@ggazzo](https://github.com/ggazzo)! - Fixed color sidebar highlighted
+
 ## 0.59.0
 
 ### Minor Changes

packages/fuselage/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@rocket.chat/fuselage",
- "version": "0.59.0",
+ "version": "0.59.1",
  "description": "Rocket.Chat's React Components Library",
  "author": {
  "name": "Rocket.Chat",

packages/fuselage/src/components/Sidebar/Sidebar.styles.scss

@@ -35,7 +35,7 @@ $sidebar-color-stroke-default: theme(
 $sidebar-item-color: theme('sidebar-item-color', colors.font(secondary-info));
 $sidebar-item-color-highlighted: theme(
  'sidebar-item-color-highlighted',
- colors.font(pure-white)
+ colors.font(titles-labels)
 );
 $sidebar-item-background-color-hover: theme(
  'sidebar-item-background-color-hover',

packages/layout/.storybook/main.ts

@@ -6,6 +6,7 @@ export default {
  'storybook-dark-mode',
  '@storybook/addon-webpack5-compiler-swc',
  ],
+ logLevel: 'silent',
 
  stories: ['../src/**/*.stories.tsx', '../src/**/stories.tsx'],
 

packages/mp3-encoder/package.json

@@ -56,7 +56,7 @@
  "jest-environment-jsdom": "~29.7.0",
  "lint-all": "workspace:~",
  "prettier": "~2.8.7",
- "rollup": "~3.20.4",
+ "rollup": "~3.29.5",
  "ts-jest": "~29.2.4",
  "typedoc": "~0.25.13",
  "typescript": "~5.5.4"

packages/prettier-config/package.json

@@ -34,7 +34,7 @@
  "bump-next": "bump-next"
  },
  "peerDependencies": {
- "prettier": "~2.7.1"
+ "prettier": "*"
  },
  "devDependencies": {
  "bump": "workspace:~",