Skip to content

Commit c2b2873

Browse files
hoebbelsBhoebbelsB
authored
feat: upgrade to ng 18 (rx-angular#1730)
BREAKING CHANGE: bump peerDependency to @angular/core to ^18.0.0 * feat: upgrade to ng 18 * chore: add missing @angular/build dev dependency * chore: update CI to node 20
1 parent 52cdf79 commit c2b2873

File tree

65 files changed

+3562
-2095
lines changed

Some content is hidden

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

65 files changed

+3562
-2095
lines changed

‎.eslintrc.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@
7575
"selector": "typeParameter",
7676
"format": ["PascalCase"]
7777
}
78-
]
78+
],
79+
"@typescript-eslint/no-extra-semi": "error",
80+
"no-extra-semi": "off"
7981
}
8082
},
8183
{
@@ -86,7 +88,9 @@
8688
"plugin:@nx/javascript"
8789
],
8890
"rules": {
89-
"@typescript-eslint/no-non-null-assertion": "off"
91+
"@typescript-eslint/no-non-null-assertion": "off",
92+
"@typescript-eslint/no-extra-semi": "error",
93+
"no-extra-semi": "off"
9094
}
9195
}
9296
]

‎.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
node-version:
55
description: Node.js version
66
required: false
7-
default: '18.15.0' # latest working version for our CI
7+
default: '20.9.0' # latest working version for our CI
88
runs:
99
using: composite
1010
steps:

‎apps/demos/src/app/app-component/app-control-panel/app-control-panel.module.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { AppControlPanelComponent } from './app-control-panel.component';
44
import { MatExpansionModule } from '@angular/material/expansion';
5-
import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips';
5+
import { MatChipsModule } from '@angular/material/chips';
66
import { MatIconModule } from '@angular/material/icon';
77
import { ReactiveFormsModule } from '@angular/forms';
8-
import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
9-
import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
10-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
11-
import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
8+
import { MatFormFieldModule } from '@angular/material/form-field';
9+
import { MatSelectModule } from '@angular/material/select';
10+
import { MatButtonModule } from '@angular/material/button';
11+
import { MatListModule } from '@angular/material/list';
1212
import { RxLet } from '@rx-angular/template/let';
13-
import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
13+
import { MatCheckboxModule } from '@angular/material/checkbox';
1414
import { StrategySelectModule } from '../../shared/debug-helper/strategy-select';
15-
import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
15+
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
1616

1717
@NgModule({
1818
declarations: [AppControlPanelComponent],

‎apps/demos/src/app/app-shell/_app-shell.theme.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
$warn: map-get($theme, warn);
77
$background: map-get($theme, background);
88
$foreground: map-get($theme, foreground);
9-
$headerBg: mat.get-color-from-palette($primary);
10-
$headerColor: mat.get-color-from-palette($primary, default-contrast);
9+
$headerBg: mat.m2-get-color-from-palette($primary);
10+
$headerColor: mat.m2-get-color-from-palette($primary, default-contrast);
1111

1212
app-side-nav {
1313
.app-shell-sidenav-item {
1414
&.active {
15-
background-color: mat.get-color-from-palette($background, 'hover');
15+
background-color: mat.m2-get-color-from-palette($background, 'hover');
1616
}
1717
}
1818
}

‎apps/demos/src/app/app-shell/app-shell.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { CdkTreeModule } from '@angular/cdk/tree';
22
import { CommonModule } from '@angular/common';
33
import { NgModule } from '@angular/core';
4-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
4+
import { MatButtonModule } from '@angular/material/button';
55
import { MatIconModule } from '@angular/material/icon';
6-
import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
7-
import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
6+
import { MatListModule } from '@angular/material/list';
7+
import { MatSelectModule } from '@angular/material/select';
88
import { MatSidenavModule } from '@angular/material/sidenav';
99
import { MatToolbarModule } from '@angular/material/toolbar';
1010
import { RouterModule } from '@angular/router';

‎apps/demos/src/app/features/concepts/coalescing/coalescing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { RxUnpatch } from '@rx-angular/template/unpatch';
66

77
import { ROUTES } from './coalescing.routes';
88
import { CoalescingComponent } from './coalescing/coalescing.component';
9-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
9+
import { MatButtonModule } from '@angular/material/button';
1010
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
1111
import { StrategySelectModule } from '../../../shared/debug-helper/strategy-select';
1212

‎apps/demos/src/app/features/concepts/global-order/native-v/native-v.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { V1CComponent } from './v1-c.component';
99
import { V1EComponent } from './v1-e.component';
1010
import { V1FComponent } from './v1-f.component';
1111
import { V1HComponent } from './v1-h.component';
12-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
12+
import { MatButtonModule } from '@angular/material/button';
1313

1414
@NgModule({
1515
declarations: [

‎apps/demos/src/app/features/concepts/global-order/push-v/push-v.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { V2EComponent } from './v2-e.component';
99
import { V2FComponent } from './v2-f.component';
1010
import { V2HComponent } from './v2-h.component';
1111
import { SharedModule } from '../shared/shared.module';
12-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
12+
import { MatButtonModule } from '@angular/material/button';
1313
import { RxLetModule } from '../../../../rx-angular-pocs/template/directives/let';
1414
import { UnpatchEventsModule } from '../../../../rx-angular-pocs/template/directives/unpatch';
1515
import { PushModule } from '../../../../rx-angular-pocs/template/pipes/push';

‎apps/demos/src/app/features/concepts/global-order/rx-form-v/rx-form-v.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { V4EComponent } from './v4-e.component';
1111
import { V4FComponent } from './v4-f.component';
1212
import { V4HComponent } from './v4-h.component';
1313
import { SharedModule } from '../shared/shared.module';
14-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
14+
import { MatButtonModule } from '@angular/material/button';
1515
import { PushModule } from '../../../../rx-angular-pocs';
1616
import { DirtyChecksModule } from '../../../../shared/debug-helper/dirty-checks';
1717
import { ReactiveFormsModule } from '@angular/forms';

‎apps/demos/src/app/features/concepts/global-order/rx-let-v/rx-let-v.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { V3EComponent } from './v3-e.component';
1111
import { V3FComponent } from './v3-f.component';
1212
import { V3HComponent } from './v3-h.component';
1313
import { SharedModule } from '../shared/shared.module';
14-
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
14+
import { MatButtonModule } from '@angular/material/button';
1515
import { PushModule } from '../../../../rx-angular-pocs';
1616
import { DirtyChecksModule } from '../../../../shared/debug-helper/dirty-checks';
1717

0 commit comments

Comments
 (0)