Skip to content

Extended-tokens: Fix merge conflict after rebase #34987

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.

Sign up for GitHub

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

Merged
Mitch-At-Work merged 2 commits into from
Aug 6, 2025
Merged

Extended-tokens: Fix merge conflict after rebase #34987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db762c
Fix up merge conflicts
Mitch-At-Work Aug 6, 2025
246b7b9
Fix up lint deprecation
Mitch-At-Work Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,9 @@ packages/react-components/react-virtualizer/stories @microsoft/xc-uxe @Mitch-At-
packages/react-components/react-skeleton/library @microsoft/cxe-prg @marcosmoura
packages/react-components/react-skeleton/stories @microsoft/cxe-prg @marcosmoura
packages/tokens @microsoft/teams-prg
<<<<<<< HEAD
packages/semantic-tokens @microsoft/xc-uxe
packages/react-components/react-tags/library @microsoft/cxe-prg @microsoft/teams-prg @ValentinaKozlova
packages/react-components/react-tags/stories @microsoft/cxe-prg @microsoft/teams-prg @ValentinaKozlova
=======
packages/semantic-tokens @microsoft/xc-uxe
packages/react-components/react-tags/library @microsoft/cxe-prg @microsoft/teams-prg
packages/react-components/react-tags/stories @microsoft/cxe-prg @microsoft/teams-prg
>>>>>>> 48fdc34685 (Semantic-tokens: Add initial package (#34121))
packages/react-components/react-migration-v0-v9/library @microsoft/teams-prg
packages/react-components/react-migration-v0-v9/stories @microsoft/teams-prg
packages/react-components/react-datepicker-compat/library @microsoft/cxe-prg @ValentinaKozlova
Expand Down
10 changes: 5 additions & 5 deletions packages/react-components/react-button/library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"@fluentui/keyboard-keys": "^9.0.8",
"@fluentui/react-aria": "^9.16.2",
"@fluentui/react-icons": "^2.0.245",
"@fluentui/react-jsx-runtime": "^9.0.54",
"@fluentui/react-shared-contexts": "^9.23.1",
"@fluentui/react-tabster": "^9.24.6",
"@fluentui/react-theme": "^9.1.24",
"@fluentui/react-utilities": "^9.19.0",
"@fluentui/react-jsx-runtime": "^9.1.4",
"@fluentui/react-shared-contexts": "^9.24.1",
"@fluentui/react-tabster": "^9.26.2",
"@fluentui/react-theme": "^9.2.0",
"@fluentui/react-utilities": "^9.23.1",
"@griffel/react": "^1.5.22",
"@swc/helpers": "^0.5.1"
},
Expand Down
1 change: 1 addition & 0 deletions ...hooks-preview/library/src/component-styles/Menu/useSemanticMenuItemSwitchStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ export const useSemanticMenuItemSwitchStyles = (_state: unknown): MenuItemSwitch
useMenuItemStyles_unstable({
...state,
components: {
// eslint-disable-next-line @typescript-eslint/no-deprecated
...state.components,
checkmark: 'span',
submenuIndicator: 'span',
Expand Down
Loading