Skip to content

Commit 09359f0

Browse files
committed
feat(plugin-typescript): support multiple tsconfigs
1 parent 35ec495 commit 09359f0

36 files changed

+349
-58
lines changed

code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default mergeConfigs(
2020
await configureEslintPlugin(),
2121
await configureCoveragePlugin(),
2222
await configureJsPackagesPlugin(),
23-
configureTypescriptPlugin(),
23+
await configureTypescriptPlugin(),
2424
configureJsDocsPlugin(),
2525
await configureLighthousePlugin(TARGET_URL),
2626
configureAxePlugin(TARGET_URL),

code-pushup.preset.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
} from './packages/plugin-lighthouse/src/index.js';
2121
import typescriptPlugin, {
2222
getCategories,
23+
tsconfigFromAllNxProjects,
2324
} from './packages/plugin-typescript/src/index.js';
2425

2526
export function configureUpload(projectName: string = 'workspace'): CoreConfig {
@@ -150,10 +151,17 @@ export async function configureJsPackagesPlugin(): Promise<CoreConfig> {
150151
};
151152
}
152153

153-
export function configureTypescriptPlugin(projectName?: string): CoreConfig {
154+
export async function configureTypescriptPlugin(
155+
projectName?: string,
156+
): Promise<CoreConfig> {
154157
const tsconfig = projectName
155158
? `packages/${projectName}/tsconfig.lib.json`
156-
: 'tsconfig.code-pushup.json';
159+
: await tsconfigFromAllNxProjects({
160+
exclude: [
161+
'test-fixtures', // Intentionally incomplete tsconfigs
162+
'models', // Uses ts-patch transformer plugin
163+
],
164+
});
157165
return {
158166
plugins: [typescriptPlugin({ tsconfig })],
159167
categories: getCategories(),

packages/ci/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/cli/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/core/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/create-cli/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/nx-plugin/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/plugin-axe/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/plugin-coverage/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

packages/plugin-eslint/code-pushup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default mergeConfigs(
1414
configureUpload(projectName),
1515
await configureEslintPlugin(projectName),
1616
await configureCoveragePlugin(projectName),
17-
configureTypescriptPlugin(projectName),
17+
await configureTypescriptPlugin(projectName),
1818
configureJsDocsPlugin(projectName),
1919
);

0 commit comments

Comments
 (0)