Skip to content

Commit b3df23c

Browse files
committed
Accept module resolution trace baseline where baseUrl is specified as "../" in tsconfig
1 parent fde10a2 commit b3df23c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
1313
"======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
1414
"Module resolution kind is not specified, using 'Classic'.",
15-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module3'.",
15+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module3'.",
1616
"'paths' option is specified, looking for a pattern to match module name 'module3'.",
1717
"Module name 'module3', matched pattern '*'.",
1818
"Trying substitution '*', candidate module location: 'module3'.",
@@ -35,7 +35,7 @@
3535
"======== Module name 'module3' was successfully resolved to 'c:/module3.d.ts'. ========",
3636
"======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
3737
"Module resolution kind is not specified, using 'Classic'.",
38-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module1'.",
38+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module1'.",
3939
"'paths' option is specified, looking for a pattern to match module name 'module1'.",
4040
"Module name 'module1', matched pattern '*'.",
4141
"Trying substitution '*', candidate module location: 'module1'.",
@@ -49,7 +49,7 @@
4949
"======== Module name 'module1' was successfully resolved to 'c:/shared/module1.d.ts'. ========",
5050
"======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
5151
"Module resolution kind is not specified, using 'Classic'.",
52-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'templates/module2'.",
52+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'templates/module2'.",
5353
"'paths' option is specified, looking for a pattern to match module name 'templates/module2'.",
5454
"Module name 'templates/module2', matched pattern 'templates/*'.",
5555
"Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",

tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
1616
"======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
1717
"Module resolution kind is not specified, using 'NodeJs'.",
18-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module3'.",
18+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module3'.",
1919
"'paths' option is specified, looking for a pattern to match module name 'module3'.",
2020
"Module name 'module3', matched pattern '*'.",
2121
"Trying substitution '*', candidate module location: 'module3'.",
@@ -40,7 +40,7 @@
4040
"======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ========",
4141
"======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
4242
"Module resolution kind is not specified, using 'NodeJs'.",
43-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module1'.",
43+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module1'.",
4444
"'paths' option is specified, looking for a pattern to match module name 'module1'.",
4545
"Module name 'module1', matched pattern '*'.",
4646
"Trying substitution '*', candidate module location: 'module1'.",
@@ -61,7 +61,7 @@
6161
"======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ========",
6262
"======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
6363
"Module resolution kind is not specified, using 'NodeJs'.",
64-
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'templates/module2'.",
64+
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'templates/module2'.",
6565
"'paths' option is specified, looking for a pattern to match module name 'templates/module2'.",
6666
"Module name 'templates/module2', matched pattern 'templates/*'.",
6767
"Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",

0 commit comments

Comments
 (0)