Skip to content

Commit 89a111a

Browse files
klerickklerick
committed
ci: New CI/CD process
1 parent 3ac537e commit 89a111a

File tree

8 files changed

+51
-95
lines changed

8 files changed

+51
-95
lines changed

‎.github/workflows/create-release.yml renamed to ‎.github/workflows/create-release.yaml

File renamed without changes.

‎libs/json-api/json-api-nestjs-microorm/project.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{
22
"name": "json-api-nestjs-microorm",
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "libs/json-api/json-api-nestjs-microorm/src",
4+
"sourceRoot": "{projectRoot}/src",
55
"projectType": "library",
6-
"release": {
7-
"version": {
8-
"generatorOptions": {
9-
"packageRoot": "dist/{projectRoot}",
10-
"currentVersionResolver": "git-tag",
11-
"fallbackCurrentVersionResolver": "disk"
12-
}
13-
}
14-
},
156
"tags": [
167
"type:lib",
178
"lib:json-api-nestjs",
@@ -40,7 +31,10 @@
4031
"main": "{projectRoot}/src/index.ts",
4132
"assets": [
4233
"{projectRoot}/*.md"
43-
]
34+
],
35+
"buildableProjectDepsInPackageJsonType": "peerDependencies",
36+
"generateExportsField": true,
37+
"updateBuildableProjectDepsInPackageJson": true
4438
}
4539
},
4640
"upload-badge": {

‎libs/json-api/json-api-nestjs-sdk/project.json

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
{
22
"name": "json-api-nestjs-sdk",
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "libs/json-api/json-api-nestjs-sdk/src",
4+
"sourceRoot": "{projectRoot}/src",
55
"projectType": "library",
6-
"release": {
7-
"version": {
8-
"generatorOptions": {
9-
"packageRoot": "dist/{projectRoot}",
10-
"currentVersionResolver": "git-tag",
11-
"fallbackCurrentVersionResolver": "disk"
12-
}
13-
}
14-
},
156
"tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs-sdk", "type:publish"],
167
"targets": {
178
"build-cjs": {
189
"executor": "@nx/js:tsc",
1910
"outputs": ["{options.outputPath}"],
2011
"options": {
21-
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk/cjs",
22-
"main": "libs/json-api/json-api-nestjs-sdk/src/index.ts",
23-
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig.lib.json",
12+
"outputPath": "dist/{projectRoot}/cjs",
13+
"main": "{projectRoot}/src/index.ts",
14+
"tsConfig": "{projectRoot}/tsconfig.lib.json",
2415
"assets": [{
2516
"glob": "*.md",
26-
"input": "libs/json-api/json-api-nestjs-sdk",
17+
"input": "{projectRoot}",
2718
"output": "../"
2819
}],
2920
"updateBuildableProjectDepsInPackageJson": true,
3021
"buildableProjectDepsInPackageJsonType": "peerDependencies",
3122
"additionalEntryPoints": [
32-
"libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
23+
"{projectRoot}/src/ngModule.ts"
3324
],
3425
"generateExportsField": true
3526
}
@@ -38,18 +29,18 @@
3829
"executor": "@nx/js:tsc",
3930
"outputs": ["{options.outputPath}"],
4031
"options": {
41-
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk/mjs",
42-
"main": "libs/json-api/json-api-nestjs-sdk/src/index.ts",
43-
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig-mjs.lib.json",
32+
"outputPath": "dist/{projectRoot}/mjs",
33+
"main": "{projectRoot}/src/index.ts",
34+
"tsConfig": "{projectRoot}/tsconfig-mjs.lib.json",
4435
"assets": [{
4536
"glob": "*.md",
46-
"input": "libs/json-api/json-api-nestjs-sdk",
37+
"input": "{projectRoot}",
4738
"output": "../"
4839
}],
4940
"updateBuildableProjectDepsInPackageJson": true,
5041
"buildableProjectDepsInPackageJsonType": "peerDependencies",
5142
"additionalEntryPoints": [
52-
"libs/json-api/json-api-nestjs-sdk/src/ngModule.ts"
43+
"{projectRoot}/src/ngModule.ts"
5344
],
5445
"generateExportsField": true
5546
}
@@ -60,7 +51,7 @@
6051
"build-cjs", "build-mjs"
6152
],
6253
"options": {
63-
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk",
54+
"outputPath": "dist/{projectRoot}",
6455
"commands": [
6556
{
6657
"command": "mv dist/{projectRoot}/cjs/package.json dist/{projectRoot}/package.json",

‎libs/json-api/json-api-nestjs-shared/project.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
22
"name": "json-api-nestjs-shared",
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "libs/json-api/json-api-nestjs-shared/src",
4+
"sourceRoot": "{projectRoot}/src",
55
"projectType": "library",
6-
"release": {
7-
"version": {
8-
"generatorOptions": {
9-
"packageRoot": "dist/{projectRoot}",
10-
"currentVersionResolver": "git-tag"
11-
}
12-
}
13-
},
146
"tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs-shared", "type:publish"],
157
"targets": {
168
"build-cjs": {
@@ -30,6 +22,7 @@
3022
"output": "../"
3123
}
3224
],
25+
"buildableProjectDepsInPackageJsonType": "peerDependencies",
3326
"updateBuildableProjectDepsInPackageJson": true
3427
}
3528
},

‎libs/json-api/json-api-nestjs-shared/tsconfig.lib.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,24 @@
33
"compilerOptions": {
44
"outDir": "../../../dist/out-tsc",
55
"declaration": true,
6-
"types": ["node"],
6+
"types": [
7+
"node"
8+
],
79
"target": "es2021",
810
"strictNullChecks": true,
911
"noImplicitAny": true,
1012
"strictBindCallApply": true,
1113
"forceConsistentCasingInFileNames": true,
1214
"noFallthroughCasesInSwitch": true
1315
},
14-
"include": ["src/**/*.ts"],
15-
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.test-d.ts", "src/lib/utils/___test___/**/*.ts"]
16+
"include": [
17+
"src/**/*.ts"
18+
],
19+
"exclude": [
20+
"jest.config.ts",
21+
"src/**/*.spec.ts",
22+
"src/**/*.test.ts",
23+
"src/**/*.test-d.ts",
24+
"src/lib/utils/___test___/**/*.ts"
25+
]
1626
}

‎libs/json-api/json-api-nestjs-typeorm/project.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
22
"name": "json-api-nestjs-typeorm",
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "libs/json-api/json-api-nestjs-typeorm/src",
4+
"sourceRoot": "{projectRoot}/src",
55
"projectType": "library",
6-
"release": {
7-
"version": {
8-
"generatorOptions": {
9-
"packageRoot": "dist/{projectRoot}",
10-
"currentVersionResolver": "git-tag"
11-
}
12-
}
13-
},
146
"tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs-typeorm", "type:publish"],
157
"targets": {
168
"build": {
@@ -23,7 +15,8 @@
2315
"main": "{projectRoot}/src/index.ts",
2416
"assets": ["{projectRoot}/*.md"],
2517
"buildableProjectDepsInPackageJsonType": "peerDependencies",
26-
"generateExportsField": true
18+
"generateExportsField": true,
19+
"updateBuildableProjectDepsInPackageJson": true
2720
}
2821
},
2922
"nx-release-publish": {

‎libs/json-api/json-api-nestjs/project.json

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "json-api-nestjs",
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "libs/json-api/json-api-nestjs/src",
4+
"sourceRoot": "{projectRoot}/src",
55
"projectType": "library",
66
"tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs", "type:publish"],
77
"targets": {
@@ -11,32 +11,16 @@
1111
"{options.outputPath}"
1212
],
1313
"options": {
14-
"outputPath": "dist/libs/json-api/json-api-nestjs",
15-
"tsConfig": "libs/json-api/json-api-nestjs/tsconfig.lib.json",
16-
"packageJson": "libs/json-api/json-api-nestjs/package.json",
17-
"main": "libs/json-api/json-api-nestjs/src/index.ts",
14+
"outputPath": "dist/{projectRoot}",
15+
"tsConfig": "{projectRoot}/tsconfig.lib.json",
16+
"packageJson": "{projectRoot}/package.json",
17+
"main": "{projectRoot}/src/index.ts",
1818
"assets": [
19-
"libs/json-api/json-api-nestjs/*.md"
19+
"{projectRoot}/*.md"
2020
],
2121
"buildableProjectDepsInPackageJsonType": "peerDependencies",
22-
"generateExportsField": true
23-
}
24-
},
25-
"build-npm": {
26-
"executor": "@nx/js:tsc",
27-
"outputs": [
28-
"{options.outputPath}"
29-
],
30-
"options": {
31-
"outputPath": "node_modules/@klerick/json-api-nestjs",
32-
"tsConfig": "libs/json-api/json-api-nestjs/tsconfig.lib.json",
33-
"packageJson": "libs/json-api/json-api-nestjs/package.json",
34-
"main": "libs/json-api/json-api-nestjs/src/index.ts",
35-
"assets": [
36-
"libs/json-api/json-api-nestjs/*.md"
37-
],
38-
"buildableProjectDepsInPackageJsonType": "peerDependencies",
39-
"generateExportsField": true
22+
"generateExportsField": true,
23+
"updateBuildableProjectDepsInPackageJson": true
4024
}
4125
},
4226
"nx-release-publish": {
@@ -56,7 +40,7 @@
5640
"{workspaceRoot}/coverage/{projectRoot}"
5741
],
5842
"options": {
59-
"jestConfig": "libs/json-api/json-api-nestjs/jest.config.ts",
43+
"jestConfig": "{projectRoot}/jest.config.ts",
6044
"codeCoverage": true,
6145
"coverageReporters": [
6246
"json-summary"
@@ -91,7 +75,7 @@
9175
],
9276
"cwd": "./",
9377
"parallel": false,
94-
"outputPath": "{workspaceRoot}/libs/json-api/json-api-nestjs"
78+
"outputPath": "{workspaceRoot}/projectRoot}"
9579
}
9680
}
9781
},

