Skip to content

Commit adf46c2

Browse files
filipesilvaalexeagle
authored andcommitted
fix(@angular-devkit/build-angular): pass system path to readTsconfig
1 parent a53b206 commit adf46c2

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts

+8
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,13 @@ export function readTsconfig(tsconfigPath: string) {
1616
const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
1717
const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys,
1818
path.dirname(tsconfigPath), undefined, tsconfigPath);
19+
20+
if (tsConfig.errors.length > 0) {
21+
throw new Error(
22+
`Errors found while reading ${tsconfigPath}:\n ${
23+
tsConfig.errors.map(e => e.messageText).join('\n ')
24+
}`
25+
)
26+
}
1927
return tsConfig;
2028
}

packages/angular_devkit/build_angular/src/browser/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
import { BuildResult, WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
1414
import {
1515
experimental,
16+
getSystemPath,
1617
join,
1718
json,
1819
logging,
@@ -185,7 +186,7 @@ export function buildWebpackBrowser(
185186
normalize(workspace.getProject(projectName).root),
186187
);
187188

188-
const tsConfigPath = path.resolve(workspace.root, options.tsConfig);
189+
const tsConfigPath = path.resolve(getSystemPath(workspace.root), options.tsConfig);
189190
const tsConfig = readTsconfig(tsConfigPath);
190191

191192
if (isEs5SupportNeeded(projectRoot) &&

0 commit comments

Comments
 (0)