Skip to content

Commit

Permalink
[ACS-4539] Make ms-office as secondary point of aca-content (#3180)
Browse files Browse the repository at this point in the history
* [ACS-4539] Make ms-office as secondary point of aca-content

* [ACA-4539] Fix tsconfig path

* [ACS-4539] Run ms-office unit tests as part of aca-content
  • Loading branch information
MichalKinas committed May 10, 2023
1 parent 6794ea5 commit 3ca4a91
Show file tree
Hide file tree
Showing 53 changed files with 17,613 additions and 26,635 deletions.
1 change: 0 additions & 1 deletion .github/actions/publish-libs/npm-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ fi
export PROJECTS=(
'aca-content'
'aca-folder-rules'
'adf-office-services-ext'
'aca-preview'
'aca-shared'
'aca-viewer'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ fi
export PROJECTS=(
'aca-content'
'aca-folder-rules'
'adf-office-services-ext'
'aca-preview'
'aca-shared'
'aca-viewer'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
matrix:
unit-tests:
- name: "aca-content"
- name: "adf-office-services-ext"
- name: "aca-shared"
- name: "aca-folder-rules"
- name: "aca-preview"
Expand Down
10 changes: 5 additions & 5 deletions app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-office-services-ext/assets",
"output": "./assets/adf-office-services-ext"
"input": "node_modules/@alfresco/aca-content/ms-office/assets",
"output": "./assets/ms-office"
},
{
"glob": "**/*",
"input": "projects/adf-office-services-ext/assets",
"output": "./assets/adf-office-services-ext"
"input": "projects/aca-content/ms-office/assets",
"output": "./assets/ms-office"
},
{
"glob": "aos.plugin.json",
"input": "projects/adf-office-services-ext/assets",
"input": "projects/aca-content/ms-office/assets",
"output": "./assets/plugins"
},
{
Expand Down
2 changes: 1 addition & 1 deletion app/src/app/extensions.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

import { NgModule } from '@angular/core';
import { AosExtensionModule } from '@alfresco/adf-office-services-ext';
import { AosExtensionModule } from '@alfresco/aca-content/ms-office';
import { AcaAboutModule } from '@alfresco/aca-content/about';
import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
import { environment } from '../environments/environment';
Expand Down

0 comments on commit 3ca4a91

Please sign in to comment.