fix(vite): incremental builds tmp tsconfig should have baseUrl set to workspace root (#26680)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
When nxViteTsPaths resolves the tmp tsconfig we create for the buildable
libs, it uses the absoluteBaseUrl of the tsconfig to when creating the
ESM matcher for resolving files.
There is no baseUrl set, therefore the absoluteBaseUrl becomes the
directory of the tmp tsconfig
This means the paths to the built artifacts are incorrect


## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
Use the workspace root, which lines up with the output locations for
built artifacts, for the baseUrl for the tmp tsconfig


## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
This commit is contained in:
Colum Ferry 2024-06-25 18:15:23 +01:00 committed by GitHub
parent d356f61192
commit b42b6f7dbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions

View File

@ -430,7 +430,8 @@ export function createTmpTsConfig(
tsconfigPath: string, tsconfigPath: string,
workspaceRoot: string, workspaceRoot: string,
projectRoot: string, projectRoot: string,
dependencies: DependentBuildableProjectNode[] dependencies: DependentBuildableProjectNode[],
useWorkspaceAsBaseUrl: boolean = false
) { ) {
const tmpTsConfigPath = join( const tmpTsConfigPath = join(
workspaceRoot, workspaceRoot,
@ -445,6 +446,12 @@ export function createTmpTsConfig(
dependencies dependencies
); );
process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath)); process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
if (useWorkspaceAsBaseUrl) {
parsedTSConfig.compilerOptions ??= {};
parsedTSConfig.compilerOptions.baseUrl = workspaceRoot;
}
writeJsonFile(tmpTsConfigPath, parsedTSConfig); writeJsonFile(tmpTsConfigPath, parsedTSConfig);
return join(tmpTsConfigPath); return join(tmpTsConfigPath);
} }

View File

@ -110,7 +110,8 @@ There should at least be a tsconfig.base.json or tsconfig.json in the root of th
foundTsConfigPath, foundTsConfigPath,
workspaceRoot, workspaceRoot,
relative(workspaceRoot, projectRoot), relative(workspaceRoot, projectRoot),
dependencies dependencies,
true
); );
if (config.command === 'serve') { if (config.command === 'serve') {