summaryrefslogtreecommitdiff
path: root/cli/tsc.rs
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2022-08-10 22:33:42 +0100
committerGitHub <noreply@github.com>2022-08-11 07:33:42 +1000
commit578f12d531b146661294771f002cf0d76bcc5f9a (patch)
tree6f3106287ad9a557f51c3343be645c98764c3718 /cli/tsc.rs
parentd9fae38d1e093fd2578c096203f1bddc18aa8ddb (diff)
fix(cli): allow configurations files to also be json modules (#15444)
Closes #15440
Diffstat (limited to 'cli/tsc.rs')
-rw-r--r--cli/tsc.rs24
1 files changed, 9 insertions, 15 deletions
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 0b9f02583..5b99d0456 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -490,21 +490,15 @@ fn op_resolve(
));
} else {
let graph_data = state.graph_data.read();
- let referrer = graph_data.follow_redirect(&referrer);
- let resolved_dep = match graph_data.get(&referrer) {
- Some(ModuleEntry::Module { dependencies, .. }) => {
- dependencies.get(specifier).map(|d| {
- if matches!(d.maybe_type, Resolved::Ok { .. }) {
- &d.maybe_type
- } else {
- &d.maybe_code
- }
- })
- }
- Some(ModuleEntry::Configuration { dependencies }) => {
- dependencies.get(specifier)
- }
- _ => None,
+ let resolved_dep = match graph_data.get_dependencies(&referrer) {
+ Some(dependencies) => dependencies.get(specifier).map(|d| {
+ if matches!(d.maybe_type, Resolved::Ok { .. }) {
+ &d.maybe_type
+ } else {
+ &d.maybe_code
+ }
+ }),
+ None => None,
};
let maybe_result = match resolved_dep {
Some(Resolved::Ok { specifier, .. }) => {