Skip to content

Commit

Permalink
feat: add support for Angular 18 (#2419)
Browse files Browse the repository at this point in the history
* feat: add support for Angular 18

BREAKING CHANGE: Added support for Angular 18 and removed support for Angular 17
  • Loading branch information
johnhwhite authored Jul 3, 2024
1 parent a7565c7 commit 7a53bb5
Show file tree
Hide file tree
Showing 73 changed files with 9,571 additions and 7,895 deletions.
9 changes: 6 additions & 3 deletions apps/integration/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { HttpClientModule } from '@angular/common/http';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
Expand All @@ -14,12 +17,12 @@ import { SkyThemeSelectorModule } from './shared/theme-selector/theme-selector.m

@NgModule({
declarations: [AppComponent],
bootstrap: [AppComponent],
imports: [
AppRoutingModule,
BrowserAnimationsModule,
BrowserModule,
FormsModule,
HttpClientModule,
ReactiveFormsModule,
SkyFluidGridModule,
SkyI18nModule,
Expand All @@ -33,7 +36,7 @@ import { SkyThemeSelectorModule } from './shared/theme-selector/theme-selector.m
getUrl: (path: string): string => `/assets/${path}`,
},
},
provideHttpClient(withInterceptorsFromDi()),
],
bootstrap: [AppComponent],
})
export class AppModule {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { HttpClientTestingModule } from '@angular/common/http/testing';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { RendererFactory2 } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
Expand Down Expand Up @@ -66,9 +70,12 @@ describe('Modals with viewkept toolbars', () => {
NoopAnimationsModule,
RouterTestingModule,
ModalViewkeptToolbarsModule,
HttpClientTestingModule,
],
providers: [SkyThemeService],
providers: [
SkyThemeService,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting(),
],
});

fixture = TestBed.createComponent(ModalViewkeptToolbarsComponent);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { CommonModule } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { NgModule } from '@angular/core';
import { SkyIllustrationResolverService } from '@skyux/indicators';

Expand All @@ -8,17 +11,13 @@ import { IllustrationRoutingModule } from './illustration-routing.module';
import { IllustrationComponent } from './illustration.component';

@NgModule({
imports: [
CommonModule,
HttpClientModule,
IllustrationComponent,
IllustrationRoutingModule,
],
imports: [CommonModule, IllustrationComponent, IllustrationRoutingModule],
providers: [
{
provide: SkyIllustrationResolverService,
useClass: IllustrationResolverService,
},
provideHttpClient(withInterceptorsFromDi()),
],
})
export class IllustrationModule {
Expand Down
6 changes: 3 additions & 3 deletions libs/components/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
10 changes: 5 additions & 5 deletions libs/components/action-bars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/animations": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/animations": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@skyux-sdk/testing": "0.0.0-PLACEHOLDER",
"@skyux/animations": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
Expand All @@ -30,6 +30,6 @@
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/ag-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
}
},
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"@skyux/autonumeric": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/data-manager": "0.0.0-PLACEHOLDER",
Expand All @@ -40,6 +40,6 @@
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
6 changes: 3 additions & 3 deletions libs/components/angular-tree-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@blackbaud/angular-tree-component": "^1.0.0",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/forms": "0.0.0-PLACEHOLDER",
Expand All @@ -27,6 +27,6 @@
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/animations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/animations": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4"
"@angular/animations": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
6 changes: 3 additions & 3 deletions libs/components/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4"
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/autonumeric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"autonumeric": "^4.10.5"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@skyux-sdk/testing": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/errors": "0.0.0-PLACEHOLDER",
Expand All @@ -27,6 +27,6 @@
"@skyux/theme": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
12 changes: 6 additions & 6 deletions libs/components/colorpicker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/cdk": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/cdk": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@skyux-sdk/testing": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/forms": "0.0.0-PLACEHOLDER",
Expand All @@ -31,6 +31,6 @@
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
6 changes: 3 additions & 3 deletions libs/components/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4"
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
14 changes: 7 additions & 7 deletions libs/components/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/cdk": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/router": "^17.3.4",
"@angular/cdk": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@angular/router": "^18.0.5",
"@skyux/i18n": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/data-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/forms": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "0.0.0-PLACEHOLDER",
Expand All @@ -30,6 +30,6 @@
"@skyux/modals": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
12 changes: 6 additions & 6 deletions libs/components/datetime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/cdk": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/cdk": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/forms": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@skyux-sdk/testing": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/forms": "0.0.0-PLACEHOLDER",
Expand All @@ -32,6 +32,6 @@
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
8 changes: 4 additions & 4 deletions libs/components/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/platform-browser": "^18.0.5",
"@skyux-sdk/testing": "0.0.0-PLACEHOLDER",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "0.0.0-PLACEHOLDER",
"@skyux/modals": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
12 changes: 6 additions & 6 deletions libs/components/flyout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
},
"homepage": "https://github.com/blackbaud/skyux#readme",
"peerDependencies": {
"@angular/animations": "^17.3.4",
"@angular/cdk": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/router": "^17.3.4",
"@angular/animations": "^18.0.5",
"@angular/cdk": "^18.0.5",
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
"@angular/router": "^18.0.5",
"@skyux/core": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "0.0.0-PLACEHOLDER",
"@skyux/router": "0.0.0-PLACEHOLDER",
"@skyux/theme": "0.0.0-PLACEHOLDER"
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
"tslib": "^2.6.2"
"tslib": "^2.6.3"
}
}
Loading

0 comments on commit 7a53bb5

Please sign in to comment.