Skip to content

Commit cde443d

Browse files
Awk34Awk34
committed
Merge pull request #998 from DaftMonk/babel
feat(app): Add Babel option
2 parents f6f912f + 498d751 commit cde443d

File tree

9 files changed

+126
-12
lines changed

9 files changed

+126
-12
lines changed

‎app/index.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
7878

7979
return filterMap[val];
8080
}
81+
}, {
82+
type: "confirm",
83+
name: "babel",
84+
message: "Would you like to use Javascript ES6 in your client by preprocessing it with Babel?",
85+
when: function (answers) {
86+
return answers.script === 'js';
87+
}
8188
}, {
8289
type: "list",
8390
name: "markup",
@@ -110,6 +117,9 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
110117
return answers.bootstrap;
111118
}
112119
}], function (answers) {
120+
121+
this.filters.babel = !!answers.babel;
122+
if(this.filters.babel){ this.filters.js = true; }
113123
this.filters[answers.script] = true;
114124
this.filters[answers.markup] = true;
115125
this.filters[answers.stylesheet] = true;
@@ -211,6 +221,7 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
211221

212222
if(this.filters.ngroute) filters.push('ngroute');
213223
if(this.filters.uirouter) filters.push('uirouter');
224+
if(this.filters.babel) extensions.push('babel');
214225
if(this.filters.coffee) extensions.push('coffee');
215226
if(this.filters.js) extensions.push('js');
216227
if(this.filters.html) extensions.push('html');

‎app/templates/Gruntfile.js‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@ module.exports = function (grunt) {
127127
'<%%= yeoman.client %>/{app,components}/**/*.spec.{coffee,litcoffee,coffee.md}'
128128
],
129129
tasks: ['karma']
130+
},<% } %><% if(filters.babel) { %>
131+
babel: {
132+
files: [
133+
'<%%= yeoman.client %>/{app,components}/**/*.js',
134+
'!<%%= yeoman.client %>/{app,components}/**/*.spec.js'
135+
],
136+
tasks: ['babel']
130137
},<% } %>
131138
gruntfile: {
132139
files: ['Gruntfile.js']
@@ -135,7 +142,11 @@ module.exports = function (grunt) {
135142
files: [
136143
'{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.css',
137144
'{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.html',
145+
<% if(filters.babel) { %>
146+
'.tmp/{app,components}/**/*.js',
147+
<% } else { %>
138148
'{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.js',
149+
<% } %>
139150
'!{.tmp,<%%= yeoman.client %>}{app,components}/**/*.spec.js',
140151
'!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.mock.js',
141152
'<%%= yeoman.client %>/assets/images/{,*//*}*.{png,jpg,jpeg,gif,webp,svg}'
@@ -442,14 +453,16 @@ module.exports = function (grunt) {
442453
// Run some tasks in parallel to speed up the build process
443454
concurrent: {
444455
server: [<% if(filters.coffee) { %>
445-
'coffee',<% } %><% if(filters.jade) { %>
456+
'coffee',<% } %><% if(filters.babel) { %>
457+
'babel',<% } %><% if(filters.jade) { %>
446458
'jade',<% } %><% if(filters.stylus) { %>
447459
'stylus',<% } %><% if(filters.sass) { %>
448460
'sass',<% } %><% if(filters.less) { %>
449461
'less',<% } %>
450462
],
451463
test: [<% if(filters.coffee) { %>
452-
'coffee',<% } %><% if(filters.jade) { %>
464+
'coffee',<% } %><% if(filters.babel) { %>
465+
'babel',<% } %><% if(filters.jade) { %>
453466
'jade',<% } %><% if(filters.stylus) { %>
454467
'stylus',<% } %><% if(filters.sass) { %>
455468
'sass',<% } %><% if(filters.less) { %>
@@ -465,7 +478,8 @@ module.exports = function (grunt) {
465478
}
466479
},
467480
dist: [<% if(filters.coffee) { %>
468-
'coffee',<% } %><% if(filters.jade) { %>
481+
'coffee',<% } %><% if(filters.babel) { %>
482+
'babel',<% } %><% if(filters.jade) { %>
469483
'jade',<% } %><% if(filters.stylus) { %>
470484
'stylus',<% } %><% if(filters.sass) { %>
471485
'sass',<% } %><% if(filters.less) { %>
@@ -551,6 +565,24 @@ module.exports = function (grunt) {
551565
ext: '.js'
552566
}]
553567
}
568+
},<% } %><% if(filters.babel) { %>
569+
570+
// Compiles ES6 to JavaScript using Babel
571+
babel: {
572+
options: {
573+
sourceMap: true
574+
},
575+
server: {
576+
files: [{
577+
expand: true,
578+
cwd: 'client',
579+
src: [
580+
'{app,components}/**/*.js',
581+
'!{app,components}/**/*.spec.js'
582+
],
583+
dest: '.tmp'
584+
}]
585+
}
554586
},<% } %><% if(filters.stylus) { %>
555587

556588
// Compiles Stylus to CSS
@@ -620,10 +652,16 @@ module.exports = function (grunt) {
620652
},
621653
files: {
622654
'<%%= yeoman.client %>/index.html': [
623-
['{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.js',
624-
'!{.tmp,<%%= yeoman.client %>}/app/app.js',
625-
'!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.spec.js',
626-
'!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.mock.js']
655+
[
656+
<% if(filters.babel) { %>
657+
'.tmp/{app,components}/**/*.js',
658+
<% } else { %>
659+
'{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.js',
660+
<% } %>
661+
'!{.tmp,<%%= yeoman.client %>}/app/app.js',
662+
'!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.spec.js',
663+
'!{.tmp,<%%= yeoman.client %>}/{app,components}/**/*.mock.js'
664+
]
627665
]
628666
}
629667
},<% if(filters.stylus) { %>

‎app/templates/_package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
"grunt-contrib-watch": "~0.6.1",<% if(filters.coffee) { %>
4646
"grunt-contrib-coffee": "^0.10.1",<% } %><% if(filters.jade) { %>
4747
"grunt-contrib-jade": "^0.11.0",<% } %><% if(filters.less) { %>
48-
"grunt-contrib-less": "^0.11.0",<% } %>
48+
"grunt-contrib-less": "^0.11.0",<% } %><% if(filters.babel) { %>
49+
"karma-babel-preprocessor": "^5.2.1",
50+
"grunt-babel": "~5.0.0",<% } %>
4951
"grunt-google-cdn": "~0.4.0",
5052
"grunt-newer": "~0.7.0",
5153
"grunt-ng-annotate": "^0.2.3",

‎app/templates/client/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@
5050
<script src="socket.io-client/socket.io.js"></script><% } %>
5151
<!-- endbuild -->
5252

53+
<% if(filters.babel) { %>
54+
<!-- build:js(.tmp) app/app.js -->
55+
<% } else { %>
5356
<!-- build:js({.tmp,client}) app/app.js -->
57+
<% } %>
5458
<script src="app/app.js"></script>
5559
<!-- injector:js -->
5660
<!-- endinjector -->

‎app/templates/karma.conf.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ module.exports = function(config) {
3636

3737
preprocessors: {
3838
'**/*.jade': 'ng-jade2js',
39-
'**/*.html': 'html2js',
39+
'**/*.html': 'html2js',<% if(filters.babel) { %>
40+
'client/app/**/*.js': 'babel',<% } %>
4041
'**/*.coffee': 'coffee',
4142
},
4243

@@ -48,6 +49,20 @@ module.exports = function(config) {
4849
stripPrefix: 'client/'
4950
},
5051

52+
<% if(filters.babel) { %>
53+
babelPreprocessor: {
54+
options: {
55+
sourceMap: 'inline'
56+
},
57+
filename: function (file) {
58+
return file.originalPath.replace(/\.js$/, '.es5.js');
59+
},
60+
sourceFileName: function (file) {
61+
return file.originalPath;
62+
}
63+
},
64+
<% } %>
65+
5166
// list of files / patterns to exclude
5267
exclude: [],
5368

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Run `grunt` for building, `grunt serve` for preview, and `grunt serve:dist` for
3535

3636
**Client**
3737

38-
* Scripts: `JavaScript`, `CoffeeScript`
38+
* Scripts: `JavaScript`, `CoffeeScript`, `Babel`
3939
* Markup: `HTML`, `Jade`
4040
* Stylesheets: `CSS`, `Stylus`, `Sass`, `Less`,
4141
* Angular Routers: `ngRoute`, `ui-router`

‎test/fixtures/bower.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"angular": ">=1.2.*",
66
"json3": "~3.3.1",
77
"es5-shim": "~3.0.1",
8-
"jquery": "~1.11.0",
98
"bootstrap-sass-official": "~3.1.1",
109
"bootstrap": "~3.1.1",
1110
"angular-resource": ">=1.2.*",

‎test/fixtures/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"main": "server/app.js",
55
"dependencies": {
6-
"express": "~4.0.0",
6+
"express": "~4.9.0",
77
"morgan": "~1.0.0",
88
"body-parser": "~1.5.0",
99
"method-override": "~1.0.0",
@@ -46,6 +46,8 @@
4646
"grunt-contrib-coffee": "^0.10.1",
4747
"grunt-contrib-jade": "^0.11.0",
4848
"grunt-contrib-less": "^0.11.0",
49+
"karma-babel-preprocessor": "^5.2.1",
50+
"grunt-babel": "~5.0.0",
4951
"grunt-google-cdn": "~0.4.0",
5052
"grunt-newer": "~0.7.0",
5153
"grunt-ng-annotate": "^0.2.3",

‎test/test-file-creation.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,49 @@ describe('angular-fullstack generator', function () {
145145
// });
146146
});
147147

148+
describe('with Babel ES6 preprocessor', function() {
149+
beforeEach(function() {
150+
helpers.mockPrompt(gen, {
151+
script: 'js',
152+
babel: true,
153+
markup: 'jade',
154+
stylesheet: 'less',
155+
router: 'uirouter'
156+
});
157+
});
158+
159+
it('should run client tests successfully', function(done) {
160+
this.timeout(60000);
161+
gen.run({}, function () {
162+
exec('grunt test:client', function (error, stdout, stderr) {
163+
expect(stdout, 'Client tests failed \n' + stdout ).to.contain('Executed 1 of 1\u001b[32m SUCCESS\u001b');
164+
done();
165+
});
166+
});
167+
});
168+
169+
it('should pass jshint', function(done) {
170+
this.timeout(60000);
171+
gen.run({}, function () {
172+
exec('grunt jshint', function (error, stdout, stderr) {
173+
expect(stdout).to.contain('Done, without errors.');
174+
done();
175+
});
176+
});
177+
});
178+
179+
it('should run server tests successfully', function(done) {
180+
this.timeout(60000);
181+
gen.run({}, function () {
182+
exec('grunt test:server', function (error, stdout, stderr) {
183+
expect(stdout, 'Server tests failed (do you have mongoDB running?) \n' + stdout).to.contain('Done, without errors.');
184+
done();
185+
});
186+
});
187+
});
188+
});
189+
190+
148191
describe('with other preprocessors and oauth', function() {
149192
beforeEach(function() {
150193
helpers.mockPrompt(gen, {

0 commit comments

Comments
 (0)