-
-
Notifications
You must be signed in to change notification settings - Fork 2
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
chore: move design-tokens into merged-packages as part of migration process #92
Conversation
Pushing new tokens from Figma
…kens into feature/4-setup-ds-repository
Feature/4 setup ds repository
* 1.0.0 * Update CHANGELOG.md Co-authored-by: github-actions <[email protected]> Co-authored-by: Erik Marks <[email protected]>
* Add issue template * Prettify issue template
* Adding css stylesheet contaiing color design tokens * Adding css path to build Co-authored-by: Cal Leung <[email protected]>
Co-authored-by: github-actions <[email protected]>
* Updating some token descriptions that were wrong * Adding HEX values to descriptions and updating primary in dark mode * Updating token descriptions for brand colors * Adding secondary tokens to light theme * Adding storybook and adding initial design token documentation * Clean up * Updating some linting issues * Updating scripts * Adding secondary colors to dark and updating muted for both light and dark * Updating all muted values * Adding storybook and adding initial design token documentation * Clean up * Updating some linting issues * Updating all muted values * Swapping background default and alternative in dark mode and updating border color to be slightly less darker * Skip lib check * Add license to package.json * Updates to tokens and docs * Restoring token json token from main * Try to fix test but updating text * Fix build error Co-authored-by: Cal Leung <[email protected]>
* 1.2.0 * Update change log Co-authored-by: github-actions <[email protected]> Co-authored-by: Cal Leung <[email protected]>
* 1.3.0 * Updating category in changelog Co-authored-by: github-actions <[email protected]> Co-authored-by: georgewrmarshall <[email protected]>
* updated dark-theme to hex (w alpha) * Update src/figma/tokens.json * Update src/figma/tokens.json * Update src/figma/tokens.json * Update src/figma/tokens.json * Update src/figma/tokens.json * Update src/figma/tokens.json * updated light-theme to hex (w alpha) * updated blue400 to correct hex * Changed all color to HEX value * Converting CSS variables * Generating light theme hex value updates * generating js dark theme tokens * Generating dark css * Fixing secondary default * Fixing border default description Co-authored-by: Hiro M <[email protected]>
* chore: upgrading storybook to 8.1.3 * chore: upgrading storybook to v8.1.4
* chore: updated css variables based on updated json * refactor: updated css variable namings * feat: added deprecated css files * refactor: updated migration changelist based on comments * refactor: updated migration doc * refactor: updated title for css part in migration doc * refactor: simplified deprecated tokens * refactor: removed deprecated colors and updated migration doc * refactor: updated css naming * refactor: nit changes * feat: readded overlay inverse back to css variables * docs: updating migrations doc layout * chore: reverting css import order --------- Co-authored-by: georgewrmarshall <[email protected]>
* feat: updated js tokens based on updated json * refactor: updated migration doc * feat: added deprecated tokens * refactor: removed deprecated tokens and updated tests * refactor: updated migration doc * refactor: removed addition language in migration doc * feat: readded overlay inverse back in js tokens * docs: updating migration docs to include js updates * fix: adding removed heading back --------- Co-authored-by: georgewrmarshall <[email protected]>
* 4.0.0 * chore: updating changelog --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: georgewrmarshall <[email protected]>
… Token JSON (#719) * feat: added tests for css variables * refactor: removed lint ignore
* feat: add dark classname * add light class
* chore: aligning dependencies with the metamask-design-system * chore: aligning dependencies with design-system-react
* 4.1.0 * chore: updating changelog --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: georgewrmarshall <[email protected]>
👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎ This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored. Ignoring: Next stepsTake a deeper look at the dependencyTake a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev. Remove the packageIf you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency. Mark a package as acceptable riskTo ignore an alert, reply with a comment starting with |
@SocketSecurity ignore-all
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Confirmed that all design-tokens files appear in
merged-packages/design-tokens
with the correct structure.
Verified that no diffs are found when comparing the migrated package with the main branch of the original repo using the following commands:
git remote add -f design-tokens https://github.com/MetaMask/design-tokens
git remote update
git diff HEAD:merged-packages/design-tokens remotes/design-tokens/main
- Verified the commit history for design-tokens is intact and accurately reflects the original repository.
Commit history is linear, and its readability is not affected by the excessive merge commits issue.
There's one section prior to the version reset that has nested merge commits, but this doesn't hurt readability or maintainability, and deserves to be preserved as a part of the package's development history.
- Ensured this PR meets all acceptance criteria.
Correctly implements the requirements of PR#6.
Friendly remember to NOT squash + merge this branch. Prior to merging, you will need to go into the settings for this repo and temporarily enable "merge commits", and then you can select that option before you press the big green button. |
Moving to new PR that is up to date with |
…rocess (#100) Duplicate of #92 with updated `main` branch ## **Description** This PR follows **[PR#6] 1. Migrate the source repo's git history into the merged-packages/ temporary directory in metamask design system** as part of the [package migration process guide](https://github.com/MetaMask/metamask-design-system/blob/main/docs/package-migration-process-guide.md#pr6-1-migrate-the-source-repos-git-history-into-the-merged-packages-temporary-directory-in-metamask-design-system). This step migrates the Git history of the `design-tokens` repository into the `metamask-design-system` monorepo, placing all contents under the `merged-packages/design-tokens` directory. [Example PR](MetaMask/core#1872) in core ## **Related issues** Partly fixes: #88 ## **Manual testing steps** 1. Check the contents under `merged-packages/design-tokens` in the `metamask-design-system` repository to ensure the file structure aligns with the original `design-tokens` repository. 2. Verify that the commit history within `merged-packages/design-tokens` accurately preserves previous `design-tokens` commits. 3. Confirm successful integration within the monorepo and that no errors are introduced. ## **Pre-merge author checklist** - [x] Verified `git-filter-repo` installation and migration process. - [x] Confirmed all `design-tokens` files are correctly moved to `merged-packages/design-tokens`. - [x] Checked that the full commit history for `design-tokens` is retained. - [x] Followed MetaMask Coding Standards. - [x] Set PR status appropriately. ## **Pre-merge reviewer checklist** - [ ] Confirmed that all `design-tokens` files appear in `merged-packages/design-tokens` with the correct structure. - [ ] Verified the commit history for `design-tokens` is intact and accurately reflects the original repository. - [ ] Ensured this PR meets all acceptance criteria.
Description
This PR follows [PR#6] 1. Migrate the source repo's git history into the merged-packages/ temporary directory in metamask design system as part of the package migration process guide. This step migrates the Git history of the
design-tokens
repository into themetamask-design-system
monorepo, placing all contents under themerged-packages/design-tokens
directory.Example PR in core
Related issues
Partly fixes: #88
Manual testing steps
merged-packages/design-tokens
in themetamask-design-system
repository to ensure the file structure aligns with the originaldesign-tokens
repository.merged-packages/design-tokens
accurately preserves previousdesign-tokens
commits.Pre-merge author checklist
git-filter-repo
installation and migration process.design-tokens
files are correctly moved tomerged-packages/design-tokens
.design-tokens
is retained.Pre-merge reviewer checklist
design-tokens
files appear inmerged-packages/design-tokens
with the correct structure.design-tokens
is intact and accurately reflects the original repository.