Fixing merge conflicts.

microsoft · Mar 24, 2021 · a1c8d1f · a1c8d1f
2 parents f3e5a26 + 28d34d2
commit a1c8d1f
Show file tree

Hide file tree

Showing 1,121 changed files with 51,891 additions and 13,195 deletions.
diff --git a/.devops/templates/tools.yml b/.devops/templates/tools.yml
@@ -11,3 +11,24 @@ steps:
       versionSpec: 1.22.x
       checkLatest: false
       includePrerelease: false
+
+  # For multiline scripts, we want the whole task to fail if any line of the script fails.
+  # ADO doesn't have bash configured this way by default. To fix we override the SHELLOPTS built-in variable.
+  # https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+  # The options below include ADO defaults (braceexpand:hashall:interactive-comments) plus
+  # errexit:errtrace for better error behavior.
+  - script: |
+      echo "##vso[task.setvariable variable=shellopts]braceexpand:hashall:interactive-comments:errexit:errtrace"
+    displayName: Force exit on error (bash)
+
+  # Log all the environment variables since it can be useful for debugging.
+  # (This happens automatically for the built-in agents, but not for custom agents.)
+  - script: |
+      printenv | sort
+      echo "SHELLOPTS $SHELLOPTS"
+      echo 'deployBasePath "$(deployBasePath)"'
+      echo 'deployUrl "$(deployUrl)"'
+      echo 'isPR "$(isPR)"'
+      echo 'targetBranch "$(targetBranch)"'
+    displayName: Log environment variables (Linux)
+    condition: eq(variables['Agent.OS'], 'Linux')
diff --git a/.devops/templates/variables.yml b/.devops/templates/variables.yml
@@ -1,15 +1,38 @@
+parameters:
+  # For customizing the deployment path in non-PR builds
+  - name: deployBasePath
+    type: string
+    default: ''
+
+  # Skip the component governance detection step (injected by a pipeline decorator from an
+  # internal extension) by default because we run it separately. Since all our pipelines
+  # in each branch install the same packages, only one pipeline (currently the daily release)
+  # needs to run detection.
+  - name: skipComponentGovernanceDetection
+    type: boolean
+    default: true
+
 variables:
-  deployBasePath: "pr-deploy-site/${{ variables['Build.SourceBranch'] }}"
+  # Also accessed as process.env.DEPLOYHOST
+  deployHost: 'fluentuipr.z22.web.core.windows.net'
 
-  deployHost: 'fabricweb.z5.web.core.windows.net'
+  # Also accessed as process.env.DEPLOYURL
+  deployUrl: 'https://$(deployHost)/$(deployBasePath)'
 
-  azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)'
+  # This service principal ("subscription" is a misleading name) only has access to the fluentuipr storage account
+  azureSubscription: Azure PR deploy
+  azureStorage: fluentuipr
 
-  ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+  ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/')) }}:
     isPR: true
     targetBranch: 'origin/$(System.PullRequest.TargetBranch)'
-  ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+    # Deploy PRs under "pull/####" unless otherwise requested
+    # (this is also accessed as process.env.DEPLOYBASEPATH)
+    deployBasePath: ${{ coalesce(parameters.deployBasePath, 'pull/$(System.PullRequest.PullRequestNumber)') }}
+  ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/') }}:
     isPR: false
+    targetBranch: ''
+    # Deploy master under "heads/branchname" unless otherwise requested
+    deployBasePath: ${{ coalesce(parameters.deployBasePath, replace(variables['Build.SourceBranch'], 'refs/', '')) }}
 
-  backfillProvider: 'azure-blob'
-  backfillOptions: '{"connectionString":"$(BACKFILL_CONNECTION_STRING)", "container":"$(BACKFILL_CONTAINER)"}'
+  skipComponentGovernanceDetection: ${{ parameters.skipComponentGovernanceDetection }}
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,15 +16,15 @@
 # docs/  docs@example.com
 
 #### Build stuff
-scripts/ @dzearing @ecraig12345 @xugao
+scripts/ @dzearing @ecraig12345 @hotell
 scripts/babel/ @layershifter @miroslavstastny
 scripts/create-package/ @dzearing @ecraig12345 @joschemd @behowell @layershifter @ling1726
 scripts/create-component/ @joschemd @behowell @layershifter @ling1726
 scripts/gulp/ @layershifter @miroslavstastny
 scripts/webpack/webpack.config.* @layershifter @miroslavstastny
 scripts/fluentui-publish/ @layershifter @ling1726
