Skip to content

Commit eb8a0fe

Browse files
ling1726ling1726
authored
Merge branch 'master' into master
2 parents 867fe98 + ebffada commit eb8a0fe

464 files changed

Lines changed: 5875 additions & 2202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ packages/react-components/react-conformance-griffel @microsoft/teams-prg
150150
packages/react-components/react-context-selector @microsoft/teams-prg
151151
packages/react-date-time @microsoft/cxe-red
152152
packages/react-docsite-components @microsoft/fluentui-v8-website
153+
packages/react-examples @microsoft/cxe-red @microsoft/cxe-coastal
153154
packages/react-file-type-icons @microsoft/cxe-red @jahnp @bigbadcapers
154155
packages/react-hooks @microsoft/cxe-red
155156
packages/react-icons-mdl2 @microsoft/cxe-red @microsoft/cxe-coastal

‎apps/perf-test-react-components/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"dependencies": {
2121
"@fluentui/scripts-perf-test-flamegrill": "*",
2222
"@griffel/core": "^1.9.0",
23-
"@fluentui/react-avatar": "^9.4.8",
24-
"@fluentui/react-button": "^9.3.8",
25-
"@fluentui/react-field": "9.0.0",
26-
"@fluentui/react-infobutton": "9.0.0-beta.26",
27-
"@fluentui/react-persona": "^9.2.7",
28-
"@fluentui/react-provider": "^9.5.2",
29-
"@fluentui/react-spinbutton": "^9.2.9",
23+
"@fluentui/react-avatar": "^9.4.9",
24+
"@fluentui/react-button": "^9.3.9",
25+
"@fluentui/react-field": "^9.1.0",
26+
"@fluentui/react-infobutton": "9.0.0-beta.27",
27+
"@fluentui/react-persona": "^9.2.8",
28+
"@fluentui/react-provider": "^9.5.3",
29+
"@fluentui/react-spinbutton": "^9.2.10",
3030
"@fluentui/react-theme": "^9.1.7",
3131
"@microsoft/load-themed-styles": "^1.10.26",
3232
"react": "17.0.2",

‎apps/perf-test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@fluentui/scripts-perf-test-flamegrill": "*",
2222
"@fluentui/example-data": "^8.4.7",
23-
"@fluentui/react": "^8.107.5",
23+
"@fluentui/react": "^8.108.0",
2424
"@microsoft/load-themed-styles": "^1.10.26",
2525
"react": "17.0.2",
2626
"react-dom": "17.0.2",

‎apps/public-docsite-resources/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
"@fluentui/scripts-webpack": "*"
3535
},
3636
"dependencies": {
37-
"@fluentui/react": "^8.107.5",
37+
"@fluentui/react": "^8.108.0",
3838
"@fluentui/react-examples": "^8.34.4",
3939
"@microsoft/load-themed-styles": "^1.10.26",
40-
"@fluentui/azure-themes": "^8.5.79",
41-
"@fluentui/react-docsite-components": "^8.11.40",
40+
"@fluentui/azure-themes": "^8.5.81",
41+
"@fluentui/react-docsite-components": "^8.12.0",
4242
"@fluentui/font-icons-mdl2": "^8.5.13",
4343
"@fluentui/set-version": "^8.2.6",
44-
"@fluentui/theme-samples": "^8.7.75",
45-
"@fluentui/react-monaco-editor": "^1.7.75",
44+
"@fluentui/theme-samples": "^8.7.77",
45+
"@fluentui/react-monaco-editor": "^1.7.77",
4646
"office-ui-fabric-core": "^11.0.0",
4747
"react": "17.0.2",
4848
"react-dom": "17.0.2",

‎apps/public-docsite-v9/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"@fluentui/scripts-tasks": "*"
2323
},
2424
"dependencies": {
25-
"@fluentui/react-datepicker-compat": "0.0.0-beta.1",
26-
"@fluentui/react-migration-v8-v9": "^9.2.8",
25+
"@fluentui/react-datepicker-compat": "0.0.0-beta.2",
26+
"@fluentui/react-migration-v8-v9": "^9.2.9",
2727
"@fluentui/react-migration-v0-v9": "9.0.0-alpha.0",
28-
"@fluentui/react": "^8.107.5",
28+
"@fluentui/react": "^8.108.0",
2929
"@fluentui/react-northstar": "^0.66.4",
3030
"@fluentui/react-icons-northstar": "^0.66.4",
31-
"@fluentui/react-components": "^9.18.9",
31+
"@fluentui/react-components": "^9.19.0",
3232
"@fluentui/react-storybook-addon": "9.0.0-rc.1",
3333
"@fluentui/react-storybook-addon-codesandbox": "9.0.0-alpha.0",
3434
"@griffel/react": "^1.5.2",

‎apps/public-docsite/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@fluentui/common-styles": "^1.2.22",
2727
"@fluentui/eslint-plugin": "*",
28-
"@fluentui/react-monaco-editor": "^1.7.75",
28+
"@fluentui/react-monaco-editor": "^1.7.77",
2929
"write-file-webpack-plugin": "^4.1.0",
3030
"@fluentui/scripts-tasks": "*",
3131
"@fluentui/scripts-webpack": "*"
@@ -34,17 +34,17 @@
3434
"@fluentui/font-icons-mdl2": "^8.5.13",
3535
"@fluentui/public-docsite-resources": "^8.1.41",
3636
"@fluentui/public-docsite-setup": "^0.3.18",
37-
"@fluentui/react": "^8.107.5",
38-
"@fluentui/react-docsite-components": "^8.11.40",
37+
"@fluentui/react": "^8.108.0",
38+
"@fluentui/react-docsite-components": "^8.12.0",
3939
"@fluentui/react-examples": "^8.34.4",
40-
"@fluentui/react-experiments": "^8.14.70",
41-
"@fluentui/fluent2-theme": "^8.106.12",
40+
"@fluentui/react-experiments": "^8.14.72",
41+
"@fluentui/fluent2-theme": "^8.107.1",
4242
"@fluentui/react-file-type-icons": "^8.8.13",
4343
"@fluentui/react-icons-mdl2": "^1.3.37",
4444
"@fluentui/react-icons-mdl2-branded": "^1.2.38",
4545
"@fluentui/set-version": "^8.2.6",
4646
"@fluentui/theme": "^2.6.25",
47-
"@fluentui/theme-samples": "^8.7.75",
47+
"@fluentui/theme-samples": "^8.7.77",
4848
"@fluentui/utilities": "^8.13.9",
4949
"@microsoft/load-themed-styles": "^1.10.26",
5050
"office-ui-fabric-core": "^11.0.0",

‎apps/public-docsite/src/SiteDefinition/SiteDefinition.tsx‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,7 @@ export const SiteDefinition: ISiteDefinition<Platforms> = {
6262
{ from: '#/styles/web/fluent-theme', to: '#/controls/web/themes' },
6363
{ from: '#/examples', to: '#/controls/web' },
6464
],
65-
messageBars: [
66-
{
67-
path: '#',
68-
text: (
69-
<span>
70-
🎉 Announcing Fluent UI React v9 stable release! Visit{' '}
71-
<a href="https://react.fluentui.dev/" style={{ color: '#006cbe' }}>
72-
Fluent UI React v9
73-
</a>{' '}
74-
to see more.
75-
</span>
76-
),
77-
sessionStoragePrefix: 'FluentUI9',
78-
},
79-
],
65+
messageBars: [],
8066
// This is defined by loadSite() from @fluentui/public-docsite-setup
8167
versionSwitcherDefinition: window.__versionSwitcherDefinition,
8268
};

‎apps/public-docsite/src/pages/Controls/ControlsAreaPage.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ export interface IControlsPageProps extends IPageProps<Platforms> {}
99

1010
const apiRequireContext = require.context('@fluentui/public-docsite-resources/dist/api/', true, /^(?!references).*/);
1111

12+
const webPlatformBanner = {
13+
banner: {
14+
title: 'Fluent UI v9',
15+
message: 'Check out the all new [Fluent UI version 9](https://react.fluentui.dev)!',
16+
},
17+
};
18+
1219
const ControlsAreaPageBase: React.FunctionComponent<IControlsPageProps> = props => {
1320
let jsonDocs: IPageJson;
1421
if (props.platform === 'web' && !props.jsonDocs) {
@@ -25,6 +32,7 @@ const ControlsAreaPageBase: React.FunctionComponent<IControlsPageProps> = props
2532
subTitle={getSubTitle(props.platform!)}
2633
jsonDocs={jsonDocs!}
2734
{...props}
35+
{...(props.platform === Platforms.web && webPlatformBanner)}
2836
versionSwitcherDefinition={
2937
props.platform === Platforms.web ? SiteDefinition.versionSwitcherDefinition : undefined
3038
}

‎apps/react-18-tests-v8/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@fluentui/scripts-webpack": "*"
2222
},
2323
"dependencies": {
24-
"@fluentui/react": "^8.107.5",
24+
"@fluentui/react": "^8.108.0",
2525
"@fluentui/react-hooks": "^8.6.20",
2626
"@types/react": "18.0.14",
2727
"@types/react-dom": "18.0.6",

‎apps/react-18-tests-v9/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@fluentui/scripts-tasks": "*"
2020
},
2121
"dependencies": {
22-
"@fluentui/react-components": "^9.18.9",
22+
"@fluentui/react-components": "^9.19.0",
2323
"@types/react": "18.0.14",
2424
"@types/react-dom": "18.0.6",
2525
"react": "18.2.0",

0 commit comments

Comments
 (0)