diff --git a/ponyracer/.angular-cli.json b/ponyracer/.angular-cli.json
index 0035b1618..3cf066277 100644
--- a/ponyracer/.angular-cli.json
+++ b/ponyracer/.angular-cli.json
@@ -36,13 +36,16 @@
},
"lint": [
{
- "project": "src/tsconfig.app.json"
+ "project": "src/tsconfig.app.json",
+ "exclude": "**/node_modules/**"
},
{
- "project": "src/tsconfig.spec.json"
+ "project": "src/tsconfig.spec.json",
+ "exclude": "**/node_modules/**"
},
{
- "project": "e2e/tsconfig.e2e.json"
+ "project": "e2e/tsconfig.e2e.json",
+ "exclude": "**/node_modules/**"
}
],
"test": {
diff --git a/ponyracer/e2e/app.e2e-spec.ts b/ponyracer/e2e/app.e2e-spec.ts
index 605376d44..3d9cae3bb 100644
--- a/ponyracer/e2e/app.e2e-spec.ts
+++ b/ponyracer/e2e/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('ponyracer App', () => {
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/tsconfig.e2e.json b/ponyracer/e2e/tsconfig.e2e.json
index e2a9a2fc7..1d9e5edf0 100644
--- a/ponyracer/e2e/tsconfig.e2e.json
+++ b/ponyracer/e2e/tsconfig.e2e.json
@@ -2,10 +2,12 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
+ "baseUrl": "./",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
+ "jasminewd2",
"node"
]
}
diff --git a/ponyracer/package.json b/ponyracer/package.json
index b9e922210..7b8230292 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -22,14 +22,15 @@
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"core-js": "^2.4.1",
- "rxjs": "^5.1.0",
- "zone.js": "^0.8.4"
+ "rxjs": "^5.4.1",
+ "zone.js": "^0.8.14"
},
"devDependencies": {
- "@angular/cli": "1.1.1",
+ "@angular/cli": "1.2.5",
"@angular/compiler-cli": "^4.0.0",
"@angular/language-service": "^4.0.0",
- "@types/jasmine": "2.5.45",
+ "@types/jasmine": "~2.5.53",
+ "@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
"codelyzer": "~3.0.1",
"jasmine-core": "~2.6.2",
@@ -37,9 +38,9 @@
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
+ "karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
- "karma-coverage-istanbul-reporter": "^1.2.1",
"protractor": "~5.1.2",
"ts-node": "~3.0.4",
"tslint": "~5.3.2",
diff --git a/ponyracer/src/app/app.component.html b/ponyracer/src/app/app.component.html
index d0322ef6c..94e7b977c 100644
--- a/ponyracer/src/app/app.component.html
+++ b/ponyracer/src/app/app.component.html
@@ -1,20 +1,20 @@
-
+
- Welcome to {{title}}!!
+ Welcome to {{title}}!
-
+
Here are some links to help you start:
diff --git a/ponyracer/src/app/app.component.spec.ts b/ponyracer/src/app/app.component.spec.ts
index 7d2799ceb..9510495a2 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/polyfills.ts b/ponyracer/src/polyfills.ts
index fd01cc9f1..7831e97b7 100644
--- a/ponyracer/src/polyfills.ts
+++ b/ponyracer/src/polyfills.ts
@@ -37,16 +37,15 @@
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
-/** IE10 and IE11 requires the following to support `@angular/animation`. */
-// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
-
-
/** Evergreen browsers require these. **/
import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
-/** ALL Firefox browsers require the following to support `@angular/animation`. **/
+/**
+ * Required to support Web Animations `@angular/animation`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
+ **/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
diff --git a/ponyracer/src/tsconfig.app.json b/ponyracer/src/tsconfig.app.json
index 5e2507db5..39ba8dbac 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 510e3f1fd..63d89ff28 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 a35a8ee3a..1f9b55851 100644
--- a/ponyracer/tsconfig.json
+++ b/ponyracer/tsconfig.json
@@ -2,7 +2,6 @@
"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 dd117b387..0db5751c7 100644
--- a/ponyracer/tslint.json
+++ b/ponyracer/tslint.json
@@ -31,8 +31,14 @@
"member-access": false,
"member-ordering": [
true,
- "static-before-instance",
- "variables-before-functions"
+ {
+ "order": [
+ "static-field",
+ "instance-field",
+ "static-method",
+ "instance-method"
+ ]
+ }
],
"no-arg": true,
"no-bitwise": true,
@@ -80,6 +86,7 @@
],
"radix": true,
"semicolon": [
+ true,
"always"
],
"triple-equals": [