diff --git a/.github/actions/adf-linking/action.yml b/.github/actions/adf-linking/action.yml index f5f76c0dee..ff6504823c 100644 --- a/.github/actions/adf-linking/action.yml +++ b/.github/actions/adf-linking/action.yml @@ -9,7 +9,7 @@ runs: shell: bash run: | if [[ $COMMIT_MESSAGE == *"[link-adf:"* ]]; then - echo "BUILD_OPTS=--configuration=adfprod,e2e" >> $GITHUB_ENV + echo "BUILD_OPTS=--configuration=adf" >> $GITHUB_ENV echo "TEST_OPTS=--configuration=adfprod" >> $GITHUB_ENV echo "E2E_PROTRACTOR_OPTS=--with-local-adf" >> $GITHUB_ENV echo "E2E_TSCONFIG=tsconfig.e2e.adf.json" >> $GITHUB_ENV diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index facd300f29..a85ca387a1 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,7 +7,7 @@ runs: - name: setup variables shell: bash run: | - echo "BUILD_OPTS=--configuration=production,e2e" >> $GITHUB_ENV + echo "BUILD_OPTS=--configuration=production" >> $GITHUB_ENV echo "TEST_OPTS=" >> $GITHUB_ENV echo "E2E_PROTRACTOR_OPTS=" >> $GITHUB_ENV echo "E2E_TSCONFIG=tsconfig.e2e.json" >> $GITHUB_ENV diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html index a2b38e9c7a..8c015c752f 100644 --- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html @@ -20,7 +20,7 @@

