Skip to content

Commit dc48034

Browse files
committed
minify task now looks at source.json
1 parent 790a388 commit dc48034

File tree

4 files changed

+24
-14
lines changed

4 files changed

+24
-14
lines changed

app/index.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ module.exports = generators.Base.extend({
4242
choices: ['Input' /*, 'Radio', 'Checkbox', 'Array'*/, 'Empty' ],
4343
default: 'Input'
4444
},
45+
{
46+
type: 'confirm',
47+
name: 'useDirective',
48+
message: 'Do you want a directive added to your addon?',
49+
default: true
50+
},
4551
{
4652
type : 'input',
4753
name : 'username',
@@ -53,12 +59,13 @@ module.exports = generators.Base.extend({
5359
*/
5460
this.addon.name = answers.name;
5561
this.addon.type = answers.type;
62+
this.addon.useDirective = answers.useDirective;
5663
this.addon.username = answers.username;
5764

5865
/* Changing cases
5966
*/
6067
this.addon.type = this.addon.type.toLowerCase(); // ex. Input > input
61-
this.addon.directive = camelcase(this.addon.name); // ex. add on > addOn
68+
this.addon.module = camelcase(this.addon.name); // ex. add on > addOn
6269
this.addon.typeName = this.addon.name.replace(/ /g, ''); // ex. add on > addon
6370
this.addon.paramName = this.addon.name.replace(/ /g, '-'); // ex. add on > add-on
6471

@@ -99,11 +106,12 @@ module.exports = generators.Base.extend({
99106
/* What to inject in the test controller
100107
*/
101108
var testModule = ['schemaForm'];
102-
var dest = file.replace('_', '.')
103-
.replace('module.js', this.addon.paramName + '.js');
109+
var sources = [];
110+
var dest = file.replace('_', '.');
104111

105112
if (this.addon.type !== 'empty') {
106-
testModule.push(this.addon.directive);
113+
testModule.push(this.addon.module);
114+
sources.push('src/module.js');
107115
}
108116

109117
/* Base files */
@@ -112,29 +120,29 @@ module.exports = generators.Base.extend({
112120
this.destinationPath('./') + dest,
113121
{
114122
name: this.addon.name,
115-
directive: this.addon.directive,
123+
module: this.addon.module,
116124
testModuleInj: JSON.stringify(testModule),
117125
typeName: this.addon.typeName,
118126
paramName: this.addon.paramName,
119127
schema: schema,
120128
form: JSON.stringify(form),
121-
username: this.addon.username
129+
username: this.addon.username,
130+
sources: JSON.stringify(sources)
122131
}
123132
);
124133
}.bind(this));
125134

126135
/* Type files */
127136
this.addon.files[this.addon.type].forEach(function(file) {
128137
var dest = file.replace('_', '.')
129-
.replace('template.html', this.addon.paramName + '.html')
130-
.replace('module.js', this.addon.paramName + '.js');
138+
.replace('template.html', this.addon.paramName + '.html');
131139

132140
this.fs.copyTpl(
133141
this.templatePath(this.templatePath(this.addon.type + '/src/') + file),
134142
this.destinationPath('./src/') + dest,
135143
{
136144
name: this.addon.name,
137-
directive: this.addon.directive,
145+
module: this.addon.module,
138146
typeName: this.addon.typeName,
139147
paramName: this.addon.paramName
140148
}

app/templates/base/gulp/tasks/minify.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var fs = require('fs');
12
var gulp = require('gulp');
23
var uglify = require('gulp-uglify');
34
var concat = require('gulp-concat');
@@ -6,18 +7,18 @@ var templateCache = require('gulp-angular-templatecache');
67
var streamqueue = require('streamqueue');
78

89
gulp.task('minify', function() {
9-
10+
var files = JSON.parse(fs.readFileSync('sources.json', 'utf-8'));
1011
var stream = streamqueue({objectMode: true},
1112
gulp.src(['src/templates/**/*.html']).pipe(templateCache({
1213
standalone: true,
1314
root: 'src/templates/'
1415
})),
15-
gulp.src(['src/*.js'])
16+
gulp.src(files)
1617
)
17-
.pipe(concat('<%= paramName %>.js'))
18+
.pipe(concat('asf-addon.js'))
1819
.pipe(gulp.dest('./dist'))
1920
.pipe(uglify())
20-
.pipe(rename('<%= paramName %>.min.js'))
21+
.pipe(rename('asf-addon.min.js'))
2122
.pipe(gulp.dest('./dist'));
2223

2324
return stream;

app/templates/base/sources.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%- sources -%>

app/templates/input/src/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('<%= directive %>', [
1+
angular.module('<%= module %>', [
22
'schemaForm',
33
'templates'
44
]).config(function(schemaFormDecoratorsProvider, sfBuilderProvider) {

0 commit comments

Comments
 (0)