-package.json @ecraig12345 @xugao
-yarn.lock @ecraig12345 @xugao
+package.json @ecraig12345 @hotell
+yarn.lock @ecraig12345 @hotell
 *.config.js @ecraig12345
 *.sh @ecraig12345
 *.yml @ecraig12345
@@ -58,7 +58,7 @@ packages/web-components @chrisdholt @EisenbergEffect @nicholasrice
 # component-demo/
 public-docsite/ @ecraig12345
 public-docsite-resources/ @ecraig12345 @justSlone
-perf-test/ @JasonGore @xugao
+perf-test/ @kubkon
 # ssr-tests/
 # todo-app/
 Controls/web.tsx @Vitalius1 @natalieethell
@@ -77,10 +77,10 @@ packages/merge-styles/ @dzearing
 packages/monaco-editor/ @ecraig12345
 packages/react-hooks/ @ecraig12345
 packages/style-utilities/ @dzearing
-packages/style-utilities/src/interfaces/ @phkuo @xugao
-packages/style-utilities/src/styles/ @phkuo @xugao
-packages/theme/ @dzearing @xugao
-packages/react-theme-provider/ @dzearing @xugao
+packages/style-utilities/src/interfaces/ @phkuo @dzearing
+packages/style-utilities/src/styles/ @phkuo @dzearing
+packages/theme/ @dzearing
+packages/react-theme-provider/ @dzearing
 packages/react-monaco-editor/ @ecraig12345
 # packages/utilities/
 packages/utilities/positioning/ @joschect
@@ -101,25 +101,26 @@ packages/react-menu/ @ling1726 @layershifter
 packages/react-badge/ @ling1726 @layershifter @assuncaocharles @behowell
 packages/react-button/ @dzearing @khmakoto
 packages/react-cards/ @khmakoto
-packages/react-checkbox/ @khmakoto @xugao
+packages/react-checkbox/ @khmakoto
 packages/react-focus/src/components/FocusZone/ @khmakoto
-packages/react-image/ @kubkon @layershifter
+packages/react-image/ @cxe-prg
+packages/react-flex/ @cxe-prg
 packages/react-link/ @khmakoto
 packages/react-slider/ @joschect
 packages/react-tabs/ @behowell
-packages/react-toggle/ @xugao
+packages/react-toggle/ @behowell
 packages/react-tooltip/ @behowell
 
 ## Components
-packages/react/src/components/ActivityItem/ @xugao
+packages/react/src/components/ActivityItem/ @khmakoto
 packages/react/src/components/Announced/ @khmakoto
-packages/react/src/components/Breadcrumb/ @xugao
+packages/react/src/components/Breadcrumb/ @khmakoto
 packages/react/src/components/Button/ @khmakoto
 packages/react/src/components/Calendar/ @lorejoh12 @pompomon
 packages/react/src/components/CalendarDayGrid/ @lorejoh12
 packages/react/src/components/Callout/ @joschect
-packages/react/src/components/Check/ @ThomasMichon @xugao
-packages/react/src/components/Checkbox/ @khmakoto @xugao
+packages/react/src/components/Check/ @ThomasMichon @khmakoto
+packages/react/src/components/Checkbox/ @khmakoto
 packages/react/src/components/ChoiceGroup/ @ecraig12345
 packages/react/src/components/Coachmark/ @leddie24
 packages/react/src/components/ColorPicker/ @ecraig12345
@@ -148,23 +149,23 @@ packages/react/src/components/MessageBar/ @ecraig12345
 packages/react/src/components/Modal/ @joschect
 packages/react/src/components/Nav/ @ecraig12345
 packages/react/src/components/OverflowSet/ @micahgodbolt
-packages/react/src/components/Overlay/ @xugao
-packages/react/src/components/Panel/ @xugao
+packages/react/src/components/Overlay/ @khmakoto
+packages/react/src/components/Panel/ @khmakoto
 packages/react/src/components/Persona/ @markionium @mtennoe
 packages/react/src/components/PersonaCoin/ @mtennoe @markionium
 packages/react/src/components/Persona/PersonaConsts.tsx @mtennoe
 packages/react/src/components/pickers/  @joschect
 packages/react/src/components/Pivot/ @behowell
 packages/react/src/components/Popup/ @joschect
