Skip to content

Update fluent and type-fest dependencies to latest #4347

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
JamesBurnside merged 10 commits into from
Apr 1, 2024
Merged

Update fluent and type-fest dependencies to latest #4347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6634ef7
Update fluent and type-fest dependencies to latest
JamesBurnside Mar 27, 2024
277aa46
Change files
JamesBurnside Mar 27, 2024
3edfe43
Duplicate change files for beta release
JamesBurnside Mar 27, 2024
892b7ea
update stable deps
JamesBurnside Mar 27, 2024
76e8c7a
fix unit tests
JamesBurnside Mar 28, 2024
3d58150
remove unused import
JamesBurnside Mar 28, 2024
98219ac
remove `only`
JamesBurnside Mar 28, 2024
810e0b6
Merge remote-tracking branch 'origin/main' into jaburnsi/update-ts-5.…
JamesBurnside Mar 28, 2024
8cfc019
Merge branch 'main' into jaburnsi/update-ts-5.3.3-dependent-deps
JamesBurnside Mar 28, 2024
2fe241a
Merge branch 'main' into jaburnsi/update-ts-5.3.3-dependent-deps
JamesBurnside Apr 1, 2024
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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-33fdbed7-b090-4ef9-827d-5f1067a83789.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "improvement",
"workstream": "",
"comment": "Update fluent and type-fest dependencies to latest",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-33fdbed7-b090-4ef9-827d-5f1067a83789.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "improvement",
"workstream": "",
"comment": "Update fluent and type-fest dependencies to latest",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
1,200 changes: 601 additions & 599 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,223 changes: 638 additions & 585 deletions common/config/rush/variants/stable/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions packages/communication-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"@azure/communication-common": "^2.3.1",
"@azure/core-paging": "^1.5.0",
"@azure/logger": "^1.0.4",
"@fluentui/react-components": "^9.46.8",
"@fluentui/react": "^8.115.2",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-hooks": "^8.6.36",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react-components": "^9.47.2",
"@fluentui/react": "^8.117.0",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-hooks": "^8.7.0",
"@fluentui/react-icons": "^2.0.233",
"@fluentui/react-window-provider": "^2.2.18",
"@fluentui-contrib/react-chat": "0.1.7",
"@fluentui-contrib/react-chat": "0.1.9",
"@griffel/react": "^1.5.20",
"copy-to-clipboard": "^3.3.1",
"dompurify": "^3.0.9",
Expand Down Expand Up @@ -156,7 +156,7 @@
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"ts-patch": "^3.1.2",
"type-fest": "^3.13.1",
"type-fest": "^4.14.0",
"typescript": "5.4.2",
"typescript-transform-paths": "^3.4.7"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
},
"license": "MIT",
"dependencies": {
"@fluentui/react": "^8.115.2",
"@fluentui/react-components": "^9.46.8",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-hooks": "^8.6.36",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.117.0",
"@fluentui/react-components": "^9.47.2",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-hooks": "^8.7.0",
"@fluentui/react-icons": "^2.0.233",
"@fluentui/react-window-provider": "^2.2.18",
"@fluentui-contrib/react-chat": "0.1.7",
"@fluentui-contrib/react-chat": "0.1.9",
"@griffel/react": "^1.5.20",
"@internal/acs-ui-common": "1.14.1-beta.0",
"copy-to-clipboard": "^3.3.1",
Expand Down Expand Up @@ -126,7 +126,7 @@
"source-map-explorer": "^2.5.0",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"type-fest": "^3.13.1",
"type-fest": "^4.14.0",
"typescript": "5.4.2",
"webpack": "5.89.0"
}
Expand Down
12 changes: 9 additions & 3 deletions packages/react-components/src/components/VideoEffects/VideoBackgroundEffectsPicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,25 @@ const TEST_PICKER_OPTIONS = [

describe('Background Picker should have the correct number of tiles', () => {
test('Background Picker should have 7 tiles when items are set to wrap', async () => {
const { container } = render(<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow="wrap" />);
const { container } = render(
<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow="wrap" ignoreFocusOnMount={true} />
);
expect(container.querySelectorAll('[data-ui-id="video-effects-item"]').length).toBe(TEST_PICKER_OPTIONS.length);
});

test('Background Picker should have 7 tiles and 2 hidden tiles spanning 3 rows when items per row is set to 3', async () => {
const { container } = render(<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow={3} />);
const { container } = render(
<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow={3} ignoreFocusOnMount={true} />
);
expect(container.querySelectorAll('[data-ui-id="video-effects-item"]').length).toBe(7);
expect(container.querySelectorAll('[data-ui-id="video-effects-hidden-item"]').length).toBe(2);
expect(container.querySelectorAll('[data-ui-id="video-effects-picker-row"]').length).toBe(3);
});

test('Background Picker should have 7 tiles and 1 hidden tile spanning 4 rows when items per row is set to 2', async () => {
const { container } = render(<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow={2} />);
const { container } = render(
<_VideoBackgroundEffectsPicker options={TEST_PICKER_OPTIONS} itemsPerRow={2} ignoreFocusOnMount={true} />
);
expect(container.querySelectorAll('[data-ui-id="video-effects-item"]').length).toBe(7);
expect(container.querySelectorAll('[data-ui-id="video-effects-hidden-item"]').length).toBe(1);
expect(container.querySelectorAll('[data-ui-id="video-effects-picker-row"]').length).toBe(4);
Expand Down
16 changes: 15 additions & 1 deletion packages/react-components/src/components/VideoEffects/VideoBackgroundEffectsPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@ export interface _VideoBackgroundEffectsPickerProps {
* Styles for the picker.
*/
styles?: _VideoBackgroundEffectsPickerStyles;

/**
* Used only for jest tests. If `true`, the autofocus-on-mount will be ignored when the component mounts.
* If not, jest tries to cleanup after the first render pass, but the component throws an error because
* it tries to display a tooltip after that render pass and after the component is cleaned up.
*
* This can be removed once: https://github.com/microsoft/fluentui/issues/30896 is fixed.
*/
ignoreFocusOnMount?: boolean;
}

/**
Expand Down Expand Up @@ -138,7 +147,12 @@ export const _VideoBackgroundEffectsPicker = (props: _VideoBackgroundEffectsPick
{options.map((option, i) => {
if (i === 0 && rowIndex === 0) {
return (
<_VideoEffectsItem {...option} itemKey={option.itemKey} key={option.itemKey} focusOnMount={true} />
<_VideoEffectsItem
{...option}
itemKey={option.itemKey}
key={option.itemKey}
focusOnMount={true && !props.ignoreFocusOnMount}
/>
);
}
return <_VideoEffectsItem {...option} itemKey={option.itemKey} key={option.itemKey} />;
Expand Down
10 changes: 5 additions & 5 deletions packages/react-composites/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"@azure/core-paging": "^1.5.0",
"@azure/core-rest-pipeline": "^1.13.0",
"@azure/logger": "^1.0.4",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-hooks": "^8.6.36",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.115.2",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-hooks": "^8.7.0",
"@fluentui/react-icons": "^2.0.233",
"@fluentui/react": "^8.117.0",
"@internal/acs-ui-common": "1.14.1-beta.0",
"@internal/calling-component-bindings": "1.14.1-beta.0",
"@internal/calling-stateful-client": "1.14.1-beta.0",
Expand Down Expand Up @@ -152,7 +152,7 @@
"ts-jest": "^29.1.2",
"ts-loader": "^8.0.12",
"ts-node": "^10.9.2",
"type-fest": "^3.13.1",
"type-fest": "^4.14.0",
"typescript": "5.4.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "4.15.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@azure/communication-common": "^2.3.1",
"@azure/communication-identity": "^1.3.0",
"@azure/communication-react": "1.14.1-beta.0",
"@fluentui/react-components": "^9.46.8",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-hooks": "^8.6.36",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.115.2",
"@fluentui/react-components": "^9.47.2",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-hooks": "^8.7.0",
"@fluentui/react-icons": "^2.0.233",
"@fluentui/react": "^8.117.0",
"@fluentui/theme-samples": "8.7.123",
"@griffel/react": "^1.5.20",
"@internal/fake-backends": "1.14.1-beta.0",
Expand Down
6 changes: 3 additions & 3 deletions samples/CallWithChat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"@azure/communication-common": "^2.3.1",
"@azure/logger": "^1.0.4",
"@babel/preset-react": "^7.12.7",
"@fluentui/react": "^8.115.2",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.117.0",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-icons": "^2.0.233",
"@internal/acs-ui-common": "1.14.1-beta.0",
"@internal/calling-component-bindings": "1.14.1-beta.0",
"@internal/calling-stateful-client": "1.14.1-beta.0",
Expand Down
6 changes: 3 additions & 3 deletions samples/Calling/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"@azure/communication-common": "^2.3.1",
"@azure/logger": "^1.0.4",
"@babel/preset-react": "^7.12.7",
"@fluentui/react": "^8.115.2",
"@fluentui/react-hooks": "^8.6.36",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.117.0",
"@fluentui/react-hooks": "^8.7.0",
"@fluentui/react-icons": "^2.0.233",
"@internal/acs-ui-common": "1.14.1-beta.0",
"@internal/calling-component-bindings": "1.14.1-beta.0",
"@internal/calling-stateful-client": "1.14.1-beta.0",
Expand Down
6 changes: 3 additions & 3 deletions samples/Chat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"@azure/communication-identity": "^1.3.0",
"@azure/communication-react": "1.14.1-beta.0",
"@azure/logger": "^1.0.4",
"@fluentui/react": "^8.115.2",
"@fluentui/react-file-type-icons": "8.11.4",
"@fluentui/react-icons": "^2.0.231",
"@fluentui/react": "^8.117.0",
"@fluentui/react-file-type-icons": "8.11.5",
"@fluentui/react-icons": "^2.0.233",
"@internal/acs-ui-common": "1.14.1-beta.0",
"@internal/chat-stateful-client": "1.14.1-beta.0",
"@internal/chat-component-bindings": "1.14.1-beta.0",
Expand Down
2 changes: 1 addition & 1 deletion samples/ComponentExamples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@azure/communication-common": "^2.3.1",
"@azure/communication-identity": "^1.3.0",
"@azure/communication-react": "1.14.1-beta.0",
"@fluentui/react": "^8.115.2",
"@fluentui/react": "^8.117.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"dotenv": "^10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion samples/StaticHtmlComposites/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@azure/communication-common": "^2.3.1",
"@azure/communication-calling": "1.23.1-beta.2 || ^1.22.3",
"@azure/communication-chat": "1.5.0-beta.1 || ^1.4.0",
"@fluentui/react": "^8.115.2",
"@fluentui/react": "^8.117.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"uuid": "^9.0.0"
Expand Down
⚡