‎nx.json

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,21 @@
7575
},
7676
"release": {
7777
"changelog": {
78+
"automaticFromRef": true,
7879
"projectChangelogs": {
7980
"createRelease": "github"
8081
}
8182
},
8283
"projectsRelationship": "independent",
83-
"projects": [
84-
"*",
85-
"!json-shared-type",
86-
"!json-api-nestjs-shared",
87-
"!json-api-server-e2e",
88-
"!json-api-server",
89-
"!json-api-front",
90-
"!shared-utils",
91-
"!typeorm-database",
92-
"!microorm-database",
93-
"!type-for-rpc"
94-
],
84+
"projects": "tag:type:publish",
9585
"version": {
96-
"preVersionCommand": "npx nx run-many -t build -p nestjs-json-rpc,nestjs-json-rpc-sdk,json-api-nestjs,json-api-nestjs-sdk",
86+
"preVersionCommand": "npx nx run-many --projects=tag:type:publish --target=build --parallel",
9787
"conventionalCommits": true,
9888
"generatorOptions": {
99-
"fallbackCurrentVersionResolver": "1.0.0"
89+
"fallbackCurrentVersionResolver": "disk"
10090
}
101-
}
91+
},
92+
"releaseTagPattern": "{projectName}@{version}"
10293
},
10394
"defaultBase": "master",
10495
"nxCloudId": "67c859dd862a93f16da79c89"

0 commit comments

Comments
 (0)