From b0d686804738c5841e357ecf36025136463b2f70 Mon Sep 17 00:00:00 2001 From: splincode Date: Thu, 11 Jul 2024 23:35:50 +0300 Subject: [PATCH] ci: update --- .github/workflows/build.yml | 4 ++-- .prettierignore | 3 ++- .release-it.json | 2 +- apps/cdk-demo/project.json | 1 + apps/excel-demo/project.json | 1 + apps/flex-layout-demo/project.json | 1 + apps/http-demo/project.json | 1 + apps/logger-demo/project.json | 1 + apps/ngxs-demo/project.json | 1 + apps/tooltip-demo/project.json | 1 + apps/virtual-table-demo/project.json | 1 + libs/cdk/package.json | 2 +- libs/cdk/project.json | 15 +++++++++++---- libs/ngxs/package.json | 2 +- libs/ngxs/project.json | 18 +++++++++++++----- package-lock.json | 12 ++++++------ 16 files changed, 45 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c6151903..42a812a3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ jobs: - name: Setup Node.js and Cache uses: ./.github/actions/nodejs - - name: Run build packages - run: npx nx run-many --target=build --parallel=1 + - run: npx nx run-many --target=build --projects=tag:libs + - run: npx nx run-many --target=build --projects=tag:apps concurrency: group: build-${{ github.head_ref }} diff --git a/.prettierignore b/.prettierignore index f1869a534..c46bad5d9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,4 +12,5 @@ package-lock.json .angular /.nx/cache -/.nx/workspace-data \ No newline at end of file +/.nx/workspace-data +CHANGELOG.md diff --git a/.release-it.json b/.release-it.json index f112cf01e..022c212a3 100644 --- a/.release-it.json +++ b/.release-it.json @@ -23,7 +23,7 @@ } }, "hooks": { - "after:bump": "npx nx run-many --target=build --output-style=stream && npx nx run-many --target=publish --output-style=stream", + "after:bump": "npx nx run-many --target=publish --projects=tag:libs", "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}." } } diff --git a/apps/cdk-demo/project.json b/apps/cdk-demo/project.json index 679231376..c39eded3f 100644 --- a/apps/cdk-demo/project.json +++ b/apps/cdk-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/cdk-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/excel-demo/project.json b/apps/excel-demo/project.json index 691da5dea..9ad8adf99 100644 --- a/apps/excel-demo/project.json +++ b/apps/excel-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/excel-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/flex-layout-demo/project.json b/apps/flex-layout-demo/project.json index b075b3272..72af6c053 100644 --- a/apps/flex-layout-demo/project.json +++ b/apps/flex-layout-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/flex-layout-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/http-demo/project.json b/apps/http-demo/project.json index bbd7e6723..15ee06493 100644 --- a/apps/http-demo/project.json +++ b/apps/http-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/http-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/logger-demo/project.json b/apps/logger-demo/project.json index 5c1e10bb4..e48977a3d 100644 --- a/apps/logger-demo/project.json +++ b/apps/logger-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/logger-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/ngxs-demo/project.json b/apps/ngxs-demo/project.json index 682cc0fb0..bc16fce25 100644 --- a/apps/ngxs-demo/project.json +++ b/apps/ngxs-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/ngxs-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/tooltip-demo/project.json b/apps/tooltip-demo/project.json index e01313d49..bd69b26f1 100644 --- a/apps/tooltip-demo/project.json +++ b/apps/tooltip-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/tooltip-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/virtual-table-demo/project.json b/apps/virtual-table-demo/project.json index 7e528a42a..8853546bd 100644 --- a/apps/virtual-table-demo/project.json +++ b/apps/virtual-table-demo/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/virtual-table-demo/", "projectType": "application", + "tags": ["apps"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/libs/cdk/package.json b/libs/cdk/package.json index 55a4165b9..8d11b9262 100644 --- a/libs/cdk/package.json +++ b/libs/cdk/package.json @@ -1,6 +1,6 @@ { "name": "@angular-ru/cdk", - "version": "16.0.0", + "version": "18.0.0", "description": "Angular-RU package", "homepage": "https://github.com/Angular-RU/angular-ru-sdk/tree/master/libs/cdk#readme", "bugs": "https://github.com/Angular-RU/angular-ru-sdk/issues", diff --git a/libs/cdk/project.json b/libs/cdk/project.json index da79d679c..3331cc45b 100644 --- a/libs/cdk/project.json +++ b/libs/cdk/project.json @@ -3,20 +3,27 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/cdk/", "projectType": "library", + "tags": ["libs"], "targets": { "build": { "executor": "@angular-devkit/build-angular:ng-packagr", "options": { "tsConfig": "tsconfig.lib.json", - "project": "libs/cdk/ng-package.json" + "project": "libs/{projectName}/ng-package.json" }, - "outputs": ["{projectRoot}/dist/cdk"] + "outputs": ["{projectRoot}/dist/{projectName}"] }, "publish": { "executor": "nx:run-commands", "options": { - "command": "npm publish ./dist/cdk --ignore-scripts || echo \"already published\"" - } + "command": "npm publish ./dist/{projectName} --ignore-scripts || echo \"already published\"" + }, + "dependsOn": [ + { + "target": "build", + "params": "ignore" + } + ] } } } diff --git a/libs/ngxs/package.json b/libs/ngxs/package.json index 408ea7c30..5db7053ba 100644 --- a/libs/ngxs/package.json +++ b/libs/ngxs/package.json @@ -1,6 +1,6 @@ { "name": "@angular-ru/ngxs", - "version": "16.0.0", + "version": "18.0.0", "description": "Angular-RU package", "homepage": "https://github.com/Angular-RU/angular-ru-sdk/tree/master/libs/cdk#readme", "bugs": "https://github.com/Angular-RU/angular-ru-sdk/issues", diff --git a/libs/ngxs/project.json b/libs/ngxs/project.json index ef7343d80..1a3462975 100644 --- a/libs/ngxs/project.json +++ b/libs/ngxs/project.json @@ -3,26 +3,34 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/ngxs/", "projectType": "library", + "tags": ["libs"], "targets": { "build": { "executor": "@angular-devkit/build-angular:ng-packagr", "options": { "tsConfig": "tsconfig.lib.json", - "project": "libs/ngxs/ng-package.json" + "project": "libs/{projectName}/ng-package.json" }, - "outputs": ["{projectRoot}/dist/ngxs"], + "outputs": ["{projectRoot}/dist/{projectName}"], "dependsOn": [ { + "dependencies": true, "target": "build", - "dependencies": true + "params": "ignore" } ] }, "publish": { "executor": "nx:run-commands", "options": { - "command": "npm publish ./node_modules/@angular-ru/ngxs --ignore-scripts || echo \"already published\"" - } + "command": "npm publish ./dist/{projectName} --ignore-scripts || echo \"already published\"" + }, + "dependsOn": [ + { + "target": "build", + "params": "ignore" + } + ] } } } diff --git a/package-lock.json b/package-lock.json index e57c449c8..abdd5cf4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ }, "libs/cdk": { "name": "@angular-ru/cdk", - "version": "16.0.0", + "version": "18.0.0", "license": "MIT", "peerDependencies": { "@angular/cdk": ">=13.0.0", @@ -72,18 +72,18 @@ }, "libs/ngxs": { "name": "@angular-ru/ngxs", - "version": "16.0.0", + "version": "18.0.0", "license": "MIT" }, "libs/type-declarations": { "name": "@angular-ru/type-declarations", - "version": "16.0.0", + "version": "18.0.0", "extraneous": true, "license": "MIT" }, "libs/typescript": { "name": "@angular-ru/typescript", - "version": "16.0.0", + "version": "18.0.0", "extraneous": true, "license": "MIT" }, @@ -12539,7 +12539,7 @@ } }, "node_modules/dotenv": { - "version": "16.4.5", + "version": "18.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "dev": true, @@ -26927,7 +26927,7 @@ } }, "node_modules/stylelint": { - "version": "16.6.1", + "version": "18.0.0", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", "dev": true,