Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ts-config-writer) - nest typesRoot under compilerOptions and make them relative paths #7212

Merged
merged 3 commits into from
Mar 28, 2023
Merged

fix(ts-config-writer) - nest typesRoot under compilerOptions and make them relative paths #7212

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818b5c0
fix(ts-config-writer) - nest typesRoot under compilerOptions and make…
GiladShoham Mar 28, 2023
67596c7
Merge branch 'master' into ts-config-writer-fixes
GiladShoham Mar 28, 2023
a37d4a5
Merge branch 'master' into ts-config-writer-fixes
luvkapur Mar 28, 2023
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
13 changes: 9 additions & 4 deletions scopes/typescript/typescript/ts-config-writer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { stringify, parse, assign } from 'comment-json';
import { sha1 } from '@teambit/legacy/dist/utils';
import fs from 'fs-extra';
import { ExecutionContext } from '@teambit/envs';
import { basename, join } from 'path';
import { basename, join, relative } from 'path';
import type {
ConfigWriterEntry,
WrittenConfigFile,
Expand All @@ -11,6 +11,7 @@ import type {
EnvMapValue,
PostProcessExtendingConfigFilesArgs,
} from '@teambit/workspace-config-files';
import { uniq } from 'lodash';
import { CompilerMain } from '@teambit/compiler';
import { Logger } from '@teambit/logger';
import { IdeConfig, TypescriptCompilerInterface } from './typescript-compiler-interface';
Expand Down Expand Up @@ -105,9 +106,13 @@ export class TypescriptConfigWriter implements ConfigWriterEntry {
tsConfig = parse(content);
}
// @ts-ignore
const typeRoots = tsConfig.typeRoots || [];
typeRoots.push(join(configsRootDir, GLOBAL_TYPES_DIR));
assign(tsConfig, { typeRoots });
const compilerOptions = tsConfig.compilerOptions || {};
const typeRoots = compilerOptions.typeRoots || [];
const globalTypesDir = join(configsRootDir, GLOBAL_TYPES_DIR);
const relativeGlobalTypesDir = relative(workspaceDir, globalTypesDir);
typeRoots.push(relativeGlobalTypesDir);
assign(compilerOptions, { typeRoots: uniq(typeRoots) });
assign(tsConfig, { compilerOptions });
await fs.outputFile(rootTsConfigPath, stringify(tsConfig, null, 2));
}

Expand Down