Merge pull request #6 from angular/master

chore: merge September 11th 2016

Author: kieronqtran

.appveyor.yml

@@ -3,6 +3,9 @@ environment:
   - nodejs_version: "5.0"
   - nodejs_version: "6.0"
 
+matrix:
+  fast_finish: true
+
 install:
   - ps: Install-Product node $env:nodejs_version
   - npm install
@@ -11,5 +14,6 @@ test_script:
   - node --version
   - npm --version
   - npm test
+  - npm run test:e2e
 
 build: off

.gitignore

@@ -1,10 +1,11 @@
 dist/
 node_modules/
-npm-debug.log
+npm-debug.log*
 
 # IDEs
 .idea/
 jsconfig.json
+.vscode/
 
 # Typings file.
 typings/

.travis.yml

@@ -13,15 +13,22 @@ env:
   matrix:
     - SCRIPT=lint
 #    - SCRIPT=build
+    - SCRIPT=e2e
+    - SCRIPT=e2e:nightly
     - SCRIPT=test
 #    - TARGET=mobile SCRIPT=mobile_test
 matrix:
   fast_finish: true
   allow_failures:
     - os: osx
+    - env: SCRIPT=e2e:nightly
   exclude:
     - node_js: "6"
       env: SCRIPT=lint
+    - os: osx
+      env: SCRIPT=e2e:nightly
+    - node_js: "6"
+      env: SCRIPT=e2e:nightly
     - os: osx
       node_js: "5"
       env: SCRIPT=lint

README.md

@@ -78,7 +78,7 @@ Navigate to `http://localhost:4200/`. The app will automatically reload if you c
 You can configure the default HTTP port and the one used by the LiveReload server with two command-line options :
 
 ```bash
-ng serve --port 4201 --live-reload-port 49153
+ng serve --host 0.0.0.0 --port 4201 --live-reload-port 49153
 ```
 
 ### Generating Components, Directives, Pipes and Services

WEBPACK_UPDATE.md

