Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕵🏾‍♀️ visual changes to review in the Visual Change Report

vr-tests-react-components/Charts-DonutChart 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Charts-DonutChart.Dynamic - Dark Mode.default.chromium.png 12635 Changed
vr-tests-react-components/Positioning 2 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Positioning.Positioning end.chromium.png 942 Changed
vr-tests-react-components/Positioning.Positioning end.updated 2 times.chromium.png 608 Changed
vr-tests-react-components/TagPicker 2 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/TagPicker.disabled - Dark Mode.disabled input hover.chromium.png 659 Changed
vr-tests-react-components/TagPicker.disabled.disabled input hover.chromium.png 678 Changed
vr-tests-web-components/Avatar 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-web-components/Avatar. - Dark Mode.normal.chromium.png 10381 Changed
vr-tests-web-components/Badge 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-web-components/Badge. - Dark Mode.normal.chromium.png 444 Changed
vr-tests-web-components/MenuList 3 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-web-components/MenuList. - Dark Mode.normal.chromium.png 500 Changed
vr-tests-web-components/MenuList. - RTL.2nd selected.chromium.png 17 Changed
vr-tests-web-components/MenuList. - RTL.normal.chromium_1.png 39082 Changed
vr-tests-web-components/RadioGroup 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-web-components/RadioGroup. - Dark Mode.normal.chromium_1.png 59 Changed
vr-tests-web-components/Switch 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-web-components/Switch. - Dark Mode.normal.chromium_1.png 92 Changed
vr-tests/Callout 4 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/Callout.Bottom right edge.default.chromium.png 1120 Changed
vr-tests/Callout.Bottom right edge - RTL.default.chromium.png 1114 Changed
vr-tests/Callout.No callout width specified.default.chromium.png 2126 Changed
vr-tests/Callout.Left bottom edge.default.chromium.png 3123 Changed
vr-tests/Coachmark 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/Coachmark.Collapsed.default.chromium.png 159 Changed
vr-tests/Keytip 2 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/Keytip.Offset.default.chromium.png 86 Changed
vr-tests/Keytip.Root.default.chromium.png 55 Changed
vr-tests/Pivot - Overflow 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/Pivot - Overflow.Tabs - RTL.chromium.png 4524 Changed
vr-tests/react-charting-GaugeChart 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/react-charting-GaugeChart.Basic.default.chromium.png 2 Changed
vr-tests/react-charting-LineChart 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/react-charting-LineChart.Events.default.chromium.png 1 Changed
vr-tests/react-charting-VerticalBarChart 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests/react-charting-VerticalBarChart.Basic - Secondary Y Axis.default.chromium.png 3 Changed

There were 2 duplicate changes discarded. Check the build logs for more information.

