Skip to content

Commit ab1bf13

Browse files
committed
fix(gen): comment out ngCompnent stuff
fixes #2403
1 parent 66ea123 commit ab1bf13

File tree

1 file changed

+61
-61
lines changed

1 file changed

+61
-61
lines changed

Diff for: src/generators/app/index.js

+61-61
Original file line numberDiff line numberDiff line change
@@ -390,67 +390,67 @@ export class Generator extends Base {
390390
this.config.set('filters', this.filters);
391391
this.config.forceSave();
392392
},
393-
ngComponent: function() {
394-
if(this.skipConfig) return;
395-
var appPath = 'client/app/';
396-
var extensions = [];
397-
var filters = [
398-
'ngroute',
399-
'uirouter',
400-
'jasmine',
401-
'mocha',
402-
'expect',
403-
'should'
404-
].filter(v => this.filters[v]);
405-
406-
if(this.filters.ngroute) filters.push('ngroute');
407-
if(this.filters.uirouter) filters.push('uirouter');
408-
if(this.filters.babel) extensions.push('babel');
409-
if(this.filters.ts) extensions.push('ts');
410-
if(this.filters.js) extensions.push('js');
411-
if(this.filters.html) extensions.push('html');
412-
if(this.filters.pug) extensions.push('pug');
413-
if(this.filters.css) extensions.push('css');
414-
if(this.filters.stylus) extensions.push('styl');
415-
if(this.filters.sass) extensions.push('scss');
416-
if(this.filters.less) extensions.push('less');
417-
418-
filters.push('es6'); // Generate ES6 syntax code
419-
filters.push('webpack'); // Generate ES6 Module imports/exports
420-
421-
this.composeWith('ng-component', {
422-
options: {
423-
'routeDirectory': appPath,
424-
'directiveDirectory': appPath,
425-
'filterDirectory': appPath,
426-
'serviceDirectory': appPath,
427-
'componentDirectory': `${appPath}components/`,
428-
'filters': filters,
429-
'extensions': extensions,
430-
'basePath': 'client',
431-
'forceConfig': this.forceConfig
432-
}
433-
}, { local: require.resolve('generator-ng-component/generators/app/index.js') });
434-
},
435-
ngModules: function() {
436-
var angModules = [
437-
`'${this.scriptAppName}.constants'`,
438-
"'ngCookies'",
439-
"'ngResource'",
440-
"'ngSanitize'"
441-
];
442-
if(this.filters.ngroute) angModules.push("'ngRoute'");
443-
if(this.filters.socketio) angModules.push("'btford.socket-io'");
444-
if(this.filters.uirouter) angModules.push("'ui.router'");
445-
if(this.filters.uibootstrap) angModules.push("'ui.bootstrap'");
446-
if(this.filters.auth) {
447-
angModules.unshift(`'${this.scriptAppName}.admin'`);
448-
angModules.unshift(`'${this.scriptAppName}.auth'`);
449-
angModules.push("'validation.match'");
450-
}
451-
452-
this.angularModules = '\n ' + angModules.join(',\n ') +'\n';
453-
}
393+
// ngComponent: function() {
394+
// if(this.skipConfig) return;
395+
// var appPath = 'client/app/';
396+
// var extensions = [];
397+
// var filters = [
398+
// 'ngroute',
399+
// 'uirouter',
400+
// 'jasmine',
401+
// 'mocha',
402+
// 'expect',
403+
// 'should'
404+
// ].filter(v => this.filters[v]);
405+
406+
// if(this.filters.ngroute) filters.push('ngroute');
407+
// if(this.filters.uirouter) filters.push('uirouter');
408+
// if(this.filters.babel) extensions.push('babel');
409+
// if(this.filters.ts) extensions.push('ts');
410+
// if(this.filters.js) extensions.push('js');
411+
// if(this.filters.html) extensions.push('html');
412+
// if(this.filters.pug) extensions.push('pug');
413+
// if(this.filters.css) extensions.push('css');
414+
// if(this.filters.stylus) extensions.push('styl');
415+
// if(this.filters.sass) extensions.push('scss');
416+
// if(this.filters.less) extensions.push('less');
417+
418+
// filters.push('es6'); // Generate ES6 syntax code
419+
// filters.push('webpack'); // Generate ES6 Module imports/exports
420+
421+
// this.composeWith('ng-component', {
422+
// options: {
423+
// 'routeDirectory': appPath,
424+
// 'directiveDirectory': appPath,
425+
// 'filterDirectory': appPath,
426+
// 'serviceDirectory': appPath,
427+
// 'componentDirectory': `${appPath}components/`,
428+
// 'filters': filters,
429+
// 'extensions': extensions,
430+
// 'basePath': 'client',
431+
// 'forceConfig': this.forceConfig
432+
// }
433+
// }, { local: require.resolve('generator-ng-component/generators/app/index.js') });
434+
// },
435+
// ngModules: function() {
436+
// var angModules = [
437+
// `'${this.scriptAppName}.constants'`,
438+
// "'ngCookies'",
439+
// "'ngResource'",
440+
// "'ngSanitize'"
441+
// ];
442+
// if(this.filters.ngroute) angModules.push("'ngRoute'");
443+
// if(this.filters.socketio) angModules.push("'btford.socket-io'");
444+
// if(this.filters.uirouter) angModules.push("'ui.router'");
445+
// if(this.filters.uibootstrap) angModules.push("'ui.bootstrap'");
446+
// if(this.filters.auth) {
447+
// angModules.unshift(`'${this.scriptAppName}.admin'`);
448+
// angModules.unshift(`'${this.scriptAppName}.auth'`);
449+
// angModules.push("'validation.match'");
450+
// }
451+
452+
// this.angularModules = '\n ' + angModules.join(',\n ') +'\n';
453+
// }
454454
};
455455
}
456456

0 commit comments

Comments
 (0)