From e37fad52be9207f49f63c47cf6f67ec103808d5d Mon Sep 17 00:00:00 2001 From: cexbrayat Date: Sat, 7 Oct 2017 22:21:19 -0400 Subject: [PATCH] chore: version 1.3.0-beta.0 --- ponyracer/.angular-cli.json | 9 +++----- ponyracer/.gitignore | 1 - ponyracer/e2e/app.e2e-spec.ts | 8 +++---- ponyracer/e2e/app.po.ts | 2 +- ponyracer/e2e/tsconfig.e2e.json | 1 - ponyracer/package.json | 28 ++++++++++++------------- ponyracer/src/app/app.component.html | 4 ++-- ponyracer/src/app/app.component.spec.ts | 2 +- ponyracer/src/tsconfig.app.json | 2 +- ponyracer/src/tsconfig.spec.json | 2 +- ponyracer/tsconfig.json | 1 + ponyracer/tslint.json | 11 ++-------- 12 files changed, 30 insertions(+), 41 deletions(-) diff --git a/ponyracer/.angular-cli.json b/ponyracer/.angular-cli.json index 3cf066277..0035b1618 100644 --- a/ponyracer/.angular-cli.json +++ b/ponyracer/.angular-cli.json @@ -36,16 +36,13 @@ }, "lint": [ { - "project": "src/tsconfig.app.json", - "exclude": "**/node_modules/**" + "project": "src/tsconfig.app.json" }, { - "project": "src/tsconfig.spec.json", - "exclude": "**/node_modules/**" + "project": "src/tsconfig.spec.json" }, { - "project": "e2e/tsconfig.e2e.json", - "exclude": "**/node_modules/**" + "project": "e2e/tsconfig.e2e.json" } ], "test": { diff --git a/ponyracer/.gitignore b/ponyracer/.gitignore index 6b6681430..54bfd2001 100644 --- a/ponyracer/.gitignore +++ b/ponyracer/.gitignore @@ -32,7 +32,6 @@ npm-debug.log testem.log /typings -yarn-error.log # e2e /e2e/*.js diff --git a/ponyracer/e2e/app.e2e-spec.ts b/ponyracer/e2e/app.e2e-spec.ts index 3d9cae3bb..0794739de 100644 --- a/ponyracer/e2e/app.e2e-spec.ts +++ b/ponyracer/e2e/app.e2e-spec.ts @@ -1,14 +1,14 @@ -import { PonyracerPage } from './app.po'; +import { AppPage } from './app.po'; describe('ponyracer App', () => { - let page: PonyracerPage; + let page: AppPage; beforeEach(() => { - page = new PonyracerPage(); + page = new AppPage(); }); it('should display welcome message', () => { page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to app!'); + expect(page.getParagraphText()).toEqual('Welcome to app!!'); }); }); diff --git a/ponyracer/e2e/app.po.ts b/ponyracer/e2e/app.po.ts index 203cd9191..82ea75ba5 100644 --- a/ponyracer/e2e/app.po.ts +++ b/ponyracer/e2e/app.po.ts @@ -1,6 +1,6 @@ import { browser, by, element } from 'protractor'; -export class PonyracerPage { +export class AppPage { navigateTo() { return browser.get('/'); } diff --git a/ponyracer/e2e/tsconfig.e2e.json b/ponyracer/e2e/tsconfig.e2e.json index 1d9e5edf0..39b800f78 100644 --- a/ponyracer/e2e/tsconfig.e2e.json +++ b/ponyracer/e2e/tsconfig.e2e.json @@ -2,7 +2,6 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/e2e", - "baseUrl": "./", "module": "commonjs", "target": "es5", "types": [ diff --git a/ponyracer/package.json b/ponyracer/package.json index dec980a04..0d448efb6 100644 --- a/ponyracer/package.json +++ b/ponyracer/package.json @@ -12,27 +12,27 @@ }, "private": true, "dependencies": { - "@angular/animations": "^4.0.0", - "@angular/common": "^4.0.0", - "@angular/compiler": "^4.0.0", - "@angular/core": "^4.0.0", - "@angular/forms": "^4.0.0", - "@angular/http": "^4.0.0", - "@angular/platform-browser": "^4.0.0", - "@angular/platform-browser-dynamic": "^4.0.0", - "@angular/router": "^4.0.0", + "@angular/animations": "^4.2.4", + "@angular/common": "^4.2.4", + "@angular/compiler": "^4.2.4", + "@angular/core": "^4.2.4", + "@angular/forms": "^4.2.4", + "@angular/http": "^4.2.4", + "@angular/platform-browser": "^4.2.4", + "@angular/platform-browser-dynamic": "^4.2.4", + "@angular/router": "^4.2.4", "core-js": "^2.4.1", "rxjs": "^5.4.1", - "zone.js": "^0.8.14" + "zone.js": "^0.8.12" }, "devDependencies": { - "@angular/cli": "1.2.8", - "@angular/compiler-cli": "^4.0.0", - "@angular/language-service": "^4.0.0", + "@angular/cli": "1.3.0-beta.0", + "@angular/compiler-cli": "^4.2.4", + "@angular/language-service": "^4.2.4", "@types/jasmine": "~2.5.53", "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", - "codelyzer": "~3.0.1", + "codelyzer": "~3.1.1", "jasmine-core": "~2.6.2", "jasmine-spec-reporter": "~4.1.0", "karma": "~1.7.0", diff --git a/ponyracer/src/app/app.component.html b/ponyracer/src/app/app.component.html index 230f4edc0..1a00adb0a 100644 --- a/ponyracer/src/app/app.component.html +++ b/ponyracer/src/app/app.component.html @@ -1,7 +1,7 @@

- Welcome to {{title}}! + Welcome to {{title}}!!

@@ -14,7 +14,7 @@

Tour of Heroes

CLI Documentation
  • -

    Angular blog

    +

    Angular blog

    • diff --git a/ponyracer/src/app/app.component.spec.ts b/ponyracer/src/app/app.component.spec.ts index 9510495a2..7d2799ceb 100644 --- a/ponyracer/src/app/app.component.spec.ts +++ b/ponyracer/src/app/app.component.spec.ts @@ -27,6 +27,6 @@ describe('AppComponent', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!'); + expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!'); })); }); diff --git a/ponyracer/src/tsconfig.app.json b/ponyracer/src/tsconfig.app.json index 39ba8dbac..5e2507db5 100644 --- a/ponyracer/src/tsconfig.app.json +++ b/ponyracer/src/tsconfig.app.json @@ -2,8 +2,8 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "baseUrl": "./", "module": "es2015", + "baseUrl": "", "types": [] }, "exclude": [ diff --git a/ponyracer/src/tsconfig.spec.json b/ponyracer/src/tsconfig.spec.json index 63d89ff28..510e3f1fd 100644 --- a/ponyracer/src/tsconfig.spec.json +++ b/ponyracer/src/tsconfig.spec.json @@ -2,9 +2,9 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", - "baseUrl": "./", "module": "commonjs", "target": "es5", + "baseUrl": "", "types": [ "jasmine", "node" diff --git a/ponyracer/tsconfig.json b/ponyracer/tsconfig.json index 1f9b55851..a35a8ee3a 100644 --- a/ponyracer/tsconfig.json +++ b/ponyracer/tsconfig.json @@ -2,6 +2,7 @@ "compileOnSave": false, "compilerOptions": { "outDir": "./dist/out-tsc", + "baseUrl": "src", "sourceMap": true, "declaration": false, "moduleResolution": "node", diff --git a/ponyracer/tslint.json b/ponyracer/tslint.json index 0db5751c7..dd117b387 100644 --- a/ponyracer/tslint.json +++ b/ponyracer/tslint.json @@ -31,14 +31,8 @@ "member-access": false, "member-ordering": [ true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } + "static-before-instance", + "variables-before-functions" ], "no-arg": true, "no-bitwise": true, @@ -86,7 +80,6 @@ ], "radix": true, "semicolon": [ - true, "always" ], "triple-equals": [