Skip to content

importFixes: When one file redirects to another, consider both for global import specifiers #25834

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
7 commits merged into from
Aug 1, 2018

Conversation

ghost
Copy link

@ghost ghost commented Jul 20, 2018

@ghost ghost requested a review from sheetalkamat July 20, 2018 21:57
@mhegazy mhegazy requested a review from weswigham July 21, 2018 00:02
@mhegazy
Copy link
Contributor

mhegazy commented Jul 21, 2018

@weswigham can you also take a look. seems related to the .d.ts issue

@weswigham
Copy link
Member

@mhegazy Well, #25850 definitely conflicts with this. 😄

@ghost ghost force-pushed the duplicatePackageImportFixes branch from b3d901f to 06f0ba5 Compare July 25, 2018 17:02
@ghost ghost force-pushed the duplicatePackageImportFixes branch from 06f0ba5 to 2d955a3 Compare July 25, 2018 18:39
@ghost ghost force-pushed the duplicatePackageImportFixes branch from 2dcac53 to 15b8af7 Compare July 30, 2018 23:15
@ghost ghost force-pushed the duplicatePackageImportFixes branch from b7f1c21 to 6d83f95 Compare July 31, 2018 00:04
// KLUDGE: Don't assume one 'node_modules' links to another. More likely a single directory inside the node_modules is the symlink.
// ALso, don't assume that an `@foo` directory is linked. More likely the contents of that are linked.
function isNodeModulesOrScopedPackageDirectory(s: string): boolean {
return s === "node_modules" || startsWith(s, "@");
Copy link
Member

@weswigham weswigham Jul 31, 2018

Choose a reason for hiding this comment

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

node_modules comparison should (probably) use platform case comparison, for completeness.

Copy link
Member

@weswigham weswigham left a comment

Choose a reason for hiding this comment

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

Small nit, but looks good.

@ghost ghost merged commit 9c9f3e3 into master Aug 1, 2018
@ghost ghost deleted the duplicatePackageImportFixes branch August 1, 2018 00:28
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants