Skip to content

Commit c770455

Browse files
author
John Doe
committed
fix: wip
1 parent 0a6467e commit c770455

File tree

8 files changed

+84
-22
lines changed

8 files changed

+84
-22
lines changed

code-pushup.config.ts

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,55 @@
11
import 'dotenv/config';
2+
import { z } from 'zod';
23
import {
4+
coverageCoreConfigNx,
5+
eslintCoreConfigNx,
6+
jsDocsCoreConfig,
37
jsPackagesCoreConfig,
48
lighthouseCoreConfig,
5-
loadEnv,
6-
mergeConfigs,
9+
typescriptPluginConfig,
710
} from './code-pushup.preset.js';
811
import type { CoreConfig } from './packages/models/src/index.js';
12+
import { mergeConfigs } from './packages/utils/src/index.js';
913

10-
const projectName = 'cli';
14+
// load upload configuration from environment
15+
const envSchema = z.object({
16+
CP_SERVER: z.string().url(),
17+
CP_API_KEY: z.string().min(1),
18+
CP_ORGANIZATION: z.string().min(1),
19+
CP_PROJECT: z.string().min(1),
20+
});
21+
const { data: env } = await envSchema.safeParseAsync(process.env);
1122

1223
const config: CoreConfig = {
13-
...(await loadEnv(projectName)),
24+
...(env && {
25+
upload: {
26+
server: env.CP_SERVER,
27+
apiKey: env.CP_API_KEY,
28+
organization: env.CP_ORGANIZATION,
29+
project: env.CP_PROJECT,
30+
},
31+
}),
32+
1433
plugins: [],
1534
};
1635

1736
export default mergeConfigs(
1837
config,
38+
await coverageCoreConfigNx(),
1939
await jsPackagesCoreConfig(),
2040
await lighthouseCoreConfig(
2141
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
2242
),
43+
await typescriptPluginConfig({
44+
tsconfig: 'packages/cli/tsconfig.lib.json',
45+
}),
46+
await eslintCoreConfigNx(),
47+
jsDocsCoreConfig([
48+
'packages/**/src/**/*.ts',
49+
'!packages/**/node_modules',
50+
'!packages/**/{mocks,mock}',
51+
'!**/*.{spec,test}.ts',
52+
'!**/implementation/**',
53+
'!**/internal/**',
54+
]),
2355
);

code-pushup.new.config.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import 'dotenv/config';
2+
import {
3+
jsPackagesCoreConfig,
4+
lighthouseCoreConfig,
5+
loadEnv,
6+
mergeConfigs,
7+
} from './code-pushup.preset.js';
8+
import type { CoreConfig } from './packages/models/src/index.js';
9+
10+
const projectName = 'cli';
11+
12+
const config: CoreConfig = {
13+
...(await loadEnv(projectName)),
14+
plugins: [],
15+
};
16+
17+
export default mergeConfigs(
18+
config,
19+
await jsPackagesCoreConfig(),
20+
await lighthouseCoreConfig(
21+
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
22+
),
23+
);

e2e/plugin-js-packages-e2e/mocks/fixtures/npm-repo/code-pushup.config.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ import type { CoreConfig } from '@code-pushup/models';
66
const thisConfigFolder = fileURLToPath(dirname(import.meta.url));
77

88
export default {
9+
persist: { outputDir: thisConfigFolder, format: ['json'] },
10+
plugins: [
11+
await jsPackagesPlugin({
12+
packageManager: 'npm',
13+
packageJsonPath: join(thisConfigFolder, 'package.json'),
14+
}),
15+
],
16+
} satisfies CoreConfig;

project.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
"name": "cli-source",
33
"$schema": "node_modules/nx/schemas/project-schema.json",
44
"targets": {
5+
"code-pushup-old": {
6+
"executor": "nx:run-commands",
7+
"options": {
8+
"command": "node packages/cli/src/index.ts --no-progress --verbose",
9+
"env": {
10+
"NODE_OPTIONS": "--import tsx",
11+
"TSX_TSCONFIG_PATH": "tsconfig.base.json"
12+
}
13+
}
14+
},
515
"code-pushup": {
616
"dependsOn": ["code-pushup-js-packages", "code-pushup-lighthouse"],
717
"executor": "nx:run-commands",

testing/test-nx-utils/project.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"sourceRoot": "testing/test-nx-utils/src",
55
"projectType": "library",
66
"targets": {
7+
"build": {},
8+
"lint": {},
79
"unit-test": {}
810
},
911
"tags": ["scope:shared", "type:testing"]

testing/test-setup/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "testing/test-setup/src",
55
"projectType": "library",
6-
"targets": {},
7-
"unit-test": {},
6+
"targets": {
7+
"build": {},
8+
"lint": {},
9+
"unit-test": {}
10+
},
811
"tags": ["scope:shared", "type:testing"]
912
}

testing/test-utils/src/lib/fixtures/configs/tsconfig.tools.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

tsconfig.tools.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)