Skip to content

Commit

Permalink
fix: update libs, edit webpackconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
kim.tran committed Apr 9, 2024
1 parent 263868d commit 5912591
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 44 deletions.
106 changes: 79 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
"@ngneat/falso": "^7.2.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@onecx/accelerator": "^4.11.0",
"@onecx/integration-interface": "^4.11.0",
"@onecx/keycloak-auth": "^4.11.0",
"@onecx/portal-integration-angular": "^4.11.0",
"@onecx/portal-layout-styles": "^4.11.0",
"@onecx/accelerator": "^4.14.3",
"@onecx/integration-interface": "^4.14.3",
"@onecx/keycloak-auth": "^4.14.3",
"@onecx/portal-integration-angular": "^4.14.3",
"@onecx/portal-layout-styles": "^4.14.3",
"file-saver": "^2.0.5",
"ngx-color": "^8.0.3",
"primeflex": "^3.3.1",
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/image-container/image-container.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
[id]="id"
*ngIf="imageUrl && !displayPlaceHolder"
[class]="'image-object image-' + (small ? 'sm' : 'lg') + ' sm:image-lg vertical-align-middle'"
[src]="imageUrl"
[ocxSrc]="imageUrl"
(error)="onImageError()"
alt="Logo"
/>
<img
[id]="id"
*ngIf="!imageUrl || displayPlaceHolder"
[class]="'image-object image-' + (small ? 'sm' : 'lg') + ' sm:image-lg vertical-align-middle'"
[src]="defaultImageUrl"
[ocxSrc]="defaultImageUrl"
alt="Logo"
/>
17 changes: 7 additions & 10 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,32 @@ const config = withModuleFederationPlugin({
'./OneCXProductStoreModule': 'src/app/onecx-product-store-remote.module.ts'
},
shared: share({
'@angular/core': { singleton: true, strictVersion: true, requiredVersion: 'auto' },
'@angular/core': { singleton: true, requiredVersion: 'auto' },
'@angular/forms': {
singleton: true,
strictVersion: true,
requiredVersion: 'auto',
includeSecondaries: true,
eager: false
},
'@angular/common': {
singleton: true,
strictVersion: true,
requiredVersion: 'auto',
includeSecondaries: {
skip: ['@angular/common/http/testing']
}
},
'@angular/common/http': {
singleton: true,
strictVersion: true,
requiredVersion: 'auto',
includeSecondaries: true
},
rxjs: { singleton: true, strictVersion: true, requiredVersion: 'auto', includeSecondaries: true },
'@angular/router': { singleton: true, strictVersion: true, requiredVersion: 'auto', includeSecondaries: true },
'@ngx-translate/core': { singleton: true, strictVersion: false, requiredVersion: '^14.0.0' },
'@onecx/keycloak-auth': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/portal-integration-angular': { requiredVersion: 'auto', includeSecondaries: true },
'@angular/router': { singleton: true, requiredVersion: 'auto', includeSecondaries: true },
rxjs: { requiredVersion: 'auto', includeSecondaries: true },
'@ngx-translate/core': { singleton: true, requiredVersion: 'auto' },
'@onecx/accelerator': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/integration-interface': { requiredVersion: 'auto', includeSecondaries: true }
'@onecx/integration-interface': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/keycloak-auth': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/portal-integration-angular': { requiredVersion: 'auto', includeSecondaries: true }
}),
sharedMappings: ['@onecx/portal-integration-angular']
})
Expand Down

0 comments on commit 5912591

Please sign in to comment.