Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down
12 changes: 11 additions & 1 deletion addon/ng2/blueprints/component/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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,
Expand All @@ -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;
},
Expand Down
4 changes: 3 additions & 1 deletion addon/ng2/blueprints/route/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ 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) {
Expand Down
14 changes: 14 additions & 0 deletions tests/acceptance/generate-component.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});