@@ -16,9 +16,6 @@ rm -rf node_modules dist tmp typings
 npm install --save-dev angular-cli@webpack
 ```
 
-IMPORTANT NOTE: 
-Currently project generated with `ng new` will use a wrong local CLI version (see https://github.com/angular/angular-cli/issues/1528). After initializing your project, run `npm install --save-dev angular-cli@webpack` to set the correct version.
-
 ## Project files
 
 You will need to run `ng init` to check for changes in all the auto-generated files created by `ng new` and allow you to update yours. You are offered four choices for each changed file: `y` (overwrite), `n` (don't overwrite), `d` (show diff between your file and the updated file) and `h` (help).

addon/ng2/blueprints/component/index.js

@@ -2,6 +2,7 @@ var path = require('path');
 var chalk = require('chalk');
 var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+const findParentModule = require('../../utilities/find-parent-module').default;
 var getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
@@ -17,6 +18,14 @@ module.exports = {
     { name: 'spec', type: Boolean, default: true }
   ],
 
+  beforeInstall: function() {
+    try {
+      this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
+    } catch(e) {
+      throw `Error locating module for declaration\n\t${e}`;
+    }
+  },
+
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
 
@@ -100,15 +109,14 @@ module.exports = {
     }
 
     const returns = [];
-    const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
     const className = stringUtils.classify(`${options.entity.name}Component`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
-    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
+    const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath);
     const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(modulePath, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/blueprints/directive/index.js

@@ -2,6 +2,7 @@ var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
+const findParentModule = require('../../utilities/find-parent-module').default;
 
 module.exports = {
   description: '',
@@ -11,11 +12,19 @@ module.exports = {
     { name: 'prefix', type: Boolean, default: true }
   ],
 
+  beforeInstall: function() {
+    try {
+      this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
+    } catch(e) {
+      throw `Error locating module for declaration\n\t${e}`;
+    }
+  },
+
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
 
     this.dynamicPath = parsedPath;
-    
+
     var defaultPrefix = '';
     if (this.project.ngConfig &&
         this.project.ngConfig.apps[0] &&
@@ -56,15 +65,14 @@ module.exports = {
     }
 
     const returns = [];
-    const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
     const className = stringUtils.classify(`${options.entity.name}Directive`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
     const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
     const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(modulePath, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/blueprints/module/files/__path__/__name__.module.ts

@@ -1,15 +1,12 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { routing } from './<%= dasherizedModuleName %>.routes';
-import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
+import { CommonModule } from '@angular/common';<% if (routing) { %>
+import { <%= camelizedModuleName %>Routing } from './<%= dasherizedModuleName %>.routing';<% } %>
 
 @NgModule({
   imports: [
-    CommonModule,
-    routing
+    CommonModule<% if (routing) { %>,
+    <%= camelizedModuleName %>Routing<% } %>
   ],
-  declarations: [
-    <%= classifiedModuleName %>Component
-  ]
+  declarations: []
 })
 export class <%= classifiedModuleName %>Module { }

addon/ng2/blueprints/module/files/__path__/__name__.routing.ts

@@ -0,0 +1,6 @@
+import { Routes, RouterModule } from '@angular/router';
+
+export const <%= camelizedModuleName %>Routes: Routes = [];
+
+export const <%= camelizedModuleName %>Routing = RouterModule.forChild(<%= camelizedModuleName %>˝Routes);
+

addon/ng2/blueprints/module/index.js

@@ -7,9 +7,10 @@ module.exports = {
   description: '',
 
   availableOptions: [
-    { name: 'spec', type: Boolean, default: false }
+    { name: 'spec', type: Boolean, default: false },
+    { name: 'routing', type: Boolean, default: false }
   ],
-  
+
   normalizeEntityName: function (entityName) {
     this.entityName = entityName;
     var parsedPath = dynamicPathParser(this.project, entityName);
@@ -19,9 +20,10 @@ module.exports = {
   },
 
   locals: function (options) {
-    return { 
+    return {
       dynamicPath: this.dynamicPath.dir,
-      spec: options.spec
+      spec: options.spec,
+      routing: options.routing
     };
   },
 
@@ -31,6 +33,9 @@ module.exports = {
     if (!this.options || !this.options.spec) {
       fileList = fileList.filter(p => p.indexOf('__name__.module.spec.ts') < 0);
     }
+    if (this.options && !this.options.routing) {
+      fileList = fileList.filter(p => p.indexOf('__name__.routing.ts') < 0);
+    }
 
     return fileList;
   },
@@ -40,17 +45,17 @@ module.exports = {
     this.dasherizedModuleName = options.dasherizedModuleName;
     return {
       __path__: () => {
-        this.generatePath = this.dynamicPath.dir 
-          + path.sep 
+        this.generatePath = this.dynamicPath.dir
+          + path.sep
           + options.dasherizedModuleName;
         return this.generatePath;
       }
     };
   },
 
   afterInstall: function (options) {
-    options.entity.name = this.entityName;
-    options.flat = false;
+    options.entity.name = path.join(this.entityName, this.dasherizedModuleName);
+    options.flat = true;
     options.route = false;
     options.inlineTemplate = false;
     options.inlineStyle = false;

addon/ng2/blueprints/ng2/files/package.json

@@ -46,6 +46,6 @@
     "protractor": "4.0.3",
     "ts-node": "1.2.1",
     "tslint": "3.13.0",
-    "typescript": "2.0.0"
+    "typescript": "2.0.2"
   }
 }

addon/ng2/blueprints/ng2/index.js

@@ -21,7 +21,7 @@ module.exports = {
 
   locals: function(options) {
     this.styleExt = options.style;
-    this.version = require(path.resolve(__dirname, '..', '..', '..', '..', 'package.json')).version;
+    this.version = require(path.resolve(__dirname, '../../../../package.json')).version;
 
     // Join with / not path.sep as reference to typings require forward slashes.
     const relativeRootPath = options.sourceDir.split(path.sep).map(() => '..').join('/');
@@ -44,12 +44,11 @@ module.exports = {
 
   files: function() {
     var fileList = getFiles.call(this);
-    
     if (this.options && this.options.mobile) {
       fileList = fileList.filter(p => p.indexOf('__name__.component.html') < 0);
       fileList = fileList.filter(p => p.indexOf('__name__.component.__styleext__') < 0);
     }
-    
+
     return fileList;
   },
 

addon/ng2/blueprints/pipe/index.js

@@ -2,14 +2,23 @@ var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
+const findParentModule = require('../../utilities/find-parent-module').default;
 
 module.exports = {
   description: '',
-  
+
   availableOptions: [
     { name: 'flat', type: Boolean, default: true }
   ],
 
+  beforeInstall: function() {
+    try {
+      this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
+    } catch(e) {
+      throw `Error locating module for declaration\n\t${e}`;
+    }
+  },
+
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
 
@@ -18,7 +27,7 @@ module.exports = {
   },
 
   locals: function (options) {
-    return { 
+    return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat
     };
@@ -37,22 +46,21 @@ module.exports = {
       }
     };
   },
-  
+
   afterInstall: function(options) {
     if (options.dryRun) {
       return;
     }
 
     const returns = [];
-    const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
     const className = stringUtils.classify(`${options.entity.name}Pipe`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.pipe`);
     const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
     const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(
-        astUtils.addComponentToModule(modulePath, className, importPath)
+        astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
           .then(change => change.apply()));
     }
 

addon/ng2/blueprints/service/index.js

@@ -1,4 +1,5 @@
 var path = require('path');
+const chalk = require('chalk');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
@@ -34,5 +35,10 @@ module.exports = {
         return dir;
       }
     };
+  },
+
+  afterInstall() {
+    const warningMessage = 'Service is generated but not provided, it must be provided to be used';
+    this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage);
   }
 };