diff --git a/change/@fluentui-eslint-plugin-react-components-70289c01-26cb-421c-a9bb-dd9f26872f90.json b/change/@fluentui-eslint-plugin-react-components-70289c01-26cb-421c-a9bb-dd9f26872f90.json new file mode 100644 index 0000000000000..aafdc7b32e6e6 --- /dev/null +++ b/change/@fluentui-eslint-plugin-react-components-70289c01-26cb-421c-a9bb-dd9f26872f90.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: bump typescript-eslint", + "packageName": "@fluentui/eslint-plugin-react-components", + "email": "vgenaev@gmail.com", + "dependentChangeType": "patch" +} diff --git a/migrations.json b/migrations.json index 21851490b2f5c..b09fc8ea9398b 100644 --- a/migrations.json +++ b/migrations.json @@ -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" } ] } diff --git a/nx.json b/nx.json index ea61e28c42db3..cf2f5ed5a3a14 100644 --- a/nx.json +++ b/nx.json @@ -138,6 +138,9 @@ "parallel": 3, "useInferencePlugins": false, "defaultBase": "master", + "tui": { + "enabled": false + }, "plugins": [ { "plugin": "./tools/workspace-plugin/src/plugins/workspace-plugin.ts", diff --git a/package.json b/package.json index 75f7b0991864d..a2dda470bd869 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "@babel/parser": "7.28.5", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.28.0", + "@babel/plugin-transform-object-rest-spread": "7.28.4", "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", "@babel/plugin-proposal-optional-chaining": "7.21.0", - "@babel/plugin-proposal-object-rest-spread": "7.20.7", "@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/plugin-syntax-object-rest-spread": "7.8.3", "@babel/plugin-transform-runtime": "7.28.5", @@ -74,14 +74,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.10", + "@nx/eslint": "21.6.10", + "@nx/eslint-plugin": "21.6.10", + "@nx/jest": "21.6.10", + "@nx/js": "21.6.10", + "@nx/node": "21.6.10", + "@nx/plugin": "21.6.10", + "@nx/workspace": "21.6.10", "@octokit/rest": "18.12.0", "@oddbird/css-anchor-positioning": "0.4.0", "@phenomnomnominal/tsquery": "6.1.3", @@ -259,7 +259,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.10", "p-queue": "6.6.2", "parse-diff": "0.7.1", "patch-package": "8.0.0", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index c559724707f7f..a89927ccb6ec5 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -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.46.2", "@typescript-eslint/utils": "^8.46.2", + "@nx/eslint-plugin": "21.6.10", "eslint-config-airbnb": "^18.2.1", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react-compiler": "0.0.0-experimental-a97cca1-20240529", diff --git a/packages/react-components/react-menu-grid-preview/stories/src/MenuGrid/MenuGridDefault.stories.tsx b/packages/react-components/react-menu-grid-preview/stories/src/MenuGrid/MenuGridDefault.stories.tsx index 518f6be6cb6c7..23c070e9b9152 100644 --- a/packages/react-components/react-menu-grid-preview/stories/src/MenuGrid/MenuGridDefault.stories.tsx +++ b/packages/react-components/react-menu-grid-preview/stories/src/MenuGrid/MenuGridDefault.stories.tsx @@ -26,7 +26,7 @@ export const Default = (): JSXElement => { aria-label={`Profile card for ${name}`} /> } - secondSubAction={ + firstSubAction={