Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 93fab26

Browse files
committedAug 13, 2020
fix(core): properly resolve tsconfig when serving from project root (#3403)
1 parent d074f45 commit 93fab26

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎packages/node/src/builders/build/build.impl.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { JsonObject, workspaces } from '@angular-devkit/core';
33
import { runWebpack, BuildResult } from '@angular-devkit/build-webpack';
44

55
import { Observable, from } from 'rxjs';
6-
import { resolve } from 'path';
6+
import { join, resolve } from 'path';
77
import { map, concatMap } from 'rxjs/operators';
88
import { getNodeWebpackConfig } from '../../utils/node.config';
99
import { OUT_FILENAME } from '../../utils/config';
@@ -44,7 +44,7 @@ function run(
4444
context
4545
);
4646
options.tsConfig = createTmpTsConfig(
47-
options.tsConfig,
47+
join(context.workspaceRoot, options.tsConfig),
4848
context.workspaceRoot,
4949
target.data.root,
5050
dependencies

‎packages/web/src/builders/build/build.impl.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { writeIndexHtml } from '../../utils/third-party/cli-files/utilities/inde
1515
import { NodeJsSyncHost } from '@angular-devkit/core/node';
1616
import { execSync } from 'child_process';
1717
import { Range, satisfies } from 'semver';
18-
import { basename } from 'path';
18+
import { basename, join } from 'path';
1919
import { createProjectGraph } from '@nrwl/workspace/src/core/project-graph';
2020
import {
2121
calculateProjectDependencies,
@@ -76,7 +76,7 @@ export function run(options: WebBuildBuilderOptions, context: BuilderContext) {
7676
context
7777
);
7878
options.tsConfig = createTmpTsConfig(
79-
options.tsConfig,
79+
join(context.workspaceRoot, options.tsConfig),
8080
context.workspaceRoot,
8181
target.data.root,
8282
dependencies

0 commit comments

Comments
 (0)
Please sign in to comment.