Skip to content

Commit 1aa6211

Browse files
committed
fix(plugin-typescript): use default export
1 parent 8361ebc commit 1aa6211

File tree

5 files changed

+42
-48
lines changed

5 files changed

+42
-48
lines changed

code-pushup.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
jsDocsCoreConfig,
77
jsPackagesCoreConfig,
88
lighthouseCoreConfig,
9-
typescriptPluginConfigNx,
9+
typescriptPluginConfig,
1010
} from './code-pushup.preset.js';
1111
import type { CoreConfig } from './packages/models/src/index.js';
1212
import { mergeConfigs } from './packages/utils/src/index.js';
@@ -40,7 +40,7 @@ export default mergeConfigs(
4040
await lighthouseCoreConfig(
4141
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
4242
),
43-
await typescriptPluginConfigNx({
43+
await typescriptPluginConfig({
4444
tsconfig: 'packages/cli/tsconfig.lib.json',
4545
}),
4646
await eslintCoreConfigNx(),

code-pushup.preset.ts

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @nx/enforce-module-boundaries */
12
import type {
23
CategoryConfig,
34
CoreConfig,
@@ -21,10 +22,9 @@ import { filterGroupsByOnlyAudits } from './packages/plugin-jsdocs/src/lib/utils
2122
import lighthousePlugin, {
2223
lighthouseGroupRef,
2324
} from './packages/plugin-lighthouse/src/index.js';
24-
import {
25+
import typescriptPlugin, {
2526
type TypescriptPluginOptions,
2627
getCategories,
27-
typescriptPlugin,
2828
} from './packages/plugin-typescript/src/index.js';
2929

3030
export const jsPackagesCategories: CategoryConfig[] = [
@@ -129,51 +129,43 @@ export const coverageCategories: CategoryConfig[] = [
129129
},
130130
];
131131

132-
export const jsPackagesCoreConfig = async (): Promise<CoreConfig> => {
133-
return {
134-
plugins: [await jsPackagesPlugin()],
135-
categories: jsPackagesCategories,
136-
};
137-
};
132+
export const jsPackagesCoreConfig = async (): Promise<CoreConfig> => ({
133+
plugins: [await jsPackagesPlugin()],
134+
categories: jsPackagesCategories,
135+
});
138136

139137
export const lighthouseCoreConfig = async (
140138
url: string,
141-
): Promise<CoreConfig> => {
142-
return {
143-
plugins: [await lighthousePlugin(url)],
144-
categories: lighthouseCategories,
145-
};
146-
};
139+
): Promise<CoreConfig> => ({
140+
plugins: [await lighthousePlugin(url)],
141+
categories: lighthouseCategories,
142+
});
147143

148144
export const jsDocsCoreConfig = (
149145
config: JsDocsPluginConfig | string[],
150-
): CoreConfig => {
151-
return {
152-
plugins: [
153-
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
154-
],
155-
categories: getJsDocsCategories(
156-
Array.isArray(config) ? { patterns: config } : config,
157-
),
158-
};
159-
};
146+
): CoreConfig => ({
147+
plugins: [
148+
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
149+
],
150+
categories: getJsDocsCategories(
151+
Array.isArray(config) ? { patterns: config } : config,
152+
),
153+
});
160154

161155
export const eslintCoreConfigNx = async (
162156
projectName?: string,
163-
): Promise<CoreConfig> => {
164-
return {
165-
plugins: [
166-
await eslintPlugin(
167-
await (projectName
168-
? eslintConfigFromNxProject(projectName)
169-
: eslintConfigFromAllNxProjects()),
170-
),
171-
],
172-
categories: eslintCategories,
173-
};
174-
};
157+
): Promise<CoreConfig> => ({
158+
plugins: [
159+
await eslintPlugin(
160+
await (projectName
161+
? eslintConfigFromNxProject(projectName)
162+
: eslintConfigFromAllNxProjects()),
163+
),
164+
],
165+
categories: eslintCategories,
166+
});
175167

176-
export const typescriptPluginConfigNx = async (
168+
export const typescriptPluginConfig = async (
177169
options?: TypescriptPluginOptions,
178170
): Promise<CoreConfig> => ({
179171
plugins: [await typescriptPlugin(options)],

e2e/plugin-typescript-e2e/mocks/fixtures/default-setup/code-pushup.config.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import type { CoreConfig } from '@code-pushup/models';
2-
import {
2+
import typescriptPlugin, {
33
getCategoryRefsFromGroups,
4-
typescriptPlugin,
54
} from '@code-pushup/typescript-plugin';
65

76
export default {
87
plugins: [await typescriptPlugin()],
98
categories: [
109
{
11-
slug: 'typescript-quality',
12-
title: 'Typescript',
10+
slug: 'type-safety',
11+
title: 'Type safety',
1312
refs: getCategoryRefsFromGroups(),
1413
},
1514
],

e2e/plugin-typescript-e2e/tests/__snapshots__/collect.e2e.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
2424
"weight": 1,
2525
},
2626
],
27-
"slug": "typescript-quality",
28-
"title": "Typescript",
27+
"slug": "type-safety",
28+
"title": "Type safety",
2929
},
3030
],
3131
"packageName": "@code-pushup/core",
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import { typescriptPlugin } from './lib/typescript-plugin.js';
2+
3+
export default typescriptPlugin;
4+
15
export { TYPESCRIPT_PLUGIN_SLUG } from './lib/constants.js';
2-
export { typescriptPlugin } from './lib/typescript-plugin.js';
3-
export { getCategories, getCategoryRefsFromGroups } from './lib/utils.js';
46
export {
7+
typescriptPluginConfigSchema,
58
type TypescriptPluginConfig,
69
type TypescriptPluginOptions,
7-
typescriptPluginConfigSchema,
810
} from './lib/schema.js';
11+
export { getCategories, getCategoryRefsFromGroups } from './lib/utils.js';

0 commit comments

Comments
 (0)