Skip to content

Commit

Permalink
Merge branch 'master' into feat/drawer-components
Browse files Browse the repository at this point in the history
* master:
  chore: enforce files naming to use .styles.ts [cxe-prg files] (microsoft#27707)
  chore: migrate to NodeJS v16 (microsoft#27711)
  remove react-avatar-context package (microsoft#27709)
  test: migrate all v9 libraries to use new conformance setup which improves test execution by approx 46% (microsoft#27669)
  chore: Add caret to react-datepicker-compat dependencies (microsoft#27671)
  test(fluentui/react): fix initial global leaks that were causing OOM issues (microsoft#27661)
  chore(react-utilities): simplifies useControllableState hook internals (microsoft#27702)
  chore: enforce files naming to use .styles.ts (microsoft#27698)
  feat: adds lazy loading example (microsoft#27587)
  feat: react-combobox space conditionally inserts character when freeform is true (microsoft#27025)
  chore(react-tree): updates useOpenItemsState internals (microsoft#27697)
  feat(tools): add conformance setup migration to migrate-converged-pkg generator (microsoft#27668)
  test: use `isolatedModules` for all ts-jest configs to lower memory footprint on CI (microsoft#27670)
  chore: bump @griffel/eslint-plugin & enable @griffel/hook-naming (microsoft#27687)
  feat(react-tree): makes useFlatTree generic (microsoft#27682)
  Enable export to codepen for charting library (microsoft#27539)
  Overflow: added useOverflowCount to exports (microsoft#27678)
  fix: Menu should not steal focus on re-render (microsoft#27688)
  feat(react-conformance): add new TS config api to be able to specify configName and configDir (microsoft#27664)
  • Loading branch information
marcosmoura committed Apr 27, 2023
2 parents 7ea5df2 + 5174214 commit cbca31c
Show file tree
Hide file tree
Showing 459 changed files with 1,568 additions and 1,184 deletions.
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"buildCommand": "build:codesandbox",
"packages": ["packages/react", "packages/react-components/react-components"],
"sandboxes": ["x5u3t", "spnyu"],
"node": "14"
"node": "16"
}
2 changes: 1 addition & 1 deletion .devops/templates/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: '14.18.1'
versionSpec: '16.18.1'
checkLatest: false
displayName: 'Install Node.js'

Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ apps/recipes-react-components @microsoft/cxe-red @microsoft/cxe-coastal @microso
#### Packages
packages/azure-themes @Jacqueline-ms @robtaft-ms
packages/bundle-size @microsoft/teams-prg
packages/react-conformance @microsoft/fluentui-react-build
packages/date-time-utilities @microsoft/cxe-red
packages/eslint-plugin @microsoft/fluentui-react-build
packages/foundation-legacy @microsoft/cxe-red @khmakoto
Expand Down Expand Up @@ -219,7 +220,6 @@ packages/react-components/babel-preset-global-context @microsoft/teams-prg
packages/react-components/react-table @microsoft/teams-prg
packages/react-components/react-progress @microsoft/cxe-red @tomi-msft
packages/react-components/react-persona @microsoft/cxe-red @sopranopillow
packages/react-components/react-avatar-context @microsoft/teams-prg
packages/react-components/react-infobutton @microsoft/cxe-red @sopranopillow
packages/react-components/react-tree @microsoft/teams-prg
packages/react-components/react-virtualizer @microsoft/xc-uxe @Mitch-At-Work
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
node-version: 16.18.1
cache: 'yarn'

- uses: tj-actions/changed-files@v34
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
node-version: 16.18.1

- uses: actions/github-script@v6
with:
Expand All @@ -70,7 +70,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
node-version: 16.18.1

- uses: actions/github-script@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docsite-publish-chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
node-version: 16.18.1
cache: 'yarn'

- name: Install packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docsite-publish-ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
node-version: 16.18.1
cache: 'yarn'

- name: Install packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const V9ControlledExample = () => {
);
};

const getFormattedExampleStyles = makeStyles({
const useGetFormattedExampleStyles = makeStyles({
wrapper: {
display: 'grid',
alignItems: 'center',
Expand All @@ -43,7 +43,7 @@ const getFormattedExampleStyles = makeStyles({
});

export const V9FormattedValueExample = () => {
const styles = getFormattedExampleStyles();
const styles = useGetFormattedExampleStyles();
const [sliderValue, setSliderValue] = React.useState(0);
const sliderOnChange: SliderProps['onChange'] = (ev, data) => setSliderValue(data.value);
const formattedId = useId();
Expand Down
2 changes: 1 addition & 1 deletion apps/react-18-tests-v8/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (config.globals) {
// override ts-jest config, otherwise it gets merged
config.globals['ts-jest'] = {
tsconfig: '<rootDir>/tsconfig.spec.json',
diagnostics: { warnOnly: true /* , exclude: ['packages/**'] */ },
isolatedModules: true,
};
}

Expand Down
2 changes: 1 addition & 1 deletion apps/react-18-tests-v9/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
diagnostics: { warnOnly: true, exclude: ['packages/**'] },
isolatedModules: true,
},
},
transform: {
Expand Down
2 changes: 1 addition & 1 deletion apps/ssr-tests-v9/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
diagnostics: false,
isolatedModules: true,
},
},
transform: {
Expand Down
2 changes: 1 addition & 1 deletion apps/stress-test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
diagnostics: false,
isolatedModules: true,
},
},
transform: {
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests-react-components/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.json',
diagnostics: false,
isolatedModules: true,
},
},
transform: {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "feat: enable @griffel/hook-naming rule",
"packageName": "@fluentui/eslint-plugin",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: update internal types to reflect node 16 types",
"packageName": "@fluentui/global-context",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-alert",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-card",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "feat: allow space character insertion while typing in freeform combobox",
"packageName": "@fluentui/react-combobox",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "feat: added useOverflowCount to react-components exports",
"packageName": "@fluentui/react-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "feat: add new TS config api to be able to specify configName and configDir",
"packageName": "@fluentui/react-conformance",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-data-grid-react-window",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-dialog",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Enable export to codepen for react charting",
"packageName": "@fluentui/react-docsite-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-image",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Menu should not steal focus on re-render",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add react charting to support export to codepen",
"packageName": "@fluentui/react-monaco-editor",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-overflow",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-popover",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-portal",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-provider",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-table",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-text",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-toolbar",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "feat: makes useFlatTree generic",
"packageName": "@fluentui/react-tree",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore: updates useOpenItemsState internals",
"packageName": "@fluentui/react-tree",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore: move makeStyles() calls to .styles.ts files",
"packageName": "@fluentui/react-tree",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "feat: adds lazy loading story",
"packageName": "@fluentui/react-tree",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: simplifies useControllableState hook internals",
"packageName": "@fluentui/react-utilities",
"email": "[email protected]",
"dependentChangeType": "patch"
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/microsoft/fluentui"
},
"engines": {
"node": "^14.18.1 || ^16.0.0"
"node": "^16.18.1 || ^18.0.0"
},
"scripts": {
"build": "lage build --verbose",
Expand Down Expand Up @@ -89,7 +89,7 @@
"@cypress/webpack-dev-server": "1.8.3",
"@fluentui/react-icons": "^2.0.196",
"@griffel/babel-preset": "1.4.8",
"@griffel/eslint-plugin": "1.0.0",
"@griffel/eslint-plugin": "^1.2.0",
"@griffel/jest-serializer": "1.1.4",
"@griffel/react": "^1.5.2",
"@griffel/webpack-extraction-plugin": "0.3.3",
Expand Down Expand Up @@ -165,7 +165,7 @@
"@types/lodash": "4.14.182",
"@types/markdown-table": "2.0.0",
"@types/micromatch": "4.0.2",
"@types/node": "14.18.32",
"@types/node": "16.18.1",
"@types/node-fetch": "2.5.7",
"@types/prettier": "2.7.2",
"@types/progress": "2.0.5",
Expand Down
1 change: 1 addition & 0 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"test": "yarn jest --passWithNoTests"
},
"dependencies": {
"@griffel/eslint-plugin": "^1.2.0",
"@rnx-kit/eslint-plugin": "^0.2.5",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/experimental-utils": "^4.22.0",
Expand Down
1 change: 1 addition & 0 deletions packages/eslint-plugin/src/configs/react-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
* griffel eslint rules
* @see https://github.com/microsoft/griffel/tree/main/packages/eslint-plugin
*/
'@griffel/hook-naming': 'error',
'@griffel/no-shorthands': 'error',
/**
* react eslint rules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
diagnostics: false,
isolatedModules: true,
},
},
transform: {
Expand Down
Loading

0 comments on commit cbca31c

Please sign in to comment.