Skip to content

Commit f2b45f6

Browse files
committed
chore: nx migrate latest and disable no-inferrable-types
1 parent ad3be07 commit f2b45f6

File tree

6 files changed

+2981
-3160
lines changed

6 files changed

+2981
-3160
lines changed

.eslintrc.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@
1111
{
1212
"files": ["*.ts", "*.tsx"],
1313
"extends": ["plugin:@nx/typescript"],
14-
"rules": {}
14+
"rules": {
15+
"@typescript-eslint/no-inferrable-types": "off",
16+
"@typescript-eslint/no-extra-semi": "error",
17+
"no-extra-semi": "off"
18+
}
1519
},
1620
{
1721
"files": ["*.js", "*.jsx"],
1822
"extends": ["plugin:@nx/javascript"],
19-
"rules": {}
23+
"rules": {
24+
"@typescript-eslint/no-extra-semi": "error",
25+
"no-extra-semi": "off"
26+
}
2027
}
2128
]
2229
}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ Thumbs.db
4747
.angular
4848
/.env
4949

50-
.nx/cache
50+
.nx/cache
51+
.nx/workspace-data

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
**/apps/*nativescript/src/assets/*.css
1919
**/xplat/nativescript/scss/fonticons/*.css
2020
**/xplat/nativescript*/plugins/**/*
21-
/.nx/cache
21+
/.nx/cache
22+
/.nx/workspace-data

package.json

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,31 @@
5454
"@angular-devkit/build-angular": "~18.0.0",
5555
"@angular-devkit/core": "~18.0.0",
5656
"@angular-devkit/schematics": "~18.0.0",
57-
"@angular-eslint/eslint-plugin": "17.5.0",
58-
"@angular-eslint/eslint-plugin-template": "17.5.0",
59-
"@angular-eslint/template-parser": "17.5.0",
57+
"@angular-eslint/eslint-plugin": "18.1.0",
58+
"@angular-eslint/eslint-plugin-template": "18.1.0",
59+
"@angular-eslint/template-parser": "18.1.0",
6060
"@angular/compiler-cli": "~18.0.0",
6161
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
6262
"@nativescript/nx": "~18.0.0",
6363
"@nativescript/types": "~8.7.0",
6464
"@nativescript/unit-test-runner": "^3.0.4",
6565
"@nativescript/webpack": "~5.0.21",
6666
"@ngtools/webpack": "~18.0.0",
67-
"@nx/angular": "19.0.6",
68-
"@nx/eslint": "19.0.6",
69-
"@nx/eslint-plugin": "19.0.6",
70-
"@nx/jest": "19.0.6",
71-
"@nx/js": "19.0.6",
72-
"@nx/node": "19.0.6",
73-
"@nx/workspace": "19.0.6",
67+
"@nx/angular": "19.4.4",
68+
"@nx/eslint": "19.4.4",
69+
"@nx/eslint-plugin": "19.4.4",
70+
"@nx/jest": "19.4.4",
71+
"@nx/js": "19.4.4",
72+
"@nx/node": "19.4.4",
73+
"@nx/workspace": "19.4.4",
7474
"@schematics/angular": "~18.0.0",
7575
"@types/jasmine": "5.1.1",
7676
"@types/jest": "29.5.7",
7777
"@types/node": "^20.0.0",
7878
"@types/sinon": "^17.0.0",
7979
"@typescript-eslint/eslint-plugin": "7.9.0",
8080
"@typescript-eslint/parser": "7.9.0",
81+
"@typescript-eslint/utils": "^8.0.0-alpha.28",
8182
"conventional-changelog-cli": "^4.1.0",
8283
"dotenv": "16.3.1",
8384
"eslint": "8.57.0",
@@ -94,7 +95,7 @@
9495
"karma-sinon": "^1.0.5",
9596
"lint-staged": "^15.0.0",
9697
"ng-packagr": "~18.0.0",
97-
"nx": "19.0.6",
98+
"nx": "19.4.4",
9899
"nyc": "15.1.0",
99100
"postcss": "^8.4.16",
100101
"postcss-import": "15.1.0",
@@ -108,16 +109,6 @@
108109
"tslib": "^2.6.0",
109110
"typescript": "~5.4.0"
110111
},
111-
"resolutions": {
112-
"@nx/angular": "19.0.6",
113-
"@nx/devkit": "19.0.6",
114-
"@nx/eslint": "19.0.6",
115-
"@nx/eslint-plugin": "19.0.6",
116-
"@nx/jest": "19.0.6",
117-
"@nx/js": "19.0.6",
118-
"@nx/node": "19.0.6",
119-
"@nx/workspace": "19.0.6"
120-
},
121112
"xplat": {
122113
"prefix": "nativescript",
123114
"framework": "angular"

packages/angular/src/lib/legacy/router/ns-location-strategy.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LocationChangeEvent, LocationStrategy } from '@angular/common';
2-
import { Inject, Injectable, Optional } from '@angular/core';
2+
import { Inject, Injectable, Optional, OnDestroy } from '@angular/core';
33
import { ActivatedRouteSnapshot, DefaultUrlSerializer, Params, UrlSegmentGroup, UrlTree } from '@angular/router';
44
import { Frame } from '@nativescript/core';
55
import { START_PATH } from '../../tokens';
@@ -10,7 +10,7 @@ import { defaultNavOptions, LocationState, NavigationOptions, Outlet } from './n
1010
@Injectable({
1111
providedIn: 'root',
1212
})
13-
export class NSLocationStrategy extends LocationStrategy {
13+
export class NSLocationStrategy extends LocationStrategy implements OnDestroy {
1414
private outlets: Array<Outlet> = [];
1515
private currentOutlet: Outlet;
1616

@@ -19,7 +19,10 @@ export class NSLocationStrategy extends LocationStrategy {
1919

2020
public _modalNavigationDepth = 0;
2121

22-
constructor(private frameService: FrameService, @Inject(START_PATH) @Optional() private startPath?: string) {
22+
constructor(
23+
private frameService: FrameService,
24+
@Inject(START_PATH) @Optional() private startPath?: string,
25+
) {
2326
super();
2427
if (NativeScriptDebug.isLogEnabled()) {
2528
NativeScriptDebug.routerLog('NSLocationStrategy.constructor()');

0 commit comments

Comments
 (0)