-
Notifications
You must be signed in to change notification settings - Fork 2.8k
chore: migrate nx to 21.6.3 #35278
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mainframev
wants to merge
3
commits into
microsoft:master
Choose a base branch
from
mainframev:chore/migrate-to-nx-21
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
chore: migrate nx to 21.6.3 #35278
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
change/@fluentui-eslint-plugin-react-components-70289c01-26cb-421c-a9bb-dd9f26872f90.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"type": "patch", | ||
"comment": "chore: bump typescript-eslint", | ||
"packageName": "@fluentui/eslint-plugin-react-components", | ||
"email": "[email protected]", | ||
"dependentChangeType": "patch" | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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'); | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
vr-tests-react-components/Positioning 2 screenshots
vr-tests-react-components/TagPicker 2 screenshots
vr-tests-web-components/Avatar 1 screenshots
vr-tests-web-components/Badge 1 screenshots
vr-tests-web-components/MenuList 3 screenshots
vr-tests-web-components/RadioGroup 1 screenshots
vr-tests-web-components/Switch 1 screenshots
vr-tests/Callout 4 screenshots
vr-tests/Coachmark 1 screenshots
vr-tests/Keytip 2 screenshots
vr-tests/Pivot - Overflow 1 screenshots
vr-tests/react-charting-GaugeChart 1 screenshots
vr-tests/react-charting-LineChart 1 screenshots
vr-tests/react-charting-VerticalBarChart 1 screenshots
There were 2 duplicate changes discarded. Check the build logs for more information.