Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/microsoft/fluentui
Browse files Browse the repository at this point in the history
  • Loading branch information
eljefe223 committed Jan 21, 2021
2 parents 600c579 + 2dc2216 commit 068690c
Show file tree
Hide file tree
Showing 813 changed files with 12,037 additions and 13,027 deletions.
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
scripts/ @dzearing @ecraig12345 @xugao
scripts/babel/ @layershifter @miroslavstastny
scripts/gulp/ @layershifter @miroslavstastny
scripts/webpack/ @layershifter @miroslavstastny
scripts/webpack/ @layershifter @miroslavstastny
scripts/webpack/webpack.config.* @layershifter @miroslavstastny
package.json @ecraig12345 @dzearing @xugao
prettier.config.js @ecraig12345
webpack.config.js @ecraig12345
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The following table will help you navigate the 3 projects and understand their d
| **Overview** | Mature, refreshing with new concepts from react-northstar. | Newer, has concepts we're iterating on. | Web Component implementation of Fluent UI. |
| **Used By** | Office| Teams | Edge |
| **Read Me** | [README.md](/packages/react/README.md) | [README.md](/packages/fluentui/README.md) | [README.md](/packages/web-components/README.md) |
| **Repo** | [./packages/react](/packages/react) [./packages/react](/packages/react) | [./packages/fluentui/react-northstar](/packages/fluentui/react-northstar) | [./packages/web-components](/packages/web-components) |
| **Repo** | [./packages/react](/packages/react) | [./packages/fluentui/react-northstar](/packages/fluentui/react-northstar) | [./packages/web-components](/packages/web-components) |
| **Quick Start** | [Quick Start](https://developer.microsoft.com/en-us/fluentui#/get-started/web) | [Quick Start](https://fluentsite.z22.web.core.windows.net/quick-start) | [See README.md](https://github.com/microsoft/fluentui/tree/master/packages/web-components/README.md) |
| **Docs** | [aka.ms/fluentui-react](https://aka.ms/fluentui-react) | [aka.ms/fluentui-react-northstar](https://aka.ms/fluentui-react-northstar) | [aka.ms/fluentui-web-components](https://aka.ms/fluentui-web-components) |
| **NPM** | `@fluentui/react` | `@fluentui/react-northstar` | `@fluentui/web-components` |
Expand Down
8 changes: 4 additions & 4 deletions apps/a11y-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"update-snapshots": "just-scripts jest -u"
},
"dependencies": {
"@fluentui/react": "^8.0.0-beta.32",
"@fluentui/react": "^8.0.0-beta.39",
"axe-core": "3.5.0",
"axe-puppeteer": "^1.0.0",
"axe-sarif-converter": "^2.0.1",
Expand All @@ -31,10 +31,10 @@
"@types/jest": "~24.9.0",
"@types/node": "^10.3.2",
"@types/puppeteer": "1.12.3",
"@types/react": "16.8.25",
"@types/react-dom": "16.8.4",
"@types/react": "16.9.42",
"@types/react-dom": "16.9.10",
"@types/sarif": "^2.1.1",
"@fluentui/font-icons-mdl2": "^8.0.0-beta.10",
"@fluentui/font-icons-mdl2": "^8.0.0-beta.12",
"@fluentui/scripts": "^1.0.0"
}
}
Loading

0 comments on commit 068690c

Please sign in to comment.