Skip to content

Commit 6c8916e

Browse files
committed
chore: sync with branch v5.0
2 parents d4f5b9e + 9b0889c commit 6c8916e

File tree

235 files changed

+4099
-5823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+4099
-5823
lines changed

Diff for: .github/workflows/build-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88
branches:
99
- main
10-
- v4
10+
- v5.*
1111
schedule:
1212
- # build runs every weekday at 4:15AM UTC
1313
- cron: '15 4 * * *'

Diff for: angular.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,15 @@
4040
"src/scss/styles.scss"
4141
],
4242
"scripts": [],
43-
"allowedCommonJsDependencies": [
44-
"chart.js"
45-
]
43+
"allowedCommonJsDependencies": []
4644
},
4745
"configurations": {
4846
"production": {
4947
"budgets": [
5048
{
5149
"type": "initial",
52-
"maximumWarning": "1500kb",
53-
"maximumError": "6mb"
50+
"maximumWarning": "6mb",
51+
"maximumError": "7mb"
5452
},
5553
{
5654
"type": "anyComponentStyle",

Diff for: package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"@angular/platform-browser": "^17.3.1",
2929
"@angular/platform-browser-dynamic": "^17.3.1",
3030
"@angular/router": "^17.3.1",
31-
"@coreui/angular": "~4.7.18",
32-
"@coreui/angular-chartjs": "~4.7.18",
33-
"@coreui/chartjs": "^3.1.2",
34-
"@coreui/coreui": "~4.2.6",
31+
"@coreui/angular": "~5.0.0",
32+
"@coreui/angular-chartjs": "~5.0.0",
33+
"@coreui/chartjs": "~4.0.0",
34+
"@coreui/coreui": "~5.0.0",
3535
"@coreui/icons": "^3.0.1",
36-
"@coreui/icons-angular": "~4.7.18",
36+
"@coreui/icons-angular": "~5.0.0",
3737
"@coreui/utils": "^2.0.2",
38-
"chart.js": "^3.9.1",
38+
"chart.js": "^4.4.2",
3939
"lodash-es": "^4.17.21",
4040
"ngx-scrollbar": "^13.0.3",
4141
"rxjs": "~7.8.1",

Diff for: src/app/app-routing.module.ts

-118
This file was deleted.

Diff for: src/app/app.component.spec.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ import { AppComponent } from './app.component';
55
describe('AppComponent', () => {
66
beforeEach(async () => {
77
await TestBed.configureTestingModule({
8-
imports: [
9-
RouterTestingModule
10-
],
11-
declarations: [
8+
imports: [
9+
RouterTestingModule,
1210
AppComponent
13-
],
14-
}).compileComponents();
11+
],
12+
}).compileComponents();
1513
});
1614

1715
it('should create the app', () => {
@@ -20,9 +18,9 @@ describe('AppComponent', () => {
2018
expect(app).toBeTruthy();
2119
});
2220

23-
it(`should have as title 'CoreUI Free Angular Admin Template'`, () => {
21+
it(`should have as title 'CoreUI Angular Admin Template'`, () => {
2422
const fixture = TestBed.createComponent(AppComponent);
2523
const app = fixture.componentInstance;
26-
expect(app.title).toEqual('CoreUI Free Angular Admin Template');
24+
expect(app.title).toEqual('CoreUI Angular Admin Template');
2725
});
2826
});

Diff for: src/app/app.component.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { Router, NavigationEnd } from '@angular/router';
2+
import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
3+
import { Title } from '@angular/platform-browser';
34

45
import { IconSetService } from '@coreui/icons-angular';
56
import { iconSubset } from './icons/icon-subset';
6-
import { Title } from '@angular/platform-browser';
77

88
@Component({
99
selector: 'app-root',
10-
template: '<router-outlet></router-outlet>',
10+
template: '<router-outlet />',
11+
standalone: true,
12+
imports: [RouterOutlet]
1113
})
1214
export class AppComponent implements OnInit {
13-
title = 'CoreUI Free Angular Admin Template';
15+
title = 'CoreUI Angular Admin Template';
1416

1517
constructor(
1618
private router: Router,
1719
private titleService: Title,
1820
private iconSetService: IconSetService
1921
) {
20-
titleService.setTitle(this.title);
22+
this.titleService.setTitle(this.title);
2123
// iconSet singleton
22-
iconSetService.icons = { ...iconSubset };
24+
this.iconSetService.icons = { ...iconSubset };
2325
}
2426

2527
ngOnInit(): void {

Diff for: src/app/app.config.ts

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
2+
import { provideAnimations } from '@angular/platform-browser/animations';
3+
import {
4+
provideRouter,
5+
withEnabledBlockingInitialNavigation,
6+
withHashLocation,
7+
withInMemoryScrolling,
8+
withRouterConfig,
9+
withViewTransitions
10+
} from '@angular/router';
11+
12+
import { DropdownModule, SidebarModule } from '@coreui/angular';
13+
import { IconSetService } from '@coreui/icons-angular';
14+
import { routes } from './app.routes';
15+
16+
export const appConfig: ApplicationConfig = {
17+
providers: [
18+
provideRouter(routes,
19+
withRouterConfig({
20+
onSameUrlNavigation: 'reload'
21+
}),
22+
withInMemoryScrolling({
23+
scrollPositionRestoration: 'top',
24+
anchorScrolling: 'enabled'
25+
}),
26+
withEnabledBlockingInitialNavigation(),
27+
withViewTransitions(),
28+
withHashLocation()
29+
),
30+
importProvidersFrom(SidebarModule, DropdownModule),
31+
IconSetService,
32+
provideAnimations()
33+
]
34+
};

Diff for: src/app/app.module.ts

-88
This file was deleted.

0 commit comments

Comments
 (0)