-packages/react/src/components/ProgressIndicator/ @xugao
+packages/react/src/components/ProgressIndicator/ @behowell
 packages/react/src/components/Rating/ @jdhuntington
 packages/react/src/components/ResizeGroup/ @micahgodbolt
 packages/react/src/components/SearchBox/ @ecraig12345
 packages/react/src/components/Separator/ @joschemd @khmakoto
 packages/react/src/components/Shimmer/ @Vitalius1
 packages/react/src/components/Slider/ @joschect
 packages/react/src/components/SpinButton/ @ecraig12345
-packages/react/src/components/Spinner/ @xugao
+packages/react/src/components/Spinner/ @behowell
 packages/react/src/components/Stack/  @khmakoto
 packages/react/src/components/SwatchColorPicker/ @ecraig12345
 packages/react/src/components/TeachingBubble/ @micahgodbolt
@@ -175,7 +176,7 @@ packages/react/src/components/Tooltip/ @micahgodbolt
 packages/react/src/components/WeeklyDayPicker/ @lorejoh12
 
 ## Theming and styling
-packages/react/src/utilities/ThemeProvider @xugao
+packages/react/src/utilities/ThemeProvider @dzearing
 
 ## Experiments
 packages/react-experiments/src/components/Pagination/ @caradong

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ packages/fluentui/docs/src/exampleMenus
 packages/fluentui/docs/src/exampleSources
 packages/fluentui/docs/dist/
 packages/fluentui/ability-attributes/src/schema.ts
+packages/fluentui/e2e/cypress/fixtures/example.json
 stats/
 
 # Windows image file caches
@@ -64,6 +65,7 @@ coverage
 dist
 dist-storybook
 screenshots
+.cache
 
 *.tar.gz
 

diff --git a/.prettierignore b/.prettierignore
@@ -1,14 +1,17 @@
 # generated or imported files
+.git
 package-deps.json
 CHANGELOG.*
 fabric-icons-*
 version.ts
 dndSim.js
+packages/monaco-editor/esm
 monaco-typescript.d.ts
 *.api.md
 api-report.md
 *.scss.ts
 _*.scss
+yarn.lock
 
 # folders of generated files
 lib
@@ -22,7 +25,31 @@ common/scripts
 coverage
 etc
 change
+__snapshots__
 
 # package specific files
 packages/web-components/**/*.spec.ts
 packages/web-components/src/default-palette.ts
+
+# no supported formatter/formatting not relevant
+CODEOWNERS
+LICENSE
+gitignore
+.browserslistrc
+.eslintcache
+.eslintignore
+.gitattributes
+.gitignore
+.npm*
+.prettierignore
+*.ejs
+*.ico
+*.jpg
+*.log
+*.png
+*.sh
+*.svg
+*.txt
+
+# template files which actually follow a different language's formatting
+*.hbs
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 [![Build Status](https://img.shields.io/azure-devops/build/uifabric/fabricpublic/84/master?style=flat-square)](https://dev.azure.com/uifabric/fabricpublic/_build/latest?definitionId=84&branchName=master) ![GitHub contributors](https://img.shields.io/github/contributors/microsoft/fluentui?style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/microsoft/fluentui?style=flat-square) [![Twitter Follow](https://img.shields.io/twitter/follow/fluentui?logo=twitter&style=flat-square)](https://twitter.com/FluentUI?ref_src=twsrc%5Etfw)
 
+> :tada: :tada: :tada: **Version 8 of `@fluentui/react` is now available on npm!** :tada: :tada: :tada:
+>
+> See the [release notes](https://github.com/microsoft/fluentui/wiki/Version-8-release-notes) for more info, and please file an issue if you have any problems.
+
 Fluent UI web represents a collection of utilities, React components, and web components for building web applications.
 
 This repo is home to 3 separate projects today. Mixing components between projects is not currently supported. The goal of these projects is to dedupe functionality and enable interoperability over time. For now, choose the project that best suits your needs.