Merge branch 'master' into master

Mathou54 · web-flow · commit a5e8af1dd79f · 2016-11-07T13:53:06.000+01:00
diff --git a/README.md b/README.md
@@ -298,7 +298,13 @@ source ~/.bash_profile
 
 ### Project assets
 
-You can add any files you want copied as-is to `src/assets/`.
+You use the `assets` array in `angular-cli.json` to list files or folders you want to copy as-is when building your project:
+```json
+"assets": [
+  "assets",
+  "favicon.ico"
+]
+```
 
 ### Global styles
 
diff --git a/packages/angular-cli/blueprints/component/files/__path__/__name__.component.ts b/packages/angular-cli/blueprints/component/files/__path__/__name__.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit<% if(viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection) { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
 
 @Component({
   selector: '<%= selector %>',<% if(inlineTemplate) { %>
@@ -9,7 +9,9 @@ import { Component, OnInit } from '@angular/core';
   `,<% } else { %>
   templateUrl: './<%= dasherizedModuleName %>.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./<%= dasherizedModuleName %>.component.<%= styleExt %>']<% } %>
+  styleUrls: ['./<%= dasherizedModuleName %>.component.<%= styleExt %>']<% } %><% if(viewEncapsulation) { %>,
+  encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection) { %>,
+  changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
 export class <%= classifiedModuleName %>Component implements OnInit {
 
diff --git a/packages/angular-cli/blueprints/component/index.js b/packages/angular-cli/blueprints/component/index.js
@@ -16,7 +16,9 @@ module.exports = {
     { name: 'inline-template', type: Boolean, aliases: ['it'] },
     { name: 'inline-style', type: Boolean, aliases: ['is'] },
     { name: 'prefix', type: Boolean, default: true },
-    { name: 'spec', type: Boolean }
+    { name: 'spec', type: Boolean },
+    { name: 'view-encapsulation', type: String, aliases: ['ve'] },
+    { name: 'change-detection', type: String, aliases: ['cd'] }
   ],
 
   beforeInstall: function() {
@@ -68,6 +70,14 @@ module.exports = {
       options.spec :
       this.project.ngConfigObj.get('defaults.spec.component');
 
+    options.viewEncapsulation = options.viewEncapsulation !== undefined ?
+      options.viewEncapsulation :
+      this.project.ngConfigObj.get('defaults.viewEncapsulation');
+
+    options.changeDetection = options.changeDetection !== undefined ?
+      options.changeDetection :
+      this.project.ngConfigObj.get('defaults.changeDetection');
+
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
       flat: options.flat,
@@ -77,7 +87,9 @@ module.exports = {
       route: options.route,
       isAppComponent: !!options.isAppComponent,
       selector: this.selector,
-      styleExt: this.styleExt
+      styleExt: this.styleExt,
+      viewEncapsulation: options.viewEncapsulation,
+      changeDetection: options.changeDetection
     };
   },
 
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/app/app-routing.module.ts b/packages/angular-cli/blueprints/ng2/files/__path__/app/app-routing.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-const routes: Routes = [];
+const routes: Routes = [
+  {
+    path: '',
+    children: []
+  }
+];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.html b/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.html
@@ -1,3 +1,4 @@
 <h1>
   {{title}}
-</h1>
+</h1><% if (routing) { %>
+<router-outlet></router-outlet><% } %>
diff --git a/packages/angular-cli/lib/config/schema.d.ts b/packages/angular-cli/lib/config/schema.d.ts
@@ -60,6 +60,8 @@ export interface CliConfig {
         styleExt?: string;
         prefixInterfaces?: boolean;
         poll?: number;
+        viewEncapsulation?: string;
+        changeDetection?: string;
         inline?: {
             style?: boolean;
             template?: boolean;
diff --git a/packages/angular-cli/lib/config/schema.json b/packages/angular-cli/lib/config/schema.json
@@ -37,7 +37,7 @@
             "items": {
               "type": "string"
             },
-            "default": [] 
+            "default": []
           },
           "index": {
             "type": "string",
@@ -144,6 +144,12 @@
         "poll": {
           "type": "number"
         },
+        "viewEncapsulation": {
+          "type": "string"
+        },
+        "changeDetection": {
+          "type": "string"
+        },
         "inline": {
           "type": "object",
           "properties": {
diff --git a/packages/angular-cli/utilities/completion.sh b/packages/angular-cli/utilities/completion.sh
@@ -16,7 +16,8 @@ init_opts='--dry-run inline-style inline-template --link-cli --mobile --name --p
 new_opts='--directory --dry-run inline-style inline-template --link-cli --mobile --prefix --routing --skip-bower --skip-git --skip-npm --source-dir --style --verbose -d -dir -is -it -lc -p -sb -sd -sg -sn -v'
 serve_opts='--aot --environment --host --live-reload --live-reload-base-url --live-reload-host --live-reload-live-css --live-reload-port --open --port --proxy-config --ssl --ssl-cert --ssl-key --target --watcher -H -e -lr -lrbu -lrh -lrp -o -p -pc -t -w'
 set_opts='--global -g'
-test_opts='--browsers --build --colors --log-level --port --reporters --watch -w'
+test_opts='--browsers --build --code-coverage --colors --lint --log-level --port --reporters --watch -cc -l -w'
+
 version_opts='--verbose'
 
 if test ".$(type -t complete 2>/dev/null || true)" = ".builtin"; then
diff --git a/packages/ast-tools/package.json b/packages/ast-tools/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@angular/tsc-wrapped": "^0.3.0",
-    "rxjs": "5.0.0-beta.11",
+    "rxjs": "5.0.0-beta.12",
     "denodeify": "^1.2.1",
     "typescript": "~2.0.3"
   }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`},`
`26`	`26`	`"dependencies": {`
`27`	`27`	`"@angular/tsc-wrapped": "^0.3.0",`
`28`		`- "rxjs": "5.0.0-beta.11",`
	`28`	`+ "rxjs": "5.0.0-beta.12",`
`29`	`29`	`"denodeify": "^1.2.1",`
`30`	`30`	`"typescript": "~2.0.3"`
`31`	`31`	`}`