Resolve using package json's "main" field when resolving typescript extensions #24112
Conversation
This file contains 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
…d referencing js file in sub directory
…dule doesnt have js or jsx extension
|
@andy-ms can you please review. |
ghost
approved these changes
May 15, 2018
| @@ -1047,9 +1049,18 @@ namespace ts { | |||
| } | |||
|
|
|||
| function loadModuleFromPackageJson(jsonContent: PackageJsonPathFields, extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): PathAndExtension | undefined { | |||
| const file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript && extensions !== Extensions.Json, jsonContent, candidate, state); | |||
| let file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript && extensions !== Extensions.Json, jsonContent, candidate, state); | |||
There was a problem hiding this comment.
Nit: might just modify tryReadPackageJsonFields to take separate readTypes and readMain parameters, if we might want both at once.
There was a problem hiding this comment.
In most both cases different conditions determine if we read main types so i would rather leave it as is.
This was referenced Jun 1, 2018
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.
Before this change we would use "typings" | "types" entry when resolving typescript extension and "main" field when resolving js extensions. Thus the package json having no typings field and main pointing to anything in subdirectory would never be resolved as relative file path. With this change, we would use main field to relatively resolve the typescript files, thus trying to find .d.ts file corresponding to the main js file
Fixes #23502