[ACS-4537] Make aca-about secondary entry of aca-content (#3179)

* break dependency on core module * convert about to secondary entry * Fixes after rebase * [ACS-4537] - Copy about assets --------- Co-authored-by: Denys Vuika <[email protected]>
Alfresco · May 9, 2023 · 6794ea5 · 6794ea5
1 parent 23814e1
commit 6794ea5
Show file tree

Hide file tree

Showing 27 changed files with 22 additions and 306 deletions.
diff --git a/.github/actions/publish-libs/npm-publish.sh b/.github/actions/publish-libs/npm-publish.sh
@@ -11,7 +11,6 @@ if [[ -z "$TAG" ]]; then
 fi
 
 export PROJECTS=(
-  'aca-about'
   'aca-content'
   'aca-folder-rules'
   'adf-office-services-ext'

diff --git a/.github/actions/update-library-versions/update-lib-versions.sh b/.github/actions/update-library-versions/update-lib-versions.sh
@@ -10,7 +10,6 @@ if [[ -z "$VERSION" ]]; then
 fi
 
 export PROJECTS=(
-  'aca-about'
   'aca-content'
   'aca-folder-rules'
   'adf-office-services-ext'

diff --git a/app/project.json b/app/project.json
@@ -74,7 +74,7 @@
           },
           {
             "glob": "about.plugin.json",
-            "input": "projects/aca-about/assets",
+            "input": "projects/aca-content/about/assets",
             "output": "./assets/plugins"
           },
           {

diff --git a/app/src/app/extensions.module.ts b/app/src/app/extensions.module.ts
@@ -24,7 +24,7 @@
 
 import { NgModule } from '@angular/core';
 import { AosExtensionModule } from '@alfresco/adf-office-services-ext';
-import { AcaAboutModule } from '@alfresco/aca-about';
+import { AcaAboutModule } from '@alfresco/aca-content/about';
 import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
 import { environment } from '../environments/environment';
 import packageJson from 'package.json';

diff --git a/projects/aca-about/.eslintrc.js b/projects/aca-about/.eslintrc.js
diff --git a/projects/aca-about/README.md b/projects/aca-about/README.md
diff --git a/projects/aca-about/karma.conf.js b/projects/aca-about/karma.conf.js
diff --git a/projects/aca-about/ng-package.json b/projects/aca-about/ng-package.json
diff --git a/projects/aca-about/package.json b/projects/aca-about/package.json
diff --git a/projects/aca-about/project.json b/projects/aca-about/project.json
diff --git a/projects/aca-about/src/test.ts b/projects/aca-about/src/test.ts
diff --git a/projects/aca-about/tsconfig.lib.json b/projects/aca-about/tsconfig.lib.json
diff --git a/projects/aca-about/tsconfig.lib.prod.json b/projects/aca-about/tsconfig.lib.prod.json
diff --git a/projects/aca-about/tsconfig.spec.json b/projects/aca-about/tsconfig.spec.json
diff --git a/projects/aca-about/assets/about.plugin.json → ...ca-content/about/assets/about.plugin.json b/projects/aca-about/assets/about.plugin.json → ...ca-content/about/assets/about.plugin.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "14157f82-6489-4187-9b68-1a5e38fadeca",
   "$name": "About Plugin",
   "$version": "0.0.1",

diff --git a/projects/aca-content/about/ng-package.json b/projects/aca-content/about/ng-package.json
@@ -0,0 +1,5 @@
+{
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
diff --git a/...ts/aca-about/src/lib/about.component.html → ...ca-content/about/src/about.component.html b/...ts/aca-about/src/lib/about.component.html → ...ca-content/about/src/about.component.html
diff --git a/projects/aca-content/about/src/about.component.scss b/projects/aca-content/about/src/about.component.scss
@@ -0,0 +1,4 @@
+adf-about {
+  padding: 10px;
+  width: 100%;
+}
diff --git a/...ects/aca-about/src/lib/about.component.ts → .../aca-content/about/src/about.component.ts b/...ects/aca-about/src/lib/about.component.ts → .../aca-content/about/src/about.component.ts
diff --git a/...cts/aca-about/src/lib/aca-about.module.ts → ...aca-content/about/src/aca-about.module.ts b/...cts/aca-about/src/lib/aca-about.module.ts → ...aca-content/about/src/aca-about.module.ts
@@ -25,16 +25,17 @@
 import { ModuleWithProviders, NgModule, Provider } from '@angular/core';
 import { AboutComponent } from './about.component';
 import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
 import { SharedModule, PageLayoutModule } from '@alfresco/aca-shared';
 
 import { ExtensionService, provideExtensionConfig } from '@alfresco/adf-extensions';
 import { DEV_MODE_TOKEN } from './dev-mode.tokens';
 import { PACKAGE_JSON } from './package-json.token';
+import { AboutModule } from '@alfresco/adf-core';
+import { TranslateModule } from '@ngx-translate/core';
 import { RouterModule } from '@angular/router';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, CoreModule.forChild(), SharedModule, PageLayoutModule],
+  imports: [CommonModule, RouterModule, TranslateModule, SharedModule, PageLayoutModule, AboutModule],
   declarations: [AboutComponent],
   providers: [provideExtensionConfig(['about.plugin.json'])]
 })

diff --git a/...ects/aca-about/src/lib/dev-mode.tokens.ts → .../aca-content/about/src/dev-mode.tokens.ts b/...ects/aca-about/src/lib/dev-mode.tokens.ts → .../aca-content/about/src/dev-mode.tokens.ts
diff --git a/...s/aca-about/src/lib/package-json.token.ts → ...a-content/about/src/package-json.token.ts b/...s/aca-about/src/lib/package-json.token.ts → ...a-content/about/src/package-json.token.ts
diff --git a/projects/aca-about/src/public-api.ts → projects/aca-content/about/src/public-api.ts b/projects/aca-about/src/public-api.ts → projects/aca-content/about/src/public-api.ts
@@ -22,6 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './lib/about.component';
-export * from './lib/aca-about.module';
-export * from './lib/package-json.token';
+export * from './about.component';
+export * from './aca-about.module';
+export * from './dev-mode.tokens';
+export * from './package-json.token';
diff --git a/projects/aca-content/ng-package.json b/projects/aca-content/ng-package.json
@@ -11,6 +11,7 @@
       "input": "./src/lib/ui/",
       "output": "ui"
     },
+    "about/assets",
     "assets"
   ]
 }