Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tests/pnp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,6 @@ fn test_resolve_tsconfig_extends_with_pnp() {
});

let resolution = resolver.resolve_tsconfig(&fixture).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;
assert_eq!(compiler_options.target, Some("esnext".to_string()));
}
10 changes: 5 additions & 5 deletions src/tests/tsconfig_extends.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn test_extend_tsconfig() {
assert_eq!(resolution.include, Some(vec!["include".to_string()]));
assert_eq!(resolution.exclude, Some(vec!["exclude".to_string()]));

let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;
assert_eq!(compiler_options.base_url, Some(f.join("src")));
assert_eq!(compiler_options.allow_js, Some(true));
assert_eq!(compiler_options.emit_decorator_metadata, Some(true));
Expand Down Expand Up @@ -72,7 +72,7 @@ fn test_extend_tsconfig_override_behavior() {
});

let resolution = resolver.resolve_tsconfig(&f).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;

// Child should override parent values
assert_eq!(compiler_options.jsx, Some("react".to_string()));
Expand Down Expand Up @@ -128,7 +128,7 @@ fn test_extend_tsconfig_multiple_inheritance() {
});

let resolution = resolver.resolve_tsconfig(&f).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;

// Should have settings from all configs in the chain
assert_eq!(compiler_options.experimental_decorators, Some(true));
Expand All @@ -149,7 +149,7 @@ fn test_extend_tsconfig_preserves_child_settings() {
});

let resolution = resolver.resolve_tsconfig(&f).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;

// Child should preserve its own settings and not inherit conflicting ones
assert_eq!(compiler_options.jsx, Some("preserve".to_string())); // Child value
Expand Down Expand Up @@ -185,7 +185,7 @@ fn test_extend_tsconfig_no_override_existing() {
child_tsconfig.extend_tsconfig(&parent_tsconfig);
let child_built = child_tsconfig.build();

let compiler_options = child_built.compiler_options();
let compiler_options = &child_built.compiler_options;

// Child's jsx should be preserved
assert_eq!(compiler_options.jsx, Some("preserve".to_string()));
Expand Down
4 changes: 2 additions & 2 deletions src/tests/tsconfig_paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ fn test_merge_tsconfig() {
let resolver = Resolver::default();
let dir = super::fixture_root().join("tsconfig/cases/merge_compiler_options");
let resolution = resolver.resolve_tsconfig(&dir).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;
assert_eq!(compiler_options.experimental_decorators, Some(true));
assert_eq!(compiler_options.jsx, Some("react-jsx".to_string()));
assert_eq!(compiler_options.jsx_factory, Some("h".to_string()));
Expand All @@ -287,7 +287,7 @@ fn test_no_merge_tsconfig() {
let resolver = Resolver::default();
let dir = super::fixture_root().join("tsconfig/cases/no_merge_compiler_options");
let resolution = resolver.resolve_tsconfig(&dir).expect("resolved");
let compiler_options = resolution.compiler_options();
let compiler_options = &resolution.compiler_options;
assert_eq!(compiler_options.experimental_decorators, Some(true));
assert_eq!(compiler_options.jsx, Some("react-jsx".to_string()));
assert_eq!(compiler_options.jsx_factory, Some("h".to_string()));
Expand Down
Loading