Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -11,7 +11,6 @@ if [[ -z "$TAG" ]]; then
fi

export PROJECTS=(
'aca-about'
'aca-content'
'aca-folder-rules'
'adf-office-services-ext'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if [[ -z "$VERSION" ]]; then
fi

export PROJECTS=(
'aca-about'
'aca-content'
'aca-folder-rules'
'adf-office-services-ext'
Expand Down
2 changes: 1 addition & 1 deletion app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
{
"glob": "about.plugin.json",
"input": "projects/aca-about/assets",
"input": "projects/aca-content/about/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 @@ -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';
Expand Down
23 changes: 0 additions & 23 deletions projects/aca-about/.eslintrc.js

This file was deleted.

68 changes: 0 additions & 68 deletions projects/aca-about/README.md

This file was deleted.

15 changes: 0 additions & 15 deletions projects/aca-about/karma.conf.js

This file was deleted.

11 changes: 0 additions & 11 deletions projects/aca-about/ng-package.json

This file was deleted.

19 changes: 0 additions & 19 deletions projects/aca-about/package.json

This file was deleted.

49 changes: 0 additions & 49 deletions projects/aca-about/project.json

This file was deleted.

50 changes: 0 additions & 50 deletions projects/aca-about/src/test.ts

This file was deleted.

25 changes: 0 additions & 25 deletions projects/aca-about/tsconfig.lib.json

This file was deleted.

15 changes: 0 additions & 15 deletions projects/aca-about/tsconfig.lib.prod.json

This file was deleted.

17 changes: 0 additions & 17 deletions projects/aca-about/tsconfig.spec.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 5 additions & 0 deletions projects/aca-content/about/ng-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"lib": {
"entryFile": "src/public-api.ts"
}
}
4 changes: 4 additions & 0 deletions projects/aca-content/about/src/about.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
adf-about {
padding: 10px;
width: 100%;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'])]
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
1 change: 1 addition & 0 deletions projects/aca-content/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"input": "./src/lib/ui/",
"output": "ui"
},
"about/assets",
"assets"
]
}
Loading