{{ 'ACA_FOLDER_RULES.ACTIONS.MANAGE_RULES' | translat - + folder

{{ (folderInfo$ | async).name }}:{{'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.BREADCRUMB.RULES' | translate}}

diff --git a/projects/aca-content/project.json b/projects/aca-content/project.json index 471e3fa152..68d62500c8 100644 --- a/projects/aca-content/project.json +++ b/projects/aca-content/project.json @@ -16,6 +16,9 @@ }, "development": { "tsConfig": "projects/aca-content/tsconfig.lib.json" + }, + "adf": { + "tsConfig": "projects/aca-content/tsconfig.lib.adfprod.json" } }, "defaultConfiguration": "production", diff --git a/projects/aca-content/tsconfig.lib.adf.json b/projects/aca-content/tsconfig.lib.adf.json new file mode 100644 index 0000000000..8dbf167a84 --- /dev/null +++ b/projects/aca-content/tsconfig.lib.adf.json @@ -0,0 +1,32 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "../../tsconfig.adf.json", + "compilerOptions": { + "outDir": "../../out-tsc/lib", + "target": "es2020", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "types": [], + "lib": [ + "dom", + "es2020" + ] + }, + "angularCompilerOptions": { + "skipTemplateCodegen": true, + "strictMetadataEmit": true, + "enableResourceInlining": true, + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/projects/aca-content/tsconfig.lib.adfprod.json b/projects/aca-content/tsconfig.lib.adfprod.json new file mode 100644 index 0000000000..af4a149739 --- /dev/null +++ b/projects/aca-content/tsconfig.lib.adfprod.json @@ -0,0 +1,15 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.lib.adf.json", + "compilerOptions": { + "declarationMap": false, + "paths": { + "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"], + "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"], + "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"] + }, + }, + "angularCompilerOptions": { + "compilationMode": "partial" + } +} diff --git a/projects/aca-shared/project.json b/projects/aca-shared/project.json index 0d1a1b5644..5a80f3b2d1 100644 --- a/projects/aca-shared/project.json +++ b/projects/aca-shared/project.json @@ -14,8 +14,12 @@ "configurations": { "production": { "tsConfig": "projects/aca-shared/tsconfig.lib.prod.json" + }, + "adf": { + "tsConfig": "projects/aca-shared/tsconfig.lib.adf.json" } }, + "defaultConfiguration": "production", "outputs": ["{workspaceRoot}/dist/@alfresco/aca-shared"] }, diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html index 5f07ca0f5d..0a38aa6df0 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.html @@ -2,7 +2,7 @@ - + diff --git a/projects/aca-shared/tsconfig.lib.adf.json b/projects/aca-shared/tsconfig.lib.adf.json new file mode 100644 index 0000000000..c1f7c5c210 --- /dev/null +++ b/projects/aca-shared/tsconfig.lib.adf.json @@ -0,0 +1,26 @@ +{ + "extends": "../../tsconfig.adf.json", + "compilerOptions": { + "outDir": "../../out-tsc/lib", + "declarationMap": true, + "target": "es2020", + "module": "es2015", + "moduleResolution": "node", + "declaration": true, + "sourceMap": true, + "inlineSources": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "types": [], + "lib": ["dom", "es2018"] + }, + "angularCompilerOptions": { + "skipTemplateCodegen": true, + "strictMetadataEmit": true, + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true, + "enableResourceInlining": true + }, + "exclude": ["test.ts", "**/*.spec.ts"] +} diff --git a/projects/aca-shared/tsconfig.lib.adfprod.json b/projects/aca-shared/tsconfig.lib.adfprod.json new file mode 100644 index 0000000000..8dbddb4d27 --- /dev/null +++ b/projects/aca-shared/tsconfig.lib.adfprod.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.lib.adf.json", + "compilerOptions": { + "declarationMap": false + }, + "angularCompilerOptions": { + "compilationMode": "partial" + } +} diff --git a/tsconfig.adf.json b/tsconfig.adf.json index 015743b3b9..62a81409af 100644 --- a/tsconfig.adf.json +++ b/tsconfig.adf.json @@ -21,18 +21,18 @@ "typeRoots": ["node_modules/@types"], "lib": ["es2019", "dom"], "paths": { - "@alfresco/adf-testing": ["../alfresco-ng2-components/lib/testing"], - "@alfresco/adf-testing/shared": ["../alfresco-ng2-components/lib/testing/src/lib/shared"], + "@alfresco/adf-testing": ["../../alfresco-ng2-components/lib/testing"], + "@alfresco/adf-testing/shared": ["../../alfresco-ng2-components/lib/testing/src/lib/shared"], "@alfresco/playwright-shared": ["projects/aca-playwright-shared/src/index.ts"], - "@alfresco/adf-core": ["../alfresco-ng2-components/lib/core"], - "@alfresco/adf-core/*": ["../alfresco-ng2-components/lib/core/*/public-api.ts"], - "@alfresco/adf-core/shell": ["../alfresco-ng2-components/lib/core/shell/src/index.ts"], - "@alfresco/adf-core/auth": ["../alfresco-ng2-components/lib/core/auth/src/index.ts"], - "@alfresco/adf-core/api": ["../alfresco-ng2-components/lib/core/api/src/index.ts"], - "@alfresco/adf-extensions": ["../alfresco-ng2-components/lib/extensions"], - "@alfresco/adf-content-services": ["../alfresco-ng2-components/lib/content-services"], - "@alfresco/adf-process-services-cloud": ["../alfresco-ng2-components/lib/process-services-cloud"], - "@alfresco/adf-process-services": ["../alfresco-ng2-components/lib/process-services"], + "@alfresco/adf-core": ["../../alfresco-ng2-components/lib/core"], + "@alfresco/adf-core/*": ["../../alfresco-ng2-components/lib/core/*/public-api.ts"], + "@alfresco/adf-core/shell": ["../../alfresco-ng2-components/lib/core/shell/src/index.ts"], + "@alfresco/adf-core/auth": ["../../alfresco-ng2-components/lib/core/auth/src/index.ts"], + "@alfresco/adf-core/api": ["../../alfresco-ng2-components/lib/core/api/src/index.ts"], + "@alfresco/adf-extensions": ["../../alfresco-ng2-components/lib/extensions"], + "@alfresco/adf-content-services": ["../../alfresco-ng2-components/lib/content-services"], + "@alfresco/adf-process-services-cloud": ["../../alfresco-ng2-components/lib/process-services-cloud"], + "@alfresco/adf-process-services": ["../../alfresco-ng2-components/lib/process-services"], "@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"], "@alfresco/aca-shared/store": ["projects/aca-shared/store/src/public-api.ts"], "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],