From 675d36c2d4e38f719d9d6127f5e2ccd2cb9f22e0 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 15 Nov 2022 17:29:24 +0100 Subject: [PATCH] chore(scripts): add back code from bad cherry pick conflict resolution --- scripts/tasks/api-extractor.ts | 1 + scripts/tasks/utils.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/scripts/tasks/api-extractor.ts b/scripts/tasks/api-extractor.ts index 00bb6182ad4881..68ae9021cfde9f 100644 --- a/scripts/tasks/api-extractor.ts +++ b/scripts/tasks/api-extractor.ts @@ -147,6 +147,7 @@ export function apiExtractor() { tsConfig, tsConfigPath, packageJson, + definitionsRootPath: 'dist/out-tsc/types', }); config.compiler = compilerConfig; diff --git a/scripts/tasks/utils.ts b/scripts/tasks/utils.ts index 2901197358d7bd..f3b9f3c6ccf744 100644 --- a/scripts/tasks/utils.ts +++ b/scripts/tasks/utils.ts @@ -39,10 +39,26 @@ function enableAllowSyntheticDefaultImports(options: { pkgJson: PackageJson }) { return shouldEnable ? { allowSyntheticDefaultImports: true } : null; } +const rootTsConfig = JSON.parse( + fs.readFileSync(path.resolve(__dirname, '../../tsconfig.base.json'), 'utf-8'), +) as TsConfig; + +function createNormalizedTsPaths(options: { definitionsRootPath: string; rootTsConfig: TsConfig }) { + const paths = (options.rootTsConfig.compilerOptions.paths as unknown) as Record; + + const normalizedPaths = Object.entries(paths).reduce((acc, [pkgName, pathAliases]) => { + acc[pkgName] = [path.join(options.definitionsRootPath, pathAliases[0].replace('index.ts', 'index.d.ts'))]; + return acc; + }, {} as typeof paths); + + return normalizedPaths; +} + export function getTsPathAliasesApiExtractorConfig(options: { tsConfig: TsConfig; tsConfigPath: string; packageJson: PackageJson; + definitionsRootPath: string; }) { /** * Customized TSConfig that uses `tsconfig.lib.json` as base with some required overrides: