Skip to content

Commit

Permalink
chore: nx migrate latest and disable no-inferrable-types
Browse files Browse the repository at this point in the history
  • Loading branch information
edusperoni committed Jul 17, 2024
1 parent ad3be07 commit f2b45f6
Show file tree
Hide file tree
Showing 6 changed files with 2,981 additions and 3,160 deletions.
11 changes: 9 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,19 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ Thumbs.db
.angular
/.env

.nx/cache
.nx/cache
.nx/workspace-data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
**/apps/*nativescript/src/assets/*.css
**/xplat/nativescript/scss/fonticons/*.css
**/xplat/nativescript*/plugins/**/*
/.nx/cache
/.nx/cache
/.nx/workspace-data
33 changes: 12 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,31 @@
"@angular-devkit/build-angular": "~18.0.0",
"@angular-devkit/core": "~18.0.0",
"@angular-devkit/schematics": "~18.0.0",
"@angular-eslint/eslint-plugin": "17.5.0",
"@angular-eslint/eslint-plugin-template": "17.5.0",
"@angular-eslint/template-parser": "17.5.0",
"@angular-eslint/eslint-plugin": "18.1.0",
"@angular-eslint/eslint-plugin-template": "18.1.0",
"@angular-eslint/template-parser": "18.1.0",
"@angular/compiler-cli": "~18.0.0",
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
"@nativescript/nx": "~18.0.0",
"@nativescript/types": "~8.7.0",
"@nativescript/unit-test-runner": "^3.0.4",
"@nativescript/webpack": "~5.0.21",
"@ngtools/webpack": "~18.0.0",
"@nx/angular": "19.0.6",
"@nx/eslint": "19.0.6",
"@nx/eslint-plugin": "19.0.6",
"@nx/jest": "19.0.6",
"@nx/js": "19.0.6",
"@nx/node": "19.0.6",
"@nx/workspace": "19.0.6",
"@nx/angular": "19.4.4",
"@nx/eslint": "19.4.4",
"@nx/eslint-plugin": "19.4.4",
"@nx/jest": "19.4.4",
"@nx/js": "19.4.4",
"@nx/node": "19.4.4",
"@nx/workspace": "19.4.4",
"@schematics/angular": "~18.0.0",
"@types/jasmine": "5.1.1",
"@types/jest": "29.5.7",
"@types/node": "^20.0.0",
"@types/sinon": "^17.0.0",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"@typescript-eslint/utils": "^8.0.0-alpha.28",
"conventional-changelog-cli": "^4.1.0",
"dotenv": "16.3.1",
"eslint": "8.57.0",
Expand All @@ -94,7 +95,7 @@
"karma-sinon": "^1.0.5",
"lint-staged": "^15.0.0",
"ng-packagr": "~18.0.0",
"nx": "19.0.6",
"nx": "19.4.4",
"nyc": "15.1.0",
"postcss": "^8.4.16",
"postcss-import": "15.1.0",
Expand All @@ -108,16 +109,6 @@
"tslib": "^2.6.0",
"typescript": "~5.4.0"
},
"resolutions": {
"@nx/angular": "19.0.6",
"@nx/devkit": "19.0.6",
"@nx/eslint": "19.0.6",
"@nx/eslint-plugin": "19.0.6",
"@nx/jest": "19.0.6",
"@nx/js": "19.0.6",
"@nx/node": "19.0.6",
"@nx/workspace": "19.0.6"
},
"xplat": {
"prefix": "nativescript",
"framework": "angular"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LocationChangeEvent, LocationStrategy } from '@angular/common';
import { Inject, Injectable, Optional } from '@angular/core';
import { Inject, Injectable, Optional, OnDestroy } from '@angular/core';
import { ActivatedRouteSnapshot, DefaultUrlSerializer, Params, UrlSegmentGroup, UrlTree } from '@angular/router';
import { Frame } from '@nativescript/core';
import { START_PATH } from '../../tokens';
Expand All @@ -10,7 +10,7 @@ import { defaultNavOptions, LocationState, NavigationOptions, Outlet } from './n
@Injectable({
providedIn: 'root',
})
export class NSLocationStrategy extends LocationStrategy {
export class NSLocationStrategy extends LocationStrategy implements OnDestroy {
private outlets: Array<Outlet> = [];
private currentOutlet: Outlet;

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

public _modalNavigationDepth = 0;

constructor(private frameService: FrameService, @Inject(START_PATH) @Optional() private startPath?: string) {
constructor(
private frameService: FrameService,
@Inject(START_PATH) @Optional() private startPath?: string,
) {
super();
if (NativeScriptDebug.isLogEnabled()) {
NativeScriptDebug.routerLog('NSLocationStrategy.constructor()');
Expand Down
Loading

0 comments on commit f2b45f6

Please sign in to comment.