From b052e4e99867d8cb9c0e422064cdb65b4e8968b2 Mon Sep 17 00:00:00 2001 From: Bartosz Sekula Date: Tue, 26 Mar 2024 12:03:45 +0100 Subject: [PATCH] update build targets + CR --- .github/workflows/release-branch.yml | 1 + .github/workflows/release.yml | 1 + angular.json | 30 +++++++------------ .../src/lib/app-config/app-config.service.ts | 1 - .../models/{basicAuth.ts => basic-auth.ts} | 0 lib/core/src/public-api.ts | 2 +- .../attach-file-cloud-widget.component.ts | 3 +- .../services/activiti-alfresco.service.ts | 3 +- ...ttach-file-widget-dialog.component.spec.ts | 3 +- .../attach-file-widget-dialog.component.ts | 3 +- .../services/process-upload.service.ts | 3 +- .../task-list/services/task-upload.service.ts | 3 +- 12 files changed, 19 insertions(+), 34 deletions(-) rename lib/core/src/lib/models/{basicAuth.ts => basic-auth.ts} (100%) diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index d65a1b25655..f5839b7022c 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -129,6 +129,7 @@ jobs: ./scripts/update-version.sh -gnu || exit 1; npx nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache npx nx affected $NX_CALCULATION_FLAGS --target=pretheme + npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 name: release libraries GH registry with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c31cfe36d99..aef9901029f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -188,6 +188,7 @@ jobs: ./scripts/github/build/bumpversion.sh npx nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache npx nx affected $NX_CALCULATION_FLAGS --target=pretheme + npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 name: release libraries GH registry with: diff --git a/angular.json b/angular.json index a63125b1e3c..eb799470867 100644 --- a/angular.json +++ b/angular.json @@ -320,26 +320,6 @@ "prefix": "adf", "architect": { "build": { - "builder": "nx:run-commands", - "options": { - "commands": [ - "ng run core:build-lib", - "ng run core:build-schematics" - ], - "parallel": false - } - }, - "build-schematics": { - "builder": "nx:run-commands", - "options": { - "commands": [ - "npx tsc -p lib/core/tsconfig.schematics.json", - "cp lib/core/schematics/migrations/collection.json dist/libs/core/schematics/migrations/collection.json" - ], - "parallel": false - } - }, - "build-lib": { "builder": "@angular-devkit/build-angular:ng-packagr", "options": { "tsConfig": "lib/core/tsconfig.lib.json", @@ -357,6 +337,16 @@ }, "defaultConfiguration": "production" }, + "build-schematics": { + "executor": "nx:run-commands", + "options": { + "commands": [ + "npx tsc -p lib/core/tsconfig.schematics.json", + "cp lib/core/schematics/migrations/collection.json dist/libs/core/schematics/migrations/collection.json" + ], + "parallel": false + } + }, "test": { "builder": "@angular-devkit/build-angular:karma", "options": { diff --git a/lib/core/src/lib/app-config/app-config.service.ts b/lib/core/src/lib/app-config/app-config.service.ts index e06d808a50d..acf72334c9c 100644 --- a/lib/core/src/lib/app-config/app-config.service.ts +++ b/lib/core/src/lib/app-config/app-config.service.ts @@ -1,4 +1,3 @@ -/* eslint-disable arrow-body-style */ /*! * @license * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. diff --git a/lib/core/src/lib/models/basicAuth.ts b/lib/core/src/lib/models/basic-auth.ts similarity index 100% rename from lib/core/src/lib/models/basicAuth.ts rename to lib/core/src/lib/models/basic-auth.ts diff --git a/lib/core/src/public-api.ts b/lib/core/src/public-api.ts index fe481aecd2b..919af564f7f 100644 --- a/lib/core/src/public-api.ts +++ b/lib/core/src/public-api.ts @@ -60,4 +60,4 @@ export * from './lib/core.module'; export { AuthModule } from './lib/auth/oidc/auth.module'; /** @deprecated please use alfresco-api from \@alfresco/adf-content-services */ -export * from './lib/services/index'; \ No newline at end of file +export * from './lib/services/index'; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts index 7b75fb8f2f3..b45cc9f4df2 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts @@ -29,13 +29,12 @@ import { UploadWidgetContentLinkModel, DestinationFolderPath } from '@alfresco/adf-core'; -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { Node, NodesApi, RelatedContentRepresentation } from '@alfresco/js-api'; import { ContentCloudNodeSelectorService } from '../../../services/content-cloud-node-selector.service'; import { ProcessCloudContentService } from '../../../services/process-cloud-content.service'; import { UploadCloudWidgetComponent } from './upload-cloud.widget'; import { DestinationFolderPathModel, DestinationFolderPathType } from '../../../models/form-cloud-representation.model'; -import { ContentNodeSelectorPanelService, NewVersionUploaderDataAction, NewVersionUploaderDialogData, NewVersionUploaderService, VersionManagerUploadData } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, ContentNodeSelectorPanelService, NewVersionUploaderDataAction, NewVersionUploaderDialogData, NewVersionUploaderService, VersionManagerUploadData } from '@alfresco/adf-content-services'; export const RETRIEVE_METADATA_OPTION = 'retrieveMetadata'; export const ALIAS_ROOT_FOLDER = '-root-'; diff --git a/lib/process-services/src/lib/form/services/activiti-alfresco.service.ts b/lib/process-services/src/lib/form/services/activiti-alfresco.service.ts index 8af1e409d04..1a927165adf 100644 --- a/lib/process-services/src/lib/form/services/activiti-alfresco.service.ts +++ b/lib/process-services/src/lib/form/services/activiti-alfresco.service.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { LogService, ExternalContent } from '@alfresco/adf-core'; -import { SitesService } from '@alfresco/adf-content-services'; +import { SitesService, AlfrescoApiService } from '@alfresco/adf-content-services'; import { Injectable } from '@angular/core'; import { IntegrationAlfrescoOnPremiseApi, Node, RelatedContentRepresentation, ActivitiContentApi, AlfrescoEndpointRepresentation, AlfrescoContentRepresentation } from '@alfresco/js-api'; import { Observable, from, throwError } from 'rxjs'; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts index 2df59fe1f79..16ac581492c 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService, SitesService, NodesApiService } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, ContentModule, ContentNodeSelectorPanelComponent, DocumentListService, SitesService, NodesApiService } from '@alfresco/adf-content-services'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component'; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts index 1b0a4947076..630ff37b688 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { LoginDialogPanelComponent, TranslationService, AuthenticationService } from '@alfresco/adf-core'; import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface'; -import { DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services'; import { ExternalAlfrescoApiService } from '../../services/external-alfresco-api.service'; import { Node } from '@alfresco/js-api'; diff --git a/lib/process-services/src/lib/task-list/services/process-upload.service.ts b/lib/process-services/src/lib/task-list/services/process-upload.service.ts index 093331a61cb..7872b1db1db 100644 --- a/lib/process-services/src/lib/task-list/services/process-upload.service.ts +++ b/lib/process-services/src/lib/task-list/services/process-upload.service.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { AppConfigService } from '@alfresco/adf-core'; -import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services'; +import { DiscoveryApiService, UploadService, AlfrescoApiService } from '@alfresco/adf-content-services'; import { ActivitiContentApi, RelatedContentRepresentation } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; diff --git a/lib/process-services/src/lib/task-list/services/task-upload.service.ts b/lib/process-services/src/lib/task-list/services/task-upload.service.ts index c683ca590d9..7d0359b64e3 100644 --- a/lib/process-services/src/lib/task-list/services/task-upload.service.ts +++ b/lib/process-services/src/lib/task-list/services/task-upload.service.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { AppConfigService } from '@alfresco/adf-core'; -import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services'; +import { DiscoveryApiService, UploadService, AlfrescoApiService } from '@alfresco/adf-content-services'; import { Injectable } from '@angular/core'; import { ActivitiContentApi, RelatedContentRepresentation } from '@alfresco/js-api';