Skip to content

Commit 64abc5d

Browse files
NolanusNolanus
committed
Merge branch 'jimbuck-upgrade-angular18' into develop
2 parents cfc274b + cc8157e commit 64abc5d

File tree

15 files changed

+9141
-10501
lines changed

15 files changed

+9141
-10501
lines changed

‎package-lock.json

Lines changed: 9060 additions & 10433 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@
1010
"e2e": "ng e2e",
1111
"lint": "ng lint",
1212
"ng": "ng",
13-
"prerelease:lib": "ng lint && ng test --watch false && ng e2e && npm run build:lib",
13+
"prerelease:lib": "ng lint && ng test --no-watch && ng e2e && npm run build:lib",
1414
"release:lib": "npm publish dist/ngx-page-scroll-core && npm publish dist/ngx-page-scroll ",
1515
"start": "ng serve",
1616
"test": "ng test"
1717
},
1818
"private": true,
1919
"dependencies": {
20-
"@angular/animations": "^18.1.1",
21-
"@angular/cdk": "^18.0.6",
22-
"@angular/common": "^18.1.1",
23-
"@angular/compiler": "^18.1.1",
24-
"@angular/core": "^18.1.1",
25-
"@angular/forms": "^18.1.1",
26-
"@angular/material": "^18.0.6",
27-
"@angular/platform-browser": "^18.1.1",
28-
"@angular/platform-browser-dynamic": "^18.1.1",
29-
"@angular/router": "^18.1.1",
20+
"@angular/animations": "^19.0.6",
21+
"@angular/cdk": "^19.0.5",
22+
"@angular/common": "^19.0.6",
23+
"@angular/compiler": "^19.0.6",
24+
"@angular/core": "^19.0.6",
25+
"@angular/forms": "^19.0.6",
26+
"@angular/material": "^19.0.5",
27+
"@angular/platform-browser": "^19.0.6",
28+
"@angular/platform-browser-dynamic": "^19.0.6",
29+
"@angular/router": "^19.0.6",
3030
"normalize.css": "^8.0.1",
3131
"rxjs": "~7.5.2",
3232
"tslib": "^2.6.2",
33-
"zone.js": "~0.14.2"
33+
"zone.js": "~0.15.0"
3434
},
3535
"devDependencies": {
36-
"@angular-devkit/build-angular": "^18.1.1",
36+
"@angular-devkit/build-angular": "^19.0.7",
3737
"@angular-eslint/builder": "^18.1.0",
3838
"@angular-eslint/eslint-plugin": "^18.1.0",
3939
"@angular-eslint/eslint-plugin-template": "^18.1.0",
4040
"@angular-eslint/schematics": "^18.1.0",
4141
"@angular-eslint/template-parser": "^18.1.0",
42-
"@angular/cli": "^18.1.1",
43-
"@angular/compiler-cli": "^18.1.1",
42+
"@angular/cli": "^19.0.7",
43+
"@angular/compiler-cli": "^19.0.6",
4444
"@commitlint/cli": "^12.1.4",
4545
"@commitlint/config-conventional": "^12.1.4",
4646
"@types/jasmine": "^3.6.3",
@@ -60,7 +60,7 @@
6060
"karma-coverage-istanbul-reporter": "~3.0.2",
6161
"karma-jasmine": "~4.0.1",
6262
"karma-jasmine-html-reporter": "^1.7.0",
63-
"ng-packagr": "^18.1.0",
63+
"ng-packagr": "^19.1.0",
6464
"protractor": "~7.0.0",
6565
"ts-node": "~10.9.2",
6666
"typescript": "~5.5.0"

‎projects/ngx-page-scroll/src/lib/ngx-page-scroll.directive.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ import { EasingLogic, PageScrollInstance, PageScrollOptions, PageScrollService }
1818
import { filter, take } from 'rxjs/operators';
1919

2020
@Directive({
21-
selector: '[pageScroll]',
22-
host: {
23-
'(click)': 'handleClick($event)',
24-
},
21+
selector: '[pageScroll]',
22+
host: {
23+
'(click)': 'handleClick($event)',
24+
},
25+
standalone: false
2526
})
2627
export class NgxPageScrollDirective implements OnChanges, OnDestroy {
2728

@@ -68,9 +69,9 @@ export class NgxPageScrollDirective implements OnChanges, OnDestroy {
6869
pageScrollFinish: EventEmitter<boolean> = new EventEmitter<boolean>();
6970

7071
private pageScrollInstance: PageScrollInstance;
71-
private document: Document;
72+
private readonly document: Document;
7273

73-
constructor(private pageScrollService: PageScrollService, @Optional() private router: Router, @Inject(DOCUMENT) document) {
74+
constructor(private readonly pageScrollService: PageScrollService, @Optional() private readonly router: Router, @Inject(DOCUMENT) document) {
7475
this.document = (document as Document);
7576
}
7677

‎src/app/app.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { NavigationEnd, Router } from '@angular/router';
33
import { PageScrollService } from 'ngx-page-scroll-core';
44

55
@Component({
6-
selector: 'app-root',
7-
templateUrl: './app.component.html',
8-
styleUrls: ['./app.component.scss'],
6+
selector: 'app-root',
7+
templateUrl: './app.component.html',
8+
styleUrls: ['./app.component.scss'],
9+
standalone: false
910
})
1011
export class AppComponent {
1112
public currentTabIndex = 0;
@@ -39,7 +40,7 @@ export class AppComponent {
3940
name: 'Namespace Feature',
4041
}];
4142

42-
constructor(private router: Router, private pageScrollService: PageScrollService) {
43+
constructor(private readonly router: Router, private readonly pageScrollService: PageScrollService) {
4344
router.events.subscribe((event) => {
4445
// see also
4546
if (event instanceof NavigationEnd) {

‎src/app/dummy-card/dummy-card.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
22

33
@Component({
4-
selector: 'app-dummy-card',
5-
templateUrl: './dummy-card.component.html',
4+
selector: 'app-dummy-card',
5+
templateUrl: './dummy-card.component.html',
6+
standalone: false
67
})
78
export class DummyCardComponent implements OnChanges {
89

‎src/app/dummy-content/dummy-content.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
22

33
@Component({
4-
selector: 'app-dummy-content',
5-
templateUrl: './dummy-content.component.html',
4+
selector: 'app-dummy-content',
5+
templateUrl: './dummy-content.component.html',
6+
standalone: false
67
})
78
export class DummyContentComponent implements OnChanges {
89

‎src/app/home/home.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { Component, OnInit } from '@angular/core';
22

33
@Component({
4-
selector: 'app-home',
5-
templateUrl: './home.component.html',
6-
styleUrls: ['./home.component.scss'],
4+
selector: 'app-home',
5+
templateUrl: './home.component.html',
6+
styleUrls: ['./home.component.scss'],
7+
standalone: false
78
})
89
export class HomeComponent implements OnInit {
910

‎src/app/horizontal-scroll/horizontal-scroll.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ import { DOCUMENT } from '@angular/common';
33
import { PageScrollInstance, PageScrollService } from 'ngx-page-scroll-core';
44

55
@Component({
6-
selector: 'app-horizontal-scroll',
7-
templateUrl: './horizontal-scroll.component.html',
8-
styleUrls: ['./horizontal-scroll.component.scss'],
6+
selector: 'app-horizontal-scroll',
7+
templateUrl: './horizontal-scroll.component.html',
8+
styleUrls: ['./horizontal-scroll.component.scss'],
9+
standalone: false
910
})
1011
export class HorizontalScrollComponent implements OnInit {
1112

1213
@ViewChild('container')
1314
public container: ElementRef;
1415

15-
constructor(@Inject(DOCUMENT) private document: any, private pageScrollService: PageScrollService) {
16+
constructor(@Inject(DOCUMENT) private readonly document: any, private readonly pageScrollService: PageScrollService) {
1617
}
1718

1819
public scrollHorizontalStart(): void {

‎src/app/namespace-scroll/namespace-scroll.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { DOCUMENT } from '@angular/common';
33
import { PageScrollInstance, PageScrollService } from 'ngx-page-scroll-core';
44

55
@Component({
6-
selector: 'app-namespace-scroll',
7-
templateUrl: './namespace-scroll.component.html',
8-
styleUrls: ['./namespace-scroll.component.scss'],
6+
selector: 'app-namespace-scroll',
7+
templateUrl: './namespace-scroll.component.html',
8+
styleUrls: ['./namespace-scroll.component.scss'],
9+
standalone: false
910
})
1011
export class NamespaceScrollComponent implements OnInit {
1112

@@ -21,7 +22,7 @@ export class NamespaceScrollComponent implements OnInit {
2122
@ViewChild('container4')
2223
public container4: ElementRef;
2324

24-
constructor(@Inject(DOCUMENT) private document: any, public pageScrollService: PageScrollService) {
25+
constructor(@Inject(DOCUMENT) private readonly document: any, public readonly pageScrollService: PageScrollService) {
2526
}
2627

2728
ngOnInit(): void {

‎src/app/nested-scroll/nested-scroll.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { MatDialog } from '@angular/material/dialog';
55
import { ScrollDialogComponent } from '../scroll-dialog/scroll-dialog.component';
66

77
@Component({
8-
selector: 'app-nested-scroll',
9-
templateUrl: './nested-scroll.component.html',
10-
styleUrls: ['./nested-scroll.component.scss'],
8+
selector: 'app-nested-scroll',
9+
templateUrl: './nested-scroll.component.html',
10+
styleUrls: ['./nested-scroll.component.scss'],
11+
standalone: false
1112
})
1213
export class NestedScrollComponent implements OnInit {
1314

@@ -17,7 +18,7 @@ export class NestedScrollComponent implements OnInit {
1718
@ViewChild('complexContainer')
1819
public complexContainer: ElementRef;
1920

20-
constructor(@Inject(DOCUMENT) private document: any, private pageScrollService: PageScrollService, public dialog: MatDialog) {
21+
constructor(@Inject(DOCUMENT) private readonly document: any, private readonly pageScrollService: PageScrollService, public readonly dialog: MatDialog) {
2122
}
2223

2324
ngOnInit(): void {

0 commit comments

Comments
 (0)