-
Notifications
You must be signed in to change notification settings - Fork 156
fix(migrations): also handle cases for licensed package name #16547
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
Merged
Merged
Changes from all commits
Commits
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
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 | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -718,7 +718,7 @@ function migrateImportDeclaration(node: ts.ImportDeclaration, sourceFile: ts.Sou | |||||||
| const importPath = moduleSpecifier.text; | ||||||||
|
|
||||||||
| // Only process igniteui-angular imports (not already using entry points) | ||||||||
| if (importPath !== 'igniteui-angular') { | ||||||||
| if (importPath !== 'igniteui-angular' && importPath !== '@infragistics/igniteui-angular') { | ||||||||
| return null; | ||||||||
| } | ||||||||
|
|
||||||||
|
|
@@ -768,7 +768,7 @@ function migrateImportDeclaration(node: ts.ImportDeclaration, sourceFile: ts.Sou | |||||||
| const newImports: string[] = []; | ||||||||
| for (const [entryPoint, imports] of entryPointGroups) { | ||||||||
| const sortedImports = imports.sort(); | ||||||||
| newImports.push(`import { ${sortedImports.join(', ')} } from 'igniteui-angular/${entryPoint}';`); | ||||||||
| newImports.push(`import { ${sortedImports.join(', ')} } from '${importPath}/${entryPoint}';`); | ||||||||
| } | ||||||||
|
|
||||||||
| return { | ||||||||
|
|
@@ -799,7 +799,7 @@ function migrateFile(filePath: string, content: string): string { | |||||||
|
|
||||||||
| // Track old type names that were imported | ||||||||
| const moduleSpecifier = node.moduleSpecifier; | ||||||||
| if (ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text === 'igniteui-angular') { | ||||||||
| if (ts.isStringLiteral(moduleSpecifier) && (moduleSpecifier.text === 'igniteui-angular' || moduleSpecifier.text === '@infragistics/igniteui-angular')) { | ||||||||
| const importClause = node.importClause; | ||||||||
| if (importClause?.namedBindings && ts.isNamedImports(importClause.namedBindings)) { | ||||||||
| for (const element of importClause.namedBindings.elements) { | ||||||||
|
|
@@ -877,7 +877,8 @@ export default function migrate(): Rule { | |||||||
| const originalContent = content.toString(); | ||||||||
|
|
||||||||
| // Check if file has igniteui-angular imports | ||||||||
| if (!originalContent.includes("from 'igniteui-angular'") && !originalContent.includes('from "igniteui-angular"')) { | ||||||||
| if (!originalContent.includes("from 'igniteui-angular'") && !originalContent.includes('from "igniteui-angular"') && | ||||||||
| !originalContent.includes("from '@infragistics/igniteui-angular'") && !originalContent.includes('from "@infragistics/igniteui-angular"')) { | ||||||||
|
Comment on lines
+880
to
+881
|
||||||||
| if (!originalContent.includes("from 'igniteui-angular'") && !originalContent.includes('from "igniteui-angular"') && | |
| !originalContent.includes("from '@infragistics/igniteui-angular'") && !originalContent.includes('from "@infragistics/igniteui-angular"')) { | |
| if (!/from\s+['"](@infragistics\/)?igniteui-angular['"]/.test(originalContent)) { |
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.
The package name check is duplicated across multiple locations (lines 721, 802, and 880-881). Consider extracting this into a helper function like
isIgniteUIPackage(packageName: string): booleanto improve maintainability and reduce duplication.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.
@copilot Yes, that'd be an improvement and even better there's already an
namedImportFilterin projects\igniteui-angular\migrations\common\tsUtils.ts that does a similar check for other migrations that should've been used to begin with.Since this one is merged, create a new PR against master to update this migration to use the tsUtil and while at it adjust the
namedImportFilterfunction to also handle subpaths because the currentendWithcheck handles@infragistics/igniteui-angularas well, but limits the subpaths for entry points after the main package name.