"type": "patch",
"comment": "chore: bump typescript-eslint",
"packageName": "@fluentui/eslint-plugin-react-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
73 changes: 50 additions & 23 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,68 @@
{
"migrations": [
{
"version": "20.0.0-beta.7",
"description": "Migration for v20.0.0-beta.7",
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-legacy-cache",
"package": "nx",
"name": "move-use-daemon-process"
"name": "remove-legacy-cache"
},
{
"version": "20.0.1",
"description": "Set `useLegacyCache` to true for migrating workspaces",
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
"x-repair-skip": true,
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner",
"package": "nx",
"name": "use-legacy-cache"
"name": "remove-custom-tasks-runner"
},
{
"version": "20.2.0-beta.5",
"description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
"implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
"package": "@nx/eslint",
"name": "update-typescript-eslint-v8.13.0"
"version": "21.0.0-beta.11",
"description": "Updates release version config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-version-config-changes",
"package": "nx",
"name": "release-version-config-changes"
},
{
"version": "20.3.0-beta.1",
"description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
"implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides",
"package": "@nx/eslint",
"name": "add-file-extensions-to-overrides"
"version": "21.0.0-beta.11",
"description": "Updates release changelog config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes",
"package": "nx",
"name": "release-changelog-config-changes"
},
{
"version": "21.1.0-beta.2",
"description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present",
"implementation": "./src/migrations/update-21-1-0/add-gitignore-entry",
"package": "nx",
"name": "21-1-0-add-ignore-entries-for-nx-rule-files"
},
{
"cli": "nx",
"version": "20.0.0-beta.5",
"description": "replace getJestProjects with getJestProjectsAsync",
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"version": "21.0.0-beta.9",
"description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.",
"implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync"
"name": "replace-getJestProjects-with-getJestProjectsAsync-v21"
},
{
"version": "21.0.0-beta.10",
"description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.",
"implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor",
"package": "@nx/jest",
"name": "remove-tsconfig-option-from-jest-executor"
},
{
"version": "21.3.0-beta.3",
"description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.",
"implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern",
"package": "@nx/jest",
"name": "rename-test-path-pattern"
},
{
"version": "21.5.0-beta.2",
"description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.",
"factory": "./src/migrations/update-21-5-0/migrate-development-custom-condition",
"package": "@nx/js",
"name": "migrate-development-custom-condition"
}
]
}
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
"parallel": 3,
"useInferencePlugins": false,
"defaultBase": "master",
"tui": {
"enabled": false
},
"plugins": [
{
"plugin": "./tools/workspace-plugin/src/plugins/workspace-plugin.ts",
Expand Down
26 changes: 13 additions & 13 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": "^20.0.0 || ^22.0.0"
"node": "^20.19.0 || ^22.0.0"
},
"scripts": {
"dedupe": "npx yarn-deduplicate@latest --strategy fewer",
Expand Down Expand Up @@ -73,14 +73,14 @@
"@microsoft/load-themed-styles": "1.10.26",
"@microsoft/loader-load-themed-styles": "2.0.17",
"@microsoft/tsdoc": "0.15.1",
"@nx/devkit": "20.8.1",
"@nx/eslint": "20.8.1",
"@nx/eslint-plugin": "20.8.1",
"@nx/jest": "20.8.1",
"@nx/js": "20.8.1",
"@nx/node": "20.8.1",
"@nx/plugin": "20.8.1",
"@nx/workspace": "20.8.1",
"@nx/devkit": "21.6.3",
"@nx/eslint": "21.6.3",
"@nx/eslint-plugin": "21.6.3",
"@nx/jest": "21.6.3",
"@nx/js": "21.6.3",
"@nx/node": "21.6.3",
"@nx/plugin": "21.6.3",
"@nx/workspace": "21.6.3",
"@octokit/rest": "18.12.0",
"@oddbird/css-anchor-positioning": "0.4.0",
"@phenomnomnominal/tsquery": "6.1.3",
Expand Down Expand Up @@ -163,7 +163,7 @@
"@types/webpack-hot-middleware": "2.25.9",
"@types/yargs": "13.0.11",
"@types/yargs-unparser": "2.0.1",
"@typescript-eslint/rule-tester": "8.38.0",
"@typescript-eslint/rule-tester": "8.45.0",
"autoprefixer": "10.2.1",
"babel-jest": "29.7.0",
"babel-loader": "9.1.3",
Expand Down Expand Up @@ -256,7 +256,7 @@
"monosize-bundler-webpack": "0.1.6",
"monosize-storage-azure": "0.0.16",
"node-plop": "0.25.0",
"nx": "20.8.1",
"nx": "21.6.3",
"p-queue": "6.6.2",
"parse-diff": "0.7.1",
"patch-package": "8.0.0",
Expand Down Expand Up @@ -308,7 +308,7 @@
"terser-webpack-plugin": "5.3.10",
"through2": "4.0.2",
"tmp": "0.2.1",
"ts-jest": "29.2.5",
"ts-jest": "29.4.4",
"ts-loader": "9.4.2",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
Expand All @@ -317,7 +317,7 @@
"turndown": "7.2.0",
"turndown-plugin-gfm": "1.0.2",
"typescript": "5.5.2",
"typescript-eslint": "8.38.0",
"typescript-eslint": "8.45.0",
"vite": "6.3.4",
"webpack": "5.99.8",
"webpack-bundle-analyzer": "4.10.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"@eslint/compat": "1.3.0",
"@griffel/eslint-plugin": "^2.0.0",
"@rnx-kit/eslint-plugin": "^0.8.4",
"@nx/eslint-plugin": "20.8.1",
"@typescript-eslint/type-utils": "^8.38.0",
"@typescript-eslint/utils": "^8.38.0",
"@nx/eslint-plugin": "21.6.3",
"@typescript-eslint/type-utils": "^8.45.0",
"@typescript-eslint/utils": "^8.45.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-react-compiler": "0.0.0-experimental-a97cca1-20240529",
Expand All @@ -32,7 +32,7 @@
"globals": "13.24.0",
"jju": "^1.4.0",
"minimatch": "^3.1.2",
"typescript-eslint": "^8.38.0"
"typescript-eslint": "^8.45.0"
},
"peerDependencies": {
"eslint": "^9.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"eslint-plugin-eslint-plugin": "6.4.0"
},
"dependencies": {
"@typescript-eslint/utils": "^8.38.0",
"@typescript-eslint/utils": "^8.45.0",
"@swc/helpers": "^0.5.1"
},
"peerDependencies": {
"typescript-eslint": "^8.38.0",
"typescript-eslint": "^8.45.0",
"eslint": "^8.0.0",
"typescript": "^5.0.0"
},
Expand Down
101 changes: 0 additions & 101 deletions patches/@typescript-eslint+eslint-plugin+8.38.0.patch

This file was deleted.

46 changes: 46 additions & 0 deletions patches/@typescript-eslint+eslint-plugin+8.45.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-deprecated.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-deprecated.js
index fd8e2db..9d1523a 100644
--- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-deprecated.js
+++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-deprecated.js
@@ -90,19 +90,26 @@ exports.default = (0, util_1.createRule)({
? getJsDocDeprecation(symbol)
: undefined;
}
+ const seen = new Set();
const targetSymbol = checker.getAliasedSymbol(symbol);
- while (tsutils.isSymbolFlagSet(symbol, ts.SymbolFlags.Alias)) {
- const reason = getJsDocDeprecation(symbol);
+ let current = symbol;
+ while (tsutils.isSymbolFlagSet(current, ts.SymbolFlags.Alias)) {
+ if (seen.has(current)) {
+ break;
+ }
+ seen.add(current);
+ const reason = getJsDocDeprecation(current);
if (reason != null) {
return reason;
}
- const immediateAliasedSymbol = symbol.getDeclarations() && checker.getImmediateAliasedSymbol(symbol);
- if (!immediateAliasedSymbol) {
+ const nextAlias = current.getDeclarations() &&
+ checker.getImmediateAliasedSymbol(current);
+ if (!nextAlias) {
break;
}
- symbol = immediateAliasedSymbol;
- if (checkDeprecationsOfAliasedSymbol && symbol === targetSymbol) {
- return getJsDocDeprecation(symbol);
+ current = nextAlias;
+ if (checkDeprecationsOfAliasedSymbol && current === targetSymbol) {
+ return getJsDocDeprecation(current);
}
}
return undefined;
@@ -168,6 +175,7 @@ exports.default = (0, util_1.createRule)({
case utils_1.AST_NODE_TYPES.FunctionDeclaration:
case utils_1.AST_NODE_TYPES.FunctionExpression:
case utils_1.AST_NODE_TYPES.Program:
+ case utils_1.AST_NODE_TYPES.ExportSpecifier:
case utils_1.AST_NODE_TYPES.TSUnionType:
case utils_1.AST_NODE_TYPES.VariableDeclarator:
return false;
7 changes: 4 additions & 3 deletions scripts/executors/src/generate-ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import {
ProjectsConfigurations,
createProjectGraphAsync,
output,
readNxJson,
readProjectsConfigurationFromProjectGraph,
readNxJson,
serializeJson,
workspaceRoot,
} from '@nx/devkit';
import { FsTree } from 'nx/src/generators/tree';
import { AutoComplete, AutoCompleteOptions, type Choice, Confirm, Input, NumberPrompt, Select } from 'enquirer';
import { getGeneratorInformation } from 'nx/src/command-line/generate/generator-utils';
import { getInstalledPluginsAndCapabilities, getLocalWorkspacePlugins } from 'nx/src/utils/plugins';
Expand All @@ -29,8 +30,8 @@ main()
async function main() {
const graph = await createProjectGraphAsync();
const projects = readProjectsConfigurationFromProjectGraph(graph);
// eslint-disable-next-line @typescript-eslint/no-deprecated
const nxJson = readNxJson();
const tree = new FsTree(workspaceRoot, false);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const nxJson = readNxJson(tree);
if (!nxJson) {
throw new Error('nx.json not found');
}
Expand Down
2 changes: 1 addition & 1 deletion tools/workspace-plugin/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function parseArgs<T extends Record<string, any>>(args: string[]) {
return parsedArguments;
}

export { updateJestConfig } from '@nx/jest/src/generators/configuration/lib/update-jestconfig';
export { updateJestConfig } from '@nx/workspace/src/generators/move/lib/update-jest-config';

export function getProjectConfig(tree: Tree, options: { packageName: string }) {
const projectConfig = readProjectConfiguration(tree, options.packageName);
Expand Down
Loading
Loading