diff options
| -rw-r--r-- | cli/args/mod.rs | 4 | ||||
| -rw-r--r-- | cli/graph_util.rs | 6 | ||||
| -rw-r--r-- | tests/specs/run/skips_compiler_option_types/__test__.jsonc | 6 | ||||
| -rw-r--r-- | tests/specs/run/skips_compiler_option_types/deno.json | 8 | ||||
| -rw-r--r-- | tests/specs/run/skips_compiler_option_types/main.out | 1 | ||||
| -rw-r--r-- | tests/specs/run/skips_compiler_option_types/main.ts | 1 |
6 files changed, 22 insertions, 4 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 04a011196..e0eff6171 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -1301,9 +1301,7 @@ impl CliOptions { self.maybe_lockfile.clone() } - /// Return any imports that should be brought into the scope of the module - /// graph. - pub fn to_maybe_imports( + pub fn to_compiler_option_types( &self, ) -> Result<Vec<deno_graph::ReferrerImports>, AnyError> { self.workspace.to_maybe_imports().map(|maybe_imports| { diff --git a/cli/graph_util.rs b/cli/graph_util.rs index 2f9ee8d93..7f664420c 100644 --- a/cli/graph_util.rs +++ b/cli/graph_util.rs @@ -481,7 +481,11 @@ impl ModuleGraphBuilder { } } - let maybe_imports = self.options.to_maybe_imports()?; + let maybe_imports = if options.graph_kind.include_types() { + self.options.to_compiler_option_types()? + } else { + Vec::new() + }; let analyzer = self .module_info_cache .as_module_analyzer(&self.parsed_source_cache); diff --git a/tests/specs/run/skips_compiler_option_types/__test__.jsonc b/tests/specs/run/skips_compiler_option_types/__test__.jsonc new file mode 100644 index 000000000..bd2d5aaa2 --- /dev/null +++ b/tests/specs/run/skips_compiler_option_types/__test__.jsonc @@ -0,0 +1,6 @@ +{ + // this was previously downloading the "types" from the compilerOptions + // even for deno run with no type checking + "args": "run main.ts", + "output": "main.out" +} diff --git a/tests/specs/run/skips_compiler_option_types/deno.json b/tests/specs/run/skips_compiler_option_types/deno.json new file mode 100644 index 000000000..92d0923b9 --- /dev/null +++ b/tests/specs/run/skips_compiler_option_types/deno.json @@ -0,0 +1,8 @@ +{ + "lock": false, + "compilerOptions": { + "types": [ + "https://localhost@4545/non-existent/@types/react@18.0.28" + ] + } +} diff --git a/tests/specs/run/skips_compiler_option_types/main.out b/tests/specs/run/skips_compiler_option_types/main.out new file mode 100644 index 000000000..45b983be3 --- /dev/null +++ b/tests/specs/run/skips_compiler_option_types/main.out @@ -0,0 +1 @@ +hi diff --git a/tests/specs/run/skips_compiler_option_types/main.ts b/tests/specs/run/skips_compiler_option_types/main.ts new file mode 100644 index 000000000..d914c6066 --- /dev/null +++ b/tests/specs/run/skips_compiler_option_types/main.ts @@ -0,0 +1 @@ +console.log("hi"); |