diff --git a/ponyracer/package.json b/ponyracer/package.json index b2c7ec624..31911fa1f 100644 --- a/ponyracer/package.json +++ b/ponyracer/package.json @@ -11,22 +11,22 @@ }, "private": true, "dependencies": { - "@angular/animations": "~10.1.0-next.0", - "@angular/common": "~10.1.0-next.0", - "@angular/compiler": "~10.1.0-next.0", - "@angular/core": "~10.1.0-next.0", - "@angular/forms": "~10.1.0-next.0", - "@angular/platform-browser": "~10.1.0-next.0", - "@angular/platform-browser-dynamic": "~10.1.0-next.0", - "@angular/router": "~10.1.0-next.0", + "@angular/animations": "~10.1.0-next.1", + "@angular/common": "~10.1.0-next.1", + "@angular/compiler": "~10.1.0-next.1", + "@angular/core": "~10.1.0-next.1", + "@angular/forms": "~10.1.0-next.1", + "@angular/platform-browser": "~10.1.0-next.1", + "@angular/platform-browser-dynamic": "~10.1.0-next.1", + "@angular/router": "~10.1.0-next.1", "rxjs": "~6.6.0", "tslib": "^2.0.0", "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1001.0-next.0", - "@angular/cli": "~10.1.0-next.0", - "@angular/compiler-cli": "~10.1.0-next.0", + "@angular-devkit/build-angular": "~0.1001.0-next.1", + "@angular/cli": "~10.1.0-next.1", + "@angular/compiler-cli": "~10.1.0-next.1", "@types/node": "^12.11.1", "@types/jasmine": "~3.5.0", "@types/jasminewd2": "~2.0.3", diff --git a/ponyracer/src/app/app.component.spec.ts b/ponyracer/src/app/app.component.spec.ts index 0e8e286d7..519db2a77 100644 --- a/ponyracer/src/app/app.component.spec.ts +++ b/ponyracer/src/app/app.component.spec.ts @@ -1,14 +1,14 @@ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; import { AppComponent } from './app.component'; describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ + beforeEach(async () => { + await TestBed.configureTestingModule({ declarations: [ AppComponent ], }).compileComponents(); - })); + }); it('should create the app', () => { const fixture = TestBed.createComponent(AppComponent); diff --git a/ponyracer/tslint.json b/ponyracer/tslint.json index 8e5e4af75..39f154dbf 100644 --- a/ponyracer/tslint.json +++ b/ponyracer/tslint.json @@ -1,5 +1,8 @@ { "extends": "tslint:recommended", + "rulesDirectory": [ + "codelyzer" + ], "rules": { "align": { "options": [ @@ -9,25 +12,10 @@ }, "array-type": false, "arrow-return-shorthand": true, - "component-class-suffix": true, - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "contextual-lifecycle": true, "curly": true, "deprecation": { "severity": "warning" }, - "directive-class-suffix": true, - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ], "eofline": true, "import-blacklist": [ true, @@ -56,7 +44,6 @@ } ], "no-any": true, - "no-conflicting-lifecycle": true, "no-console": [ true, "debug", @@ -66,18 +53,11 @@ "trace" ], "no-empty": false, - "no-host-metadata-property": true, "no-inferrable-types": [ true, "ignore-params" ], - "no-input-rename": true, - "no-inputs-metadata-property": true, "no-non-null-assertion": true, - "no-output-native": true, - "no-output-on-prefix": true, - "no-output-rename": true, - "no-outputs-metadata-property": true, "no-redundant-jsdoc": true, "no-switch-case-fall-through": true, "no-var-requires": false, @@ -103,8 +83,6 @@ "named": "never" } }, - "template-banana-in-box": true, - "template-no-negated-async": true, "typedef": [ true, "call-signature" @@ -127,8 +105,6 @@ } ] }, - "use-lifecycle-interface": true, - "use-pipe-transform-interface": true, "variable-name": { "options": [ "ban-keywords", @@ -145,9 +121,33 @@ "check-type", "check-typecast" ] - } - }, - "rulesDirectory": [ - "codelyzer" - ] + }, + "component-class-suffix": true, + "contextual-lifecycle": true, + "directive-class-suffix": true, + "no-conflicting-lifecycle": true, + "no-host-metadata-property": true, + "no-input-rename": true, + "no-inputs-metadata-property": true, + "no-output-native": true, + "no-output-on-prefix": true, + "no-output-rename": true, + "no-outputs-metadata-property": true, + "template-banana-in-box": true, + "template-no-negated-async": true, + "use-lifecycle-interface": true, + "use-pipe-transform-interface": true, + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ] + } }