[pull] master from microsoft:master

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"
+}

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"
     }
   ]
 }

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",

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",

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",

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={
                 <Button size="small" appearance="transparent" icon={<DeleteRegular />} aria-label={`Remove ${name}`} />
               }
             >

packages/react-components/react-menu-grid-preview/stories/src/MenuGrid/MenuGridWithSubmenu.stories.tsx

@@ -44,7 +44,7 @@ export const WithSubmenu = (): JSXElement => {
       <MenuPopover>
         <MenuGrid>
           {items.map(name => (
-            <MenuGridItem key={name} secondSubAction={<Submenu />} aria-label={name}>
+            <MenuGridItem key={name} firstSubAction={<Submenu />} aria-label={name}>
               {name}
             </MenuGridItem>
           ))}

scripts/babel/src/index.js

@@ -42,7 +42,7 @@ module.exports = (/** @type {ConfigAPI} */ api) => {
   const plugins = [
     ['@babel/plugin-proposal-class-properties', { loose: true }],
     ['@babel/plugin-proposal-nullish-coalescing-operator', { loose: true }],
-    ['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
+    ['@babel/plugin-transform-object-rest-spread', { loose: true, useBuiltIns: true }],
     ['@babel/plugin-proposal-optional-chaining', { loose: true }],
     '@babel/plugin-syntax-dynamic-import',
     ['@babel/plugin-transform-runtime', { useESModules }],

scripts/executors/src/generate-ui.ts

@@ -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';
@@ -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);
+  const nxJson = readNxJson(tree);
   if (!nxJson) {
     throw new Error('nx.json not found');
   }

tools/workspace-plugin/src/generators/eslint-rule/generator.spec.ts

@@ -68,6 +68,7 @@ describe('eslint-rule generator', () => {
 
     expect(tree.read(paths.spec, 'utf-8')).toMatchInlineSnapshot(`
       "import { RuleTester } from '@typescript-eslint/rule-tester';
+      import type { RuleTesterConfig } from '@typescript-eslint/rule-tester';
       import { rule, RULE_NAME } from './uppercase';
       const ruleTester = new RuleTester();
       ruleTester.run(RULE_NAME, rule, {

tools/workspace-plugin/src/utils.ts

@@ -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);