update build targets + CR

Alfresco · Mar 28, 2024 · b052e4e · b052e4e
1 parent 461eec8
commit b052e4e
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → lib/core/src/lib/models/basic-auth.ts b/lib/core/src/lib/models/basicAuth.ts → lib/core/src/lib/models/basic-auth.ts
diff --git 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';
+export * from './lib/services/index';
diff --git a/...s-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/...s-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
@@ -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/...-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts b/...-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/...ocess-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts b/...ocess-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
@@ -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
@@ -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';