Merge branch 'master' into config

Author: hansl

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

@@ -3,9 +3,16 @@ import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS} from 'angular2/router'
 
 @Component({
   moduleId: __moduleName,
-  selector: '<%= dasherizedModuleName %>',
-  templateUrl: '<%= dasherizedModuleName %>.component.html',
-  styleUrls: ['<%= dasherizedModuleName %>.component.<%= styleExt %>']<% if (route) { %>,
+  selector: '<%= dasherizedModuleName %>',<% if(inlineTemplate) { %>
+  template: `
+    <p>
+      <%= dasherizedModuleName %> Works!
+    </p><% if (route) { %>
+    <router-outlet></router-outlet><% } %>
+  `,<% } else { %>
+  templateUrl: '<%= dasherizedModuleName %>.component.html',<% } if(inlineStyle) { %>
+  styles: []<% } else { %>
+  styleUrls: ['<%= dasherizedModuleName %>.component.<%= styleExt %>']<% } if (route) { %>,
   directives: [ROUTER_DIRECTIVES]<% } %>
 })<% if (route) { %>
 @RouteConfig([

addon/ng2/blueprints/component/index.js

@@ -20,7 +20,9 @@ module.exports = {
 
   availableOptions: [
     { name: 'flat', type: Boolean, default: false },
-    { name: 'route', type: Boolean, default: false }
+    { name: 'route', type: Boolean, default: false },
+    { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] },
+    { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] }
   ],
 
   normalizeEntityName: function (entityName) {
@@ -42,6 +44,8 @@ module.exports = {
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
       flat: options.flat,
+      inlineTemplate: options.inlineTemplate,
+      inlineStyle: options.inlineStyle,
       route: options.route,
       styleExt: this.styleExt,
       isLazyRoute: !!options.isLazyRoute,
@@ -58,6 +62,12 @@ module.exports = {
     if (this.options && !this.options.route) {
       fileList = fileList.filter(p => p.indexOf(path.join('shared', 'index.ts')) <= 0);
     }
+    if (this.options && this.options.inlineTemplate) {
+      fileList = fileList.filter(p => p.indexOf('.html') < 0);
+    }
+    if (this.options && this.options.inlineStyle) {
+      fileList = fileList.filter(p => p.indexOf('.__styleext__') < 0);
+    }
 
     return fileList;
   },

addon/ng2/blueprints/ng2/files/gitignore

@@ -24,3 +24,5 @@ testem.log
 /e2e/*.js
 /e2e/*.map
 
+#System Files
+.DS_Store

addon/ng2/blueprints/route/index.js

@@ -13,9 +13,11 @@ module.exports = {
   availableOptions: [
     { name: 'skip-router-generation', type: Boolean, default: false, aliases: ['srg'] },
     { name: 'default', type: Boolean, default: false },
-    { name: 'lazy', type: Boolean, default: true }
+    { name: 'lazy', type: Boolean, default: true },
+    { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] },
+    { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] }
   ],
-  
+
   beforeInstall: function(options) {
     options.route = true;
     if (options.lazy) {
@@ -38,7 +40,7 @@ module.exports = {
     var parsedPath = dynamicPathParser(this.project, entityName);
 
     this.dynamicPath = parsedPath;
-    
+
     //leave the entity name intact for component generation
     return entityName;
   },
@@ -113,7 +115,7 @@ module.exports = {
 
     // Insert the import statement.
     let content = fs.readFileSync(parentFile, 'utf-8');
-    const importTemplate = `import {${jsComponentName}Component} from './+${base}';`;
+    const importTemplate = `import {${jsComponentName}Component} from './${options.isLazyRoute ? '+' : ''}${base}';`;
 
     if (content.indexOf(importTemplate) != -1) {
       // Already there, do nothing.

bin/ng

@@ -8,7 +8,6 @@ const resolve = require('resolve');
 const exit = require('exit');
 const packageJson = require('../package.json');
 const Leek = require('leek');
-const fs = require('fs');
 
 resolve('angular-cli', { basedir: process.cwd() },
   function (error, projectLocalCli) {
@@ -29,10 +28,6 @@ resolve('angular-cli', { basedir: process.cwd() },
       cli = cli['default'];
     }
 
-    if ('default' in cli) {
-      cli = cli['default'];
-    }
-
     cli({
       cliArgs: process.argv.slice(2),
       inputStream: process.stdin,

tests/acceptance/generate-component.spec.js

@@ -159,4 +159,18 @@ describe('Acceptance: ng generate component', function () {
         expect(existsSync(testPath)).to.equal(true);
       });
   });
+  
+  it('ng generate component my-comp --inline-template', function () {
+    return ng(['generate', 'component', 'my-comp', '--inline-template']).then(() => {
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-comp', 'my-comp.component.html');
+      expect(existsSync(testPath)).to.equal(false);
+    });
+  });
+  
+  it('ng generate component my-comp --inline-style', function () {
+    return ng(['generate', 'component', 'my-comp', '--inline-style']).then(() => {
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-comp', 'my-comp.component.css');
+      expect(existsSync(testPath)).to.equal(false);
+    });
+  });
 });