Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing compound design tokens #27188

Conversation

florianduros
Copy link
Member

@florianduros florianduros commented Mar 14, 2024

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

Ran yarn add github:matrix-org/matrix-react-sdk#develop to update the compound-design-tokens. The new tokens used in the react-sdk are in the compound-design-tokens@1.2.0 and they are missing the last release. See #27166

The command made some minors changes on other dependencies (string-width, strip-ansi, wrap-ansi). It's adding new line, nothing harmful. It's seems to separate commonjs.

@florianduros florianduros added T-Defect backport staging Label to automatically backport PR to staging branch labels Mar 14, 2024
@florianduros florianduros marked this pull request as ready for review March 14, 2024 14:03
@florianduros florianduros requested a review from a team as a code owner March 14, 2024 14:03
@florianduros florianduros changed the title Update matrix-react-sdk deps Update compound-design-tokens in matrix-react-sdk deps Mar 14, 2024
@florianduros florianduros changed the title Update compound-design-tokens in matrix-react-sdk deps Fix missing compound design tokens Mar 14, 2024
@florianduros florianduros added this pull request to the merge queue Mar 14, 2024
Merged via the queue into develop with commit 8082d07 Mar 14, 2024
71 of 76 checks passed
@florianduros florianduros deleted the florianduros/update-compound-design-token-subdependencies branch March 14, 2024 14:40
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-27188-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8082d07e7b724050d053bfc7bb5b2a83999fe861
# Push it to GitHub
git push --set-upstream origin backport-27188-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-27188-to-staging.

florianduros added a commit that referenced this pull request Mar 14, 2024
…d-design-token-subdependencies

Fix missing compound design tokens

(cherry picked from commit 8082d07)
florianduros added a commit that referenced this pull request Mar 14, 2024
…d-design-token-subdependencies

Fix missing compound design tokens

(cherry picked from commit 8082d07)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging Label to automatically backport PR to staging branch T-Defect
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants