Skip to content

Commit f9414aa

Browse files
andrewbranchandrewbranch
committed
Fix bad merge conflict resolution
1 parent e0c0375 commit f9414aa

File tree

31 files changed

+219
-170
lines changed

31 files changed

+219
-170
lines changed

‎src/compiler/moduleNameResolver.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,8 +1755,6 @@ function loadModuleFromFile(extensions: Extensions, candidate: string, onlyRecor
17551755
return resolvedByAddingExtension;
17561756
}
17571757
}
1758-
1759-
return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
17601758
}
17611759

17621760
function loadModuleFromFileNoImplicitExtensions(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PathAndExtension | undefined {

‎tests/baselines/reference/customConditions(resolvepackagejsonexports=false).trace.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"File '/package.json' does not exist.",
55
"Loading module 'lodash' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
66
"Found 'package.json' at '/node_modules/lodash/package.json'.",
7-
"'package.json' does not have a 'typesVersions' field.",
87
"File '/node_modules/lodash.ts' does not exist.",
98
"File '/node_modules/lodash.tsx' does not exist.",
109
"File '/node_modules/lodash.d.ts' does not exist.",
10+
"'package.json' does not have a 'typesVersions' field.",
1111
"'package.json' does not have a 'typings' field.",
1212
"'package.json' does not have a 'types' field.",
1313
"'package.json' has 'main' field 'index.js' that references '/node_modules/lodash/index.js'.",

‎tests/baselines/reference/customConditions(resolvepackagejsonexports=true).trace.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"File '/package.json' does not exist.",
55
"Loading module 'lodash' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
66
"Found 'package.json' at '/node_modules/lodash/package.json'.",
7-
"'package.json' does not have a 'typesVersions' field.",
87
"Saw non-matching condition 'browser'.",
98
"Matched 'exports' condition 'webpack'.",
109
"Using 'exports' subpath '.' with target './webpack.js'.",

‎tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=false,noemit=false).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

‎tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=false,noemit=true).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

‎tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=true,noemit=false).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

‎tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=true,noemit=true).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

‎tests/baselines/reference/hybridNodeModules1.trace.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"File '/package.json' does not exist.",
55
"Loading module 'dual' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
66
"Found 'package.json' at '/node_modules/dual/package.json'.",
7-
"'package.json' does not have a 'typesVersions' field.",
87
"Matched 'exports' condition 'import'.",
98
"Using 'exports' subpath '.' with target './index.js'.",
109
"File name '/node_modules/dual/index.js' has a '.js' extension - stripping it.",

‎tests/baselines/reference/moduleResolution/baseUrl-without-path-mappings-or-rootDirs.js

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ Resolution:: {
1212
"resolvedModule": {
1313
"resolvedFileName": "/root/folder2/file2.ts",
1414
"extension": ".ts",
15-
"isExternalLibraryImport": false
15+
"isExternalLibraryImport": false,
16+
"resolvedUsingTsExtension": false
1617
},
1718
"failedLookupLocations": [],
1819
"affectingLocations": [],
@@ -24,7 +25,8 @@ Resolution:: {
2425
"resolvedModule": {
2526
"resolvedFileName": "/root/folder2/file3.ts",
2627
"extension": ".ts",
27-
"isExternalLibraryImport": false
28+
"isExternalLibraryImport": false,
29+
"resolvedUsingTsExtension": false
2830
},
2931
"failedLookupLocations": [],
3032
"affectingLocations": [],
@@ -36,7 +38,8 @@ Resolution:: {
3638
"resolvedModule": {
3739
"resolvedFileName": "/root/folder1/file1.ts",
3840
"extension": ".ts",
39-
"isExternalLibraryImport": false
41+
"isExternalLibraryImport": false,
42+
"resolvedUsingTsExtension": false
4043
},
4144
"failedLookupLocations": [],
4245
"affectingLocations": [],
@@ -48,7 +51,8 @@ Resolution:: {
4851
"resolvedModule": {
4952
"resolvedFileName": "/root/folder2/file2.ts",
5053
"extension": ".ts",
51-
"isExternalLibraryImport": false
54+
"isExternalLibraryImport": false,
55+
"resolvedUsingTsExtension": false
5256
},
5357
"failedLookupLocations": [],
5458
"affectingLocations": [],
@@ -60,7 +64,8 @@ Resolution:: {
6064
"resolvedModule": {
6165
"resolvedFileName": "/root/folder2/file3.ts",
6266
"extension": ".ts",
63-
"isExternalLibraryImport": false
67+
"isExternalLibraryImport": false,
68+
"resolvedUsingTsExtension": false
6469
},
6570
"failedLookupLocations": [],
6671
"affectingLocations": [],
@@ -72,7 +77,8 @@ Resolution:: {
7277
"resolvedModule": {
7378
"resolvedFileName": "/root/folder1/file1.ts",
7479
"extension": ".ts",
75-
"isExternalLibraryImport": false
80+
"isExternalLibraryImport": false,
81+
"resolvedUsingTsExtension": false
7682
},
7783
"failedLookupLocations": [],
7884
"affectingLocations": [],
@@ -93,7 +99,8 @@ Resolution:: {
9399
"resolvedModule": {
94100
"resolvedFileName": "/root/folder2/file2.ts",
95101
"extension": ".ts",
96-
"isExternalLibraryImport": false
102+
"isExternalLibraryImport": false,
103+
"resolvedUsingTsExtension": false
97104
},
98105
"failedLookupLocations": [],
99106
"affectingLocations": [],
@@ -105,7 +112,8 @@ Resolution:: {
105112
"resolvedModule": {
106113
"resolvedFileName": "/root/folder2/file3.ts",
107114
"extension": ".ts",
108-
"isExternalLibraryImport": false
115+
"isExternalLibraryImport": false,
116+
"resolvedUsingTsExtension": false
109117
},
110118
"failedLookupLocations": [],
111119
"affectingLocations": [],
@@ -117,7 +125,8 @@ Resolution:: {
117125
"resolvedModule": {
118126
"resolvedFileName": "/root/folder1/file1.ts",
119127
"extension": ".ts",
120-
"isExternalLibraryImport": false
128+
"isExternalLibraryImport": false,
129+
"resolvedUsingTsExtension": false
121130
},
122131
"failedLookupLocations": [],
123132
"affectingLocations": [],
@@ -129,7 +138,8 @@ Resolution:: {
129138
"resolvedModule": {
130139
"resolvedFileName": "/root/folder2/file2.ts",
131140
"extension": ".ts",
132-
"isExternalLibraryImport": false
141+
"isExternalLibraryImport": false,
142+
"resolvedUsingTsExtension": false
133143
},
134144
"failedLookupLocations": [],
135145
"affectingLocations": [],
@@ -141,7 +151,8 @@ Resolution:: {
141151
"resolvedModule": {
142152
"resolvedFileName": "/root/folder2/file3.ts",
143153
"extension": ".ts",
144-
"isExternalLibraryImport": false
154+
"isExternalLibraryImport": false,
155+
"resolvedUsingTsExtension": false
145156
},
146157
"failedLookupLocations": [],
147158
"affectingLocations": [],
@@ -153,7 +164,8 @@ Resolution:: {
153164
"resolvedModule": {
154165
"resolvedFileName": "/root/folder1/file1.ts",
155166
"extension": ".ts",
156-
"isExternalLibraryImport": false
167+
"isExternalLibraryImport": false,
168+
"resolvedUsingTsExtension": false
157169
},
158170
"failedLookupLocations": [],
159171
"affectingLocations": [],

‎tests/baselines/reference/moduleResolution/classic-baseUrl-path-mappings.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ Resolution:: {
1212
"resolvedModule": {
1313
"resolvedFileName": "/root/folder1/file1.ts",
1414
"extension": ".ts",
15-
"isExternalLibraryImport": false
15+
"isExternalLibraryImport": false,
16+
"resolvedUsingTsExtension": false
1617
},
1718
"failedLookupLocations": [],
1819
"affectingLocations": [],
@@ -24,7 +25,8 @@ Resolution:: {
2425
"resolvedModule": {
2526
"resolvedFileName": "/root/generated/folder1/file2.ts",
2627
"extension": ".ts",
27-
"isExternalLibraryImport": false
28+
"isExternalLibraryImport": false,
29+
"resolvedUsingTsExtension": false
2830
},
2931
"failedLookupLocations": [
3032
"/root/folder1/file2.ts",
@@ -40,7 +42,8 @@ Resolution:: {
4042
"resolvedModule": {
4143
"resolvedFileName": "/root/generated/folder1/file2.ts",
4244
"extension": ".ts",
43-
"isExternalLibraryImport": false
45+
"isExternalLibraryImport": false,
46+
"resolvedUsingTsExtension": false
4447
},
4548
"failedLookupLocations": [],
4649
"affectingLocations": [],
@@ -52,7 +55,8 @@ Resolution:: {
5255
"resolvedModule": {
5356
"resolvedFileName": "/folder1/file3.ts",
5457
"extension": ".ts",
55-
"isExternalLibraryImport": false
58+
"isExternalLibraryImport": false,
59+
"resolvedUsingTsExtension": false
5660
},
5761
"failedLookupLocations": [
5862
"/root/folder1/file3.ts",

0 commit comments

Comments
 (0)