Merge branch 'docs-style-guide-4' of github.com:IdeaBlade/angular.io into docs-style-guide-4

Author: johnpapa

gulpfile.js

@@ -25,6 +25,8 @@ var globby = require("globby");
 var treeKill = require("tree-kill");
 var blc = require("broken-link-checker");
 
+var tslint = require('gulp-tslint');
+
 // TODO:
 //  1. Think about using runSequence
 //  2. Think about using spawn instead of exec in case of long error messages.
@@ -45,6 +47,7 @@ var exampleZipper = require(path.resolve(TOOLS_PATH, '_example-zipper/exampleZip
 var plunkerBuilder = require(path.resolve(TOOLS_PATH, 'plunker-builder/plunkerBuilder'));
 var fsUtils = require(path.resolve(TOOLS_PATH, 'fs-utils/fsUtils'));
 
+
 var _devguideShredOptions =  {
   examplesDir: path.join(DOCS_PATH, '_examples'),
   fragmentsDir: path.join(DOCS_PATH, '_fragments'),
@@ -498,6 +501,20 @@ gulp.task('_zip-examples', function() {
 });
 
 
+// Linting
+
+gulp.task('lint', function() {
+  return gulp.src(['./public/docs/_examples/style-guide/ts/**/*.ts'])
+    .pipe(tslint({
+      rulesDirectory: ['node_modules/codelyzer'],
+      configuration: require('./tslint.json')
+    }))
+    .pipe(tslint.report('prose', {
+      summarizeFailureOutput: true
+    }));
+});
+
+
 // Helper functions
 
 function harpCompile() {

package.json

@@ -9,7 +9,6 @@
     "harp": "harp",
     "live-server": "live-server",
     "test-api-builder": "jasmine-node tools/api-builder",
-
     "protractor": "protractor"
   },
   "repository": {
@@ -28,10 +27,11 @@
   "devDependencies": {
     "archiver": "^0.16.0",
     "assert-plus": "^0.1.5",
-    "broken-link-checker":"0.7.0",
+    "broken-link-checker": "0.7.0",
     "browser-sync": "^2.9.3",
     "canonical-path": "0.0.2",
     "cross-spawn": "^2.1.0",
+    "codelyzer": "0.0.18",
     "del": "^1.2.0",
     "dgeni": "^0.4.0",
     "dgeni-packages": "^0.11.1",
@@ -42,6 +42,7 @@
     "gulp": "^3.5.6",
     "gulp-env": "0.4.0",
     "gulp-task-listing": "^1.0.1",
+    "gulp-tslint": "^4.3.5",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.4",
     "harp": "^0.20.3",
@@ -66,6 +67,7 @@
     "protractor": "^3.0.0",
     "q": "^1.4.1",
     "tree-kill": "^1.0.0",
+    "tslint": "^3.2.2",
     "typescript": "1.7.3",
     "yargs": "^3.23.0"
   },

public/_includes/_hero.jade

@@ -8,8 +8,9 @@ if current.path[4] && current.path[3] == 'api'
   - var textFormat = 'is-standard-case'
 
 header(class="hero background-sky")
-  h1(class="hero-title text-display-1 #{textFormat}") #{headerTitle}
-  if useBadges
+  div(class="inner-header")
+    h1(class="hero-title text-display-1 #{textFormat}") #{headerTitle}
+    if useBadges
     span(class="badges")
       if docType
         span(class="status-badge").

public/docs/_examples/cb-dependency-injection/ts/app/main.ts

@@ -3,9 +3,10 @@ import { bootstrap }        from 'angular2/platform/browser';
 import { provide }          from 'angular2/core';
 import { XHRBackend }       from 'angular2/http';
 
+import { ROUTER_PROVIDERS } from 'angular2/router';
+
 import { LocationStrategy,
-         HashLocationStrategy,
-         ROUTER_PROVIDERS } from 'angular2/router';
+         HashLocationStrategy } from 'angular2/platform/common';
 
 import { HeroData }         from './hero-data';
 import { InMemoryBackendService,

public/docs/_examples/cb-ts-to-js/ts/app/main.ts

@@ -3,10 +3,12 @@ import {provide}
   from 'angular2/core';
 import {bootstrap}
   from 'angular2/platform/browser';
+import {
+} from 'angular2/router';
 import {
   LocationStrategy,
   HashLocationStrategy
-} from 'angular2/router';
+} from 'angular2/platform/common';
 // #enddocregion ng2import
 
 // #docregion appimport

public/docs/_examples/dependency-injection/ts/app/car/car-injector.ts

@@ -1,25 +1,25 @@
 // #docplaster
 //#docregion
-import { Injector }         from 'angular2/core';
+import { ReflectiveInjector }         from 'angular2/core';
 
 import {Car, Engine, Tires} from './car';
 import {Logger}             from '../logger.service';
 
 //#docregion injector
 export function useInjector() {
-  var injector:Injector;
+  var injector:ReflectiveInjector;
 
 //#enddocregion injector
 /*
 //#docregion injector-no-new
-  // Cannot 'new' an Injector like this!
-  var injector = new Injector([Car, Engine, Tires, Logger]);
+  // Cannot 'new' an ReflectiveInjector like this!
+  var injector = new ReflectiveInjector([Car, Engine, Tires, Logger]);
 //#enddocregion injector-no-new
 */
 
 //#docregion injector
   //#docregion injector-create-and-call
-  injector = Injector.resolveAndCreate([Car, Engine, Tires, Logger]);
+  injector = ReflectiveInjector.resolveAndCreate([Car, Engine, Tires, Logger]);
   //#docregion injector-call
   var car = injector.get(Car);
  //#enddocregion injector-call

public/docs/_examples/dependency-injection/ts/app/injector.component.ts

@@ -30,7 +30,7 @@ export class InjectorComponent {
   hero = this.heroService.getHeroes()[0];
 
   get rodent() {
-    let rous = this._injector.getOptional(ROUS);
+    let rous = this._injector.get(ROUS, null);
     if (rous) {
       throw new Error('Aaaargh!')
     }

public/docs/_examples/homepage-hello-world/ts/index.1.html

@@ -14,9 +14,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>

public/docs/_examples/homepage-tabs/ts/index.1.html

@@ -15,9 +15,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>

public/docs/_examples/homepage-todo/ts/index.1.html

@@ -15,9 +15,9 @@
 
     <script src="https://code.angularjs.org/tools/system.js"></script>
     <script src="https://code.angularjs.org/tools/typescript.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2-polyfills.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/Rx.js"></script>
-    <script src="https://code.angularjs.org/2.0.0-beta.15/angular2.dev.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2-polyfills.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
+    <script src="https://code.angularjs.org/2.0.0-beta.16/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script>

public/docs/_examples/package.json

@@ -19,33 +19,33 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.15",
+    "angular2": "2.0.0-beta.16",
     "systemjs": "0.19.26",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.10",
+    "zone.js": "^0.6.12",
 
-    "a2-in-memory-web-api": "^0.1.15",
+    "a2-in-memory-web-api": "^0.1.16",
     "bootstrap": "^3.3.6"
-
   },
   "devDependencies": {
     "concurrently": "^2.0.0",
     "lite-server": "^2.2.0",
     "typescript": "^1.8.10",
-    "typings":"^0.7.12",
+    "typings": "^0.8.1",
 
     "canonical-path": "0.0.2",
     "http-server": "^0.9.0",
+    "lodash": "^4.11.1",
     "jasmine-core": "~2.4.1",
     "karma": "^0.13.22",
     "karma-chrome-launcher": "^0.2.3",
     "karma-cli": "^0.1.2",
     "karma-htmlfile-reporter": "^0.2.2",
     "karma-jasmine": "^0.3.8",
-    "protractor": "^3.2.2",
+    "protractor": "^3.3.0",
     "rimraf": "^2.5.2"
   },
-  "repository": {  }
+  "repository": {}
 }

public/docs/_examples/pipes/ts/app/app.component.html

@@ -10,7 +10,6 @@ <h1>Pipes</h1>
 <a href="#flying-heroes-impure">Flying Heroes filter pipe (impure)</a><br>
 <a href="#hero-message">Async Hero Message and AsyncPipe</a><br>
 <a href="#hero-list">Hero List with caching FetchJsonPipe</a><br>
-<a href="#random-pipe">Random Pipe (pure pipe / impure function)</a><br>
 
 
 <hr>
@@ -81,8 +80,4 @@ <h2>Birthday Pipe Chaining</h2>
 <a id="hero-list"></a>
 <hero-list></hero-list>
 
-<hr>
-<a id="random-pipe"></a>
-<random-pipe></random-pipe>
-
 <div style="margin-top:12em;"></div>

public/docs/_examples/pipes/ts/app/app.component.ts

@@ -10,7 +10,6 @@ import {HeroBirthday2} from './hero-birthday2.component';
 import {HeroListComponent} from './hero-list.component';
 import {PowerBooster} from './power-booster.component';
 import {PowerBoostCalculator} from './power-boost-calculator.component';
-import {RandomPipeComponent} from './random-pipe.component';
 
 @Component({
   selector: 'my-app',
@@ -21,8 +20,7 @@ import {RandomPipeComponent} from './random-pipe.component';
     HeroBirthday,
     HeroBirthday2,
     HeroListComponent,
-    PowerBooster, PowerBoostCalculator,
-    RandomPipeComponent
+    PowerBooster, PowerBoostCalculator
   ],
   providers:[HTTP_PROVIDERS]
 })

public/docs/_examples/pipes/ts/app/exponential-strength.pipe.ts

@@ -11,8 +11,8 @@ import {Pipe, PipeTransform} from 'angular2/core';
 */
 @Pipe({name: 'exponentialStrength'})
 export class ExponentialStrengthPipe implements PipeTransform {
-  transform(value:number, [exponent]) : number {
-    var exp = parseFloat(exponent);
+  transform(value: number, exponent: string): number {
+    let exp = parseFloat(exponent);
     return Math.pow(value, isNaN(exp) ? 1 : exp);
   }
 }

public/docs/_examples/pipes/ts/app/fetch-json.pipe.ts

@@ -14,13 +14,13 @@ export class FetchJsonPipe  implements PipeTransform{
 
   constructor(private _http: Http) { }
 
-  transform(url:string):any {
+  transform(url: string): any {
     if (url !== this.prevUrl) {
       this.prevUrl = url;
       this.fetched = null;
       this._http.get(url)
         .map( result => result.json() )
-        .subscribe( result => this.fetched = result )
+        .subscribe( result => this.fetched = result );
     }
 
     return this.fetched;

public/docs/_examples/pipes/ts/app/random-pipe.component.ts

@@ -7,11 +7,11 @@
   },
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.15",
+    "angular2": "2.0.0-beta.16",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.10"
+    "zone.js": "0.6.12"
   },
   "devDependencies": {
     "concurrently": "^2.0.0",

public/docs/_examples/quickstart/js/package.1.json

@@ -11,17 +11,17 @@
   },
   "license": "ISC",
   "dependencies": {
-    "angular2": "2.0.0-beta.15",
+    "angular2": "2.0.0-beta.16",
     "systemjs": "0.19.26",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.10"
+    "zone.js": "0.6.12"
   },
   "devDependencies": {
     "concurrently": "^2.0.0",
     "lite-server": "^2.2.0",
     "typescript": "^1.8.10",
-    "typings":"^0.7.12"
+    "typings":"^0.8.1"
   }
 }

public/docs/_examples/quickstart/ts/package.1.json

@@ -11,7 +11,7 @@ import {AppComponent}      from './app.component';
 // Add these symbols to override the `LocationStrategy`
 import {provide}           from 'angular2/core';
 import {LocationStrategy,
-        HashLocationStrategy} from 'angular2/router';
+        HashLocationStrategy} from 'angular2/platform/common';
 // #enddocregion
 /* Can't use AppComponent ... but display as if we can
 // #docregion

public/docs/_examples/router/ts/app/main.2.ts

@@ -0,0 +1,9 @@
+// #docregion
+import { Component } from 'angular2/core';
+
+// #docregion example
+@Component({
+  selector: 'toh-hero'
+})
+export class HeroComponent {}
+// #enddocregion example

public/docs/_examples/style-guide/ts/02-07/app/hero.component.ts

@@ -0,0 +1,20 @@
+// #docregion
+/**
+ * AVOID THIS PATTERN
+ */
+
+/*
+* HeroComponent is in the Tour of Heroes feature
+*/
+@Component({
+  selector: 'hero'
+})
+export class HeroComponent {}
+
+/*
+* UsersComponent is in an Admin feature
+*/
+@Component({
+  selector: 'users'
+})
+export class UsersComponent {}