microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-15 21:47:01 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix fallback to classic resolution

Browse Source 
(cherry picked from commit e03a45a824)
This commit is contained in:
Bill Ticehurst
2016-02-12 15:40:47 -08:00
parent 8ca031ef57
commit cf0b9f6ee2
54 changed files with 86 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/program.ts
View File

@@ -39,7 +39,7 @@ namespace ts {
export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
const moduleResolution = compilerOptions.moduleResolution !== undefined
? compilerOptions.moduleResolution
: compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
: getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
switch (moduleResolution) {
case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);

3
src/harness/harness.ts
View File

@@ -905,7 +905,8 @@ namespace Harness {
{ name: "fileName", type: "string" },
{ name: "libFiles", type: "string" },
{ name: "noErrorTruncation", type: "boolean" },
{ name: "suppressOutputPathCheck", type: "boolean" }
{ name: "suppressOutputPathCheck", type: "boolean" },
{ name: "moduleResolution", type: "string"}
];
let optionsIndex: ts.Map<ts.CommandLineOption>;