Skip to content

Commit

Permalink
Merge branch 'master' into marcosmoura/feat/selectable-cards
Browse files Browse the repository at this point in the history
* master:
  feat(scripts): improve API violation reporting (microsoft#25356)
  applying package updates
  fix: Preventing blanket selectors from Fabric component from being applied via new preventBlanketFontInheritance prop (microsoft#25453)
  feat(react-infobutton): Add initial implementation (microsoft#25247)
  chore(react-avatar, avatar-context): migrate to new package structure (microsoft#25473)
  chore(react-portal, portal-compat, portal-compat-context): migrate to new package structure (microsoft#25481)
  docs(react-infobutton): Adding component's spec (microsoft#25251)
  fix(screener-build workflow): scope package to build for v9 VR tests to speed up perf (microsoft#25494)
  chore(vr-tests-v9): Convert Button VR tests to CSF (microsoft#25108)
  • Loading branch information
marcosmoura committed Nov 3, 2022
2 parents 1f83d63 + 6ce378e commit a044a37
Show file tree
Hide file tree
Showing 148 changed files with 1,840 additions and 835 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/screener-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ jobs:
printenv | sort ;\
echo "SHELLOPTS $SHELLOPTS" ;\
- name: build @fluentui/react-storybook-addon
run: yarn build --to @fluentui/react-storybook-addon
if: ${{env.SKIP_SCREENER_BUILD == 'false'}}

- name: build vr-tests-react-components storybook
run: yarn workspace @fluentui/vr-tests-react-components screener:build
if: ${{env.SKIP_SCREENER_BUILD == 'false'}}
Expand Down
2 changes: 1 addition & 1 deletion apps/perf-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"dependencies": {
"@fluentui/example-data": "^8.4.2",
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/scripts": "^1.0.0",
"@microsoft/load-themed-styles": "^1.10.26",
"flamegrill": "0.2.0",
Expand Down
10 changes: 5 additions & 5 deletions apps/public-docsite-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/react-examples": "^8.34.4",
"@microsoft/load-themed-styles": "^1.10.26",
"@fluentui/azure-themes": "^8.5.20",
"@fluentui/react-docsite-components": "^8.10.20",
"@fluentui/azure-themes": "^8.5.21",
"@fluentui/react-docsite-components": "^8.10.21",
"@fluentui/font-icons-mdl2": "^8.5.2",
"@fluentui/set-version": "^8.2.2",
"@fluentui/theme-samples": "^8.7.20",
"@fluentui/react-monaco-editor": "^1.7.20",
"@fluentui/theme-samples": "^8.7.21",
"@fluentui/react-monaco-editor": "^1.7.21",
"office-ui-fabric-core": "^11.0.0",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite-v9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/react-northstar": "^0.64.0",
"@fluentui/react-icons-northstar": "^0.64.0",
"@fluentui/scripts": "^1.0.0",
Expand Down
10 changes: 5 additions & 5 deletions apps/public-docsite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
"devDependencies": {
"@fluentui/common-styles": "^1.2.11",
"@fluentui/eslint-plugin": "*",
"@fluentui/react-monaco-editor": "^1.7.20",
"@fluentui/react-monaco-editor": "^1.7.21",
"@fluentui/scripts": "^1.0.0",
"write-file-webpack-plugin": "^4.1.0"
},
"dependencies": {
"@fluentui/font-icons-mdl2": "^8.5.2",
"@fluentui/public-docsite-resources": "^8.1.41",
"@fluentui/public-docsite-setup": "^0.3.12",
"@fluentui/react": "^8.99.2",
"@fluentui/react-docsite-components": "^8.10.20",
"@fluentui/react": "^8.99.3",
"@fluentui/react-docsite-components": "^8.10.21",
"@fluentui/react-examples": "^8.34.4",
"@fluentui/react-experiments": "^8.14.15",
"@fluentui/react-experiments": "^8.14.16",
"@fluentui/react-file-type-icons": "^8.8.0",
"@fluentui/react-icons-mdl2": "^1.3.25",
"@fluentui/react-icons-mdl2-branded": "^1.2.26",
"@fluentui/set-version": "^8.2.2",
"@fluentui/theme": "^2.6.17",
"@fluentui/theme-samples": "^8.7.20",
"@fluentui/theme-samples": "^8.7.21",
"@fluentui/utilities": "^8.13.2",
"@microsoft/load-themed-styles": "^1.10.26",
"office-ui-fabric-core": "^11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/react-18-tests-v8/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"swc-loader": "^0.2.3"
},
"dependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/react-hooks": "^8.6.12",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/ssr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"license": "MIT",
"devDependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@microsoft/load-themed-styles": "^1.10.26",
"@types/mocha": "^7.0.2",
"@fluentui/scripts": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/stress-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type-check": "tsc -b tsconfig.type.json"
},
"dependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/react-components": "^9.6.3",
"@fluentui/react-icons": "^2.0.175",
"@fluentui/web-components": "^2.5.8",
Expand Down
4 changes: 2 additions & 2 deletions apps/theming-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.99.2",
"@fluentui/react": "^8.99.3",
"@fluentui/merge-styles": "^8.5.3",
"@fluentui/react-docsite-components": "^8.10.20",
"@fluentui/react-docsite-components": "^8.10.21",
"@fluentui/foundation-legacy": "^8.2.22",
"@fluentui/scheme-utilities": "^8.3.18",
"@fluentui/set-version": "^8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/ts-minbar-test-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Testing Fluent UI React compatibility with Typescript 3.9",
"license": "MIT",
"dependencies": {
"@fluentui/react": "^8.99.2"
"@fluentui/react": "^8.99.3"
},
"scripts": {
"build": "just-scripts build",
Expand Down
2 changes: 2 additions & 0 deletions apps/vr-tests-react-components/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ const path = require('path');
const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin');

module.exports = /** @type {import('../../../.storybook/main').StorybookBaseConfig} */ ({
addons: ['@fluentui/react-storybook-addon'],

stories: ['../src/**/*.stories.tsx'],
core: {
builder: 'webpack5',
Expand Down
3 changes: 2 additions & 1 deletion apps/vr-tests-react-components/.storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ setAddon({
},
});

export const parameters = { layout: 'none' };
/** @type {import("@fluentui/react-storybook-addon").FluentParameters} */
export const parameters = { layout: 'none', mode: 'vr-test' };

// For static storybook per https://github.com/screener-io/screener-storybook#testing-with-static-storybook-app
if (typeof window === 'object') {
Expand Down
18 changes: 18 additions & 0 deletions apps/vr-tests-react-components/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// @ts-check

/**
* @type {import('@jest/types').Config.InitialOptions}
*/
module.exports = {
displayName: 'vr-tests-react-components',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.json',
diagnostics: false,
},
},
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
};
3 changes: 3 additions & 0 deletions apps/vr-tests-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
"screener": "just-scripts screener",
"screener:build": "yarn build",
"start": "start-storybook",
"test": "just-scripts test",
"type-check": "tsc"
},
"devDependencies": {
"@fluentui/eslint-plugin": "*",
"@fluentui/scripts": "^1.0.0",
"storywright": "0.0.23-beta.6"
},
"dependencies": {
Expand Down Expand Up @@ -46,6 +48,7 @@
"@fluentui/react-slider": "^9.0.9",
"@fluentui/react-spinner": "^9.0.9",
"@fluentui/react-spinbutton": "^9.0.7",
"@fluentui/react-storybook-addon": "^9.0.0-rc.1",
"@fluentui/react-switch": "^9.0.10",
"@fluentui/react-tabs": "^9.0.10",
"@fluentui/react-table": "9.0.0-alpha.10",
Expand Down
Loading

0 comments on commit a044a37

Please sign in to comment.