Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Mocks

/examples/react-todos-app/ @matejchalk
/testing/test-utils/src/lib/utils/dynamic-mocks/ @matejchalk

# Plugins

/packages/plugin-eslint/ @matejchalk
/packages/plugin-coverage/ @matejchalk
/packages/plugin-js-packages/ @matejchalk
/packages/plugin-lighthouse/ @BioPhoton
/packages/plugin-typescript/ @BioPhoton
/packages/nx-plugin/ @BioPhoton
/examples/plugins/ @BioPhoton
8 changes: 8 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@
- changed-files:
- any-glob-to-any-file: 'packages/plugin-lighthouse/src/**'

🧩 jsdocs-plugin:
- changed-files:
- any-glob-to-any-file: 'packages/plugin-jsdocs/src/**'

🧩 typescript-plugin:
- changed-files:
- any-glob-to-any-file: 'packages/plugin-typescript/src/**'

🔬 testing:
- changed-files:
- any-glob-to-any-file:
Expand Down
4 changes: 2 additions & 2 deletions code-pushup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
jsDocsCoreConfig,
jsPackagesCoreConfig,
lighthouseCoreConfig,
typescriptPluginConfigNx,
typescriptPluginConfig,
} from './code-pushup.preset.js';
import type { CoreConfig } from './packages/models/src/index.js';
import { mergeConfigs } from './packages/utils/src/index.js';
Expand Down Expand Up @@ -40,7 +40,7 @@ export default mergeConfigs(
await lighthouseCoreConfig(
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
),
await typescriptPluginConfigNx({
await typescriptPluginConfig({
tsconfig: 'packages/cli/tsconfig.lib.json',
}),
await eslintCoreConfigNx(),
Expand Down
66 changes: 29 additions & 37 deletions code-pushup.preset.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @nx/enforce-module-boundaries */
import type {
CategoryConfig,
CoreConfig,
Expand All @@ -21,10 +22,9 @@ import { filterGroupsByOnlyAudits } from './packages/plugin-jsdocs/src/lib/utils
import lighthousePlugin, {
lighthouseGroupRef,
} from './packages/plugin-lighthouse/src/index.js';
import {
import typescriptPlugin, {
type TypescriptPluginOptions,
getCategories,
typescriptPlugin,
} from './packages/plugin-typescript/src/index.js';

export const jsPackagesCategories: CategoryConfig[] = [
Expand Down Expand Up @@ -129,51 +129,43 @@ export const coverageCategories: CategoryConfig[] = [
},
];

export const jsPackagesCoreConfig = async (): Promise<CoreConfig> => {
return {
plugins: [await jsPackagesPlugin()],
categories: jsPackagesCategories,
};
};
export const jsPackagesCoreConfig = async (): Promise<CoreConfig> => ({
plugins: [await jsPackagesPlugin()],
categories: jsPackagesCategories,
});

export const lighthouseCoreConfig = async (
url: string,
): Promise<CoreConfig> => {
return {
plugins: [await lighthousePlugin(url)],
categories: lighthouseCategories,
};
};
): Promise<CoreConfig> => ({
plugins: [await lighthousePlugin(url)],
categories: lighthouseCategories,
});

export const jsDocsCoreConfig = (
config: JsDocsPluginConfig | string[],
): CoreConfig => {
return {
plugins: [
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
],
categories: getJsDocsCategories(
Array.isArray(config) ? { patterns: config } : config,
),
};
};
): CoreConfig => ({
plugins: [
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
],
categories: getJsDocsCategories(
Array.isArray(config) ? { patterns: config } : config,
),
});

export const eslintCoreConfigNx = async (
projectName?: string,
): Promise<CoreConfig> => {
return {
plugins: [
await eslintPlugin(
await (projectName
? eslintConfigFromNxProject(projectName)
: eslintConfigFromAllNxProjects()),
),
],
categories: eslintCategories,
};
};
): Promise<CoreConfig> => ({
plugins: [
await eslintPlugin(
await (projectName
? eslintConfigFromNxProject(projectName)
: eslintConfigFromAllNxProjects()),
),
],
categories: eslintCategories,
});

export const typescriptPluginConfigNx = async (
export const typescriptPluginConfig = async (
options?: TypescriptPluginOptions,
): Promise<CoreConfig> => ({
plugins: [await typescriptPlugin(options)],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import type { CoreConfig } from '@code-pushup/models';
import {
import typescriptPlugin, {
getCategoryRefsFromGroups,
typescriptPlugin,
} from '@code-pushup/typescript-plugin';

export default {
plugins: [await typescriptPlugin()],
categories: [
{
slug: 'typescript-quality',
title: 'Typescript',
slug: 'type-safety',
title: 'Type safety',
refs: getCategoryRefsFromGroups(),
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
"weight": 1,
},
],
"slug": "typescript-quality",
"title": "Typescript",
"slug": "type-safety",
"title": "Type safety",
},
],
"packageName": "@code-pushup/core",
Expand Down
9 changes: 6 additions & 3 deletions packages/plugin-typescript/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { typescriptPlugin } from './lib/typescript-plugin.js';

export default typescriptPlugin;

export { TYPESCRIPT_PLUGIN_SLUG } from './lib/constants.js';
export { typescriptPlugin } from './lib/typescript-plugin.js';
export { getCategories, getCategoryRefsFromGroups } from './lib/utils.js';
export {
typescriptPluginConfigSchema,
type TypescriptPluginConfig,
type TypescriptPluginOptions,
typescriptPluginConfigSchema,
} from './lib/schema.js';
export { getCategories, getCategoryRefsFromGroups } from './lib/utils.js';