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
3 changes: 2 additions & 1 deletion src/compiler/tsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ namespace ts {
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
return;
}
const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options, configFileName);
const cwd = sys.getCurrentDirectory();
const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), cwd), commandLine.options, getNormalizedAbsolutePath(configFileName, cwd));
if (configParseResult.errors.length > 0) {
reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
Expand Down
20 changes: 20 additions & 0 deletions tests/baselines/reference/umdGlobalMerge.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
tests/cases/compiler/b.d.ts(2,20): error TS2305: Module '"tests/cases/compiler/a".ns' has no exported member 'IFoo'.


==== tests/cases/compiler/a.d.ts (0 errors) ====
export = ns;

export as namespace ns;

declare namespace ns {
export var x: number;
export interface IFoo { }
}

==== tests/cases/compiler/b.d.ts (1 errors) ====
declare namespace ns.something {
export var p: ns.IFoo;
~~~~
!!! error TS2305: Module '"tests/cases/compiler/a".ns' has no exported member 'IFoo'.
}

14 changes: 14 additions & 0 deletions tests/cases/compiler/umdGlobalMerge.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @filename: a.d.ts
export = ns;

export as namespace ns;

declare namespace ns {
export var x: number;
export interface IFoo { }
}

// @filename: b.d.ts
declare namespace ns.something {
export var p: ns.IFoo;
}