From 3db762c4521d1a7411779bd974941b75e936a8df Mon Sep 17 00:00:00 2001 From: Mitch-At-Work Date: Wed, 6 Aug 2025 09:56:21 -0700 Subject: [PATCH 1/2] Fix up merge conflicts --- .github/CODEOWNERS | 7 +------ .../react-components/react-button/library/package.json | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ee06811d02bcac..132ea2605a154b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 diff --git a/packages/react-components/react-button/library/package.json b/packages/react-components/react-button/library/package.json index 106a9509d29527..7461e08c401454 100644 --- a/packages/react-components/react-button/library/package.json +++ b/packages/react-components/react-button/library/package.json @@ -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" }, From 246b7b9420a8b51d4d3b6f79e37334867f393ad2 Mon Sep 17 00:00:00 2001 From: Mitch-At-Work Date: Wed, 6 Aug 2025 10:30:39 -0700 Subject: [PATCH 2/2] Fix up lint deprecation --- .../Menu/useSemanticMenuItemSwitchStyles.styles.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Menu/useSemanticMenuItemSwitchStyles.styles.ts b/packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Menu/useSemanticMenuItemSwitchStyles.styles.ts index 4f0df7b46d3959..c7fe9dd9b61e70 100644 --- a/packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Menu/useSemanticMenuItemSwitchStyles.styles.ts +++ b/packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Menu/useSemanticMenuItemSwitchStyles.styles.ts @@ -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',