Skip to content

Commit

Permalink
Merge branch 'master' into docs/breadcrumb-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
ValentinaKozlova authored Apr 3, 2023
2 parents 2ec76cc + 60f7139 commit 7aefda6
Show file tree
Hide file tree
Showing 2,217 changed files with 57,213 additions and 15,405 deletions.
10 changes: 10 additions & 0 deletions .babelrc-v9.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"presets": [
[
"@fluentui/scripts-babel/preset-v9",
{
"tsBaseConfigPath": "./tsconfig.base.json"
}
]
]
}
20 changes: 1 addition & 19 deletions .devops/templates/runpublishvrscreenshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ parameters:
- name: vrTestPackagePath
type: string
default: 'apps/vr-tests'
- name: shouldBuildstorybookaddon
type: boolean
default: false
- name: shouldBuildNorthstar
type: boolean
default: false

steps:
- task: Bash@3
Expand All @@ -25,7 +19,7 @@ steps:
isPR=${{lower(eq(variables['Build.Reason'], 'PullRequest'))}}
echo $isPR
if [[ $isPR == true ]]; then
packageAffected=$(yarn --silent check:affected-package --packages ${{ parameters.vrTestPackageName }} --pr=true)
packageAffected=$(yarn --silent check:affected --package ${{ parameters.vrTestPackageName }})
if [[ $packageAffected == false ]]; then
echo "In PR pipeline but NOT affecting test package. Skipping test run"
echo "##vso[task.setvariable variable=vrTestSkip;]yes"
Expand All @@ -39,18 +33,6 @@ steps:
fi
displayName: Check if vrTests should be skipped
- ${{ if eq(parameters.shouldBuildstorybookaddon, 'true') }}:
- script: |
yarn build --to @fluentui/react-storybook-addon
displayName: Build react-storybook-addon
condition: eq(variables['vrTestSkip'], 'no')
- ${{ if eq(parameters.shouldBuildNorthstar, 'true') }}:
- script: |
yarn build --to @fluentui/docs
displayName: Build react-northstar
condition: eq(variables['vrTestSkip'], 'no')
- script: |
yarn workspace ${{ parameters.vrTestPackageName }} vr:build
displayName: Build VR tests components package
Expand Down
18 changes: 12 additions & 6 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
/yarn.lock @microsoft/fluentui-react-build
/*.config.js @microsoft/fluentui-react-build
/typings @microsoft/fluentui-react-build
/.babelrc-v9.json @microsoft/fluentui-react-build

#### NX related files
/nx.json @microsoft/fluentui-react-build
Expand Down Expand Up @@ -89,6 +90,7 @@ scripts/ts-node @microsoft/fluentui-react-build
scripts/update-release-notes @microsoft/fluentui-react-build
scripts/utils @microsoft/fluentui-react-build
scripts/webpack @microsoft/fluentui-react-build
scripts/perf-test-flamegrill @microsoft/fluentui-react-build

#### Fluent UI N*
packages/a11y-rules @microsoft/fluentui-northstar
Expand Down Expand Up @@ -116,10 +118,12 @@ apps/public-docsite-v9 @microsoft/cxe-red @microsoft/cxe-coastal @microsoft/flue
apps/theming-designer @microsoft/fluentui-react
apps/ssr-tests-v9 @microsoft/fluentui-react-build
apps/stress-test @microsoft/cxe-red @spmonahan @micahgodbolt
apps/recipes-react-components @microsoft/cxe-red @microsoft/cxe-coastal @microsoft/fluentui-react-build @sopranopillow
apps/react-18-tests-v8 @microsoft/cxe-red @microsoft/cxe-coastal @micahgodbolt
apps/react-18-tests-v9 @microsoft/cxe-red @microsoft/cxe-coastal @micahgodbolt
apps/recipes-react-components @microsoft/cxe-red @microsoft/cxe-coastal @microsoft/fluentui-react @sopranopillow

#### Packages
packages/azure-themes @robtaft-ms @Jacqueline-ms
packages/azure-themes @Jacqueline-ms
packages/bundle-size @microsoft/teams-prg
packages/date-time-utilities @microsoft/cxe-red
packages/eslint-plugin @microsoft/fluentui-react-build
Expand All @@ -138,8 +142,9 @@ packages/react-components/react-conformance-griffel @microsoft/teams-prg
packages/react-components/react-context-selector @microsoft/teams-prg
packages/react-date-time @microsoft/cxe-red
packages/react-docsite-components @microsoft/fluentui-v8-website
packages/react-file-type-icons @jahnp @bigbadcapers
packages/react-file-type-icons @microsoft/cxe-red @jahnp @bigbadcapers
packages/react-hooks @microsoft/cxe-red
packages/react-icons-mdl2 @microsoft/cxe-red @microsoft/cxe-coastal
packages/react-monaco-editor @microsoft/fluentui-v8-website
packages/react-components/react-positioning @microsoft/teams-prg
packages/react-components/react-overflow @microsoft/teams-prg
Expand Down Expand Up @@ -214,7 +219,7 @@ packages/tokens @microsoft/teams-prg
packages/react-components/react-tags @microsoft/cxe-coastal @TristanWatanabe
packages/react-components/react-data-grid-react-window @microsoft/teams-prg
packages/react-components/react-migration-v0-v9 @microsoft/teams-prg
packages/react-components/react-datepicker @microsoft/cxe-red @sopranopillow @khmakoto
packages/react-components/react-datepicker-compat @microsoft/cxe-red @sopranopillow @khmakoto
packages/react-components/react-migration-v8-v9 @microsoft/cxe-red @microsoft/cxe-coastal @geoffcoxmsft
packages/react-components/react-breadcrumb @microsoft/cxe-prg
packages/react-components/react-drawer @microsoft/cxe-prg
Expand All @@ -233,11 +238,11 @@ packages/react/src/components/CalendarDayGrid @microsoft/cxe-red
packages/react/src/components/Check @microsoft/cxe-red @microsoft/cxe-coastal @ThomasMichon @khmakoto
packages/react/src/components/Checkbox @microsoft/cxe-red @microsoft/cxe-coastal @khmakoto
packages/react/src/components/ChoiceGroup @microsoft/cxe-red @microsoft/cxe-coastal
packages/react/src/components/Coachmark @microsoft/cxe-red @microsoft/cxe-coastal @leddie24
packages/react/src/components/Coachmark @microsoft/cxe-red @microsoft/cxe-coastal
packages/react/src/components/ColorPicker @microsoft/cxe-red @microsoft/cxe-coastal
packages/react/src/components/DatePicker @microsoft/cxe-red
packages/react/src/components/DetailsList @microsoft/cxe-red @microsoft/cxe-coastal @ThomasMichon
packages/react/src/components/DocumentCard @microsoft/cxe-red @microsoft/cxe-coastal @yiminwu
packages/react/src/components/DocumentCard @microsoft/cxe-red @microsoft/cxe-coastal
packages/react/src/components/Fabric @microsoft/cxe-red @microsoft/cxe-coastal @dzearing
packages/react/src/components/Facepile @microsoft/cxe-red @microsoft/cxe-coastal
packages/react/src/components/FolderCover @microsoft/cxe-red @microsoft/cxe-coastal @ThomasMichon @bigbadcapers
Expand Down Expand Up @@ -289,3 +294,4 @@ packages/react-experiments/src/components/TileList @ThomasMichon
**/cypress.config.ts @microsoft/fluentui-react-build
**/api-extractor.json @microsoft/fluentui-react-build
**/api-extractor.unstable.json @microsoft/fluentui-react-build
**/.swcrc @microsoft/fluentui-react-build
2 changes: 2 additions & 0 deletions .github/workflows/check-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@
"typescript.preferences.importModuleSpecifierEnding": "index",
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.reportStyleChecksAsWarnings": false,
"cSpell.words": ["beachball", "fluentui", "griffel", "spinbutton", "tabster"]
"cSpell.words": ["beachball", "borderless", "fluentui", "griffel", "spinbutton", "tabster"]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following table will help you navigate the 3 projects and understand their d
| **Docs** | [https://react.fluentui.dev/](https://react.fluentui.dev/) | [aka.ms/fluentui-react](https://aka.ms/fluentui-react) | [aka.ms/fluentui-web-components](https://aka.ms/fluentui-web-components) |
| **NPM** | `@fluentui/react-components` | `@fluentui/react`| `@fluentui/web-components` |
| **Version** | [![npm version](https://img.shields.io/npm/v/@fluentui/react-components?style=flat-square)](https://www.npmjs.com/package/@fluentui/react-components) | [![npm version](https://img.shields.io/npm/v/@fluentui/react?style=flat-square)](https://www.npmjs.com/package/@fluentui/react) | [![npm version](https://img.shields.io/npm/v/@fluentui/web-components?style=flat-square)](https://www.npmjs.com/package/@fluentui/web-components) |
| **Issues** | [![Fluent UI React Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react-components+%28v9%29%22) | [![Fluent UI React GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react%20(v8)?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react+(v8)%22) | [![Fluent UI Web Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/web-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22web-components%22) |
| **Issues** | [![Fluent UI React Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react-components%20(v9)?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react-components+%28v9%29%22) | [![Fluent UI React GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react%20(v8)?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react+(v8)%22) | [![Fluent UI Web Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/web-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22web-components%22) |
<!-- prettier-ignore-end -->

> Why are there two React versions? Fluent UI v8 is still widely used. We encourage you to migrate to Fluent UI v9. See the [Migration overview](https://react.fluentui.dev/?path=/docs/concepts-migration-overview--page).
Expand Down
21 changes: 21 additions & 0 deletions apps/perf-test-react-components/config/perf-test/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import * as path from 'path';
import { scenarioIterations } from './scenarioIterations';
import { scenarioRenderTypes } from './scenarioRenderTypes';
import { scenarioNames } from './scenarioNames';

const projectRoot = path.join(__dirname, '../../');
const projectRootPath = 'apps/perf-test-react-components';
const outDir = path.join(projectRoot, './dist');
const tempDir = path.join(projectRoot, './logfiles');
const scenariosSrcDirPath = path.join(projectRoot, './src/scenarios');

export const config = {
projectName: '@fluentui/react-components',
projectRootPath,
outDir,
tempDir,
scenariosSrcDirPath,
scenarioIterations,
scenarioRenderTypes,
scenarioNames,
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ScenarioIterations } from '@fluentui/scripts-tasks';
// You don't have to add scenarios to this structure unless you want their iterations to differ from the default.
export const scenarioIterations = {
export const scenarioIterations: ScenarioIterations = {
MakeStyles: 50000,
FluentProviderWithTheme: 10,
};
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { ScenarioNames } from '@fluentui/scripts-tasks';
// You don't have to add scenarios to this structure unless you want their display name to differ
// from their scenario name.
export const scenarioNames = {};
export const scenarioNames: ScenarioNames = {};
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { AllRenderTypes, ScenarioRenderTypes } from '@fluentui/scripts-tasks';
/**
* You don't have to add scenarios to this structure unless
* you want their render types to differ from the default (mount only).
Expand All @@ -8,9 +9,6 @@
* memoization logic help avoid certain code paths.
*/

const AllRenderTypes = ['mount', 'virtual-rerender', 'virtual-rerender-with-unmount'];
export const DefaultRenderTypes = ['mount'];

export const scenarioRenderTypes = {
export const scenarioRenderTypes: ScenarioRenderTypes = {
FluentProviderWithTheme: AllRenderTypes,
};
7 changes: 4 additions & 3 deletions apps/perf-test-react-components/just.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { getPerfRegressions } from './tasks/perf-test';
import { preset, task, series } from '@fluentui/scripts-tasks';
import { preset, task, series, getPerfRegressions } from '@fluentui/scripts-tasks';

import { config } from './config/perf-test';

preset();

task('run-perf-test', getPerfRegressions);
task('run-perf-test', () => getPerfRegressions(config));
task('perf-test', series('build', 'bundle', 'run-perf-test'));
20 changes: 9 additions & 11 deletions apps/perf-test-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,17 @@
"@fluentui/scripts-webpack": "*"
},
"dependencies": {
"@fluentui/scripts-perf-test-flamegrill": "*",
"@griffel/core": "^1.9.0",
"@fluentui/react-avatar": "^9.3.7",
"@fluentui/react-button": "^9.2.5",
"@fluentui/react-field": "9.0.0-alpha.21",
"@fluentui/react-infobutton": "9.0.0-beta.17",
"@fluentui/react-persona": "^9.1.13",
"@fluentui/react-provider": "^9.3.5",
"@fluentui/react-spinbutton": "^9.1.7",
"@fluentui/react-theme": "^9.1.5",
"@fluentui/react-avatar": "^9.4.6",
"@fluentui/react-button": "^9.3.6",
"@fluentui/react-field": "9.0.0-alpha.28",
"@fluentui/react-infobutton": "9.0.0-beta.24",
"@fluentui/react-persona": "^9.2.5",
"@fluentui/react-provider": "^9.5.0",
"@fluentui/react-spinbutton": "^9.2.6",
"@fluentui/react-theme": "^9.1.7",
"@microsoft/load-themed-styles": "^1.10.26",
"flamegrill": "0.2.0",
"lodash": "^4.17.15",
"querystring": "^0.2.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"tslib": "^2.1.0"
Expand Down
10 changes: 10 additions & 0 deletions apps/perf-test-react-components/src/app.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { loadScenarios, render } from '@fluentui/scripts-perf-test-flamegrill';

bootstrap();

function bootstrap() {
const reqContext = require.context('./scenarios/', false, /^\.\/[^\.]*\.(j|t)sx?$/);
const scenarios = loadScenarios(reqContext);

render(scenarios);
}
57 changes: 0 additions & 57 deletions apps/perf-test-react-components/src/index.scenarios.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { InfoButton } from '@fluentui/react-infobutton';
import { FluentProvider } from '@fluentui/react-provider';
import { webLightTheme } from '@fluentui/react-theme';

const Scenario = () => <InfoButton content={"This is an InfoButton's content."} />;
const Scenario = () => <InfoButton info={"This is an InfoButton's content."} />;

Scenario.decorator = (props: { children: React.ReactNode }) => {
<FluentProvider theme={webLightTheme}>{props.children}</FluentProvider>;
Expand Down
3 changes: 1 addition & 2 deletions apps/perf-test-react-components/src/scenarios/Persona.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const Scenario = () => (
presence={{ status: 'available' }}
avatar={{
image: {
src:
'https://res-1.cdn.office.net/files/fabric-cdn-prod_20221209.001/office-ui-fabric-react-assets/persona-male.png',
src: 'https://res-1.cdn.office.net/files/fabric-cdn-prod_20221209.001/office-ui-fabric-react-assets/persona-male.png',
},
}}
/>
Expand Down
14 changes: 0 additions & 14 deletions apps/perf-test-react-components/src/scenarios/scenarioList.ts

This file was deleted.

Loading

0 comments on commit 7aefda6

Please sign in to comment.