When loading a module from node_modules, get packageId even in the loadModuleFromFile case
#18185
Conversation
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
…oadModuleFromFile` case
ghost
changed the title
loadModuleFromFile case
amcasey
reviewed
Aug 31, 2017
| @@ -1675,7 +1675,7 @@ namespace ts { | |||
| }); | |||
|
|
|||
| if (packageId) { | |||
| const packageIdKey = `${packageId.name}@${packageId.version}`; | |||
| const packageIdKey = `${packageId.name}/${packageId.subModuleName}@${packageId.version}`; | |||
There was a problem hiding this comment.
Just to confirm, we're fine with producing an ugly string when packageId.subModuleName is empty? It appears to only be used as a dictionary key, so I'm assuming we are.
|
@minestarks has more experience in this area and may be able to give better feedback. |
ghost
force-pushed
the
duplicatePackage_subModule
branch
from
ecb7259 to
104a52b
Compare
minestarks
approved these changes
Sep 7, 2017
ghost
pushed a commit
that referenced
this pull request
Sep 7, 2017
…oadModuleFromFile` case (#18185) * When loading a module from node_modules, get packageId even in the `loadModuleFromFile` case * Support packageId for <reference types> too
This was referenced Sep 7, 2017
Merged
ghost
mentioned this pull request
This pull request was closed.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #6496 (comment)
When loading a module like
rxjs/Observer.d.ts, we need to remember to checkpackage.jsonanyway so we can get thepackageId.Update: Now fixes #17716 (the deduplication side) too.