add sourcemaps, jshint esnext only for es6 and fix tests

Swiip · Swiip · commit 889bd0b433d3 · 2015-03-05T13:45:40.000+01:00
diff --git a/app/files.json b/app/files.json
@@ -2,7 +2,6 @@
   "staticFiles": [
     ".bowerrc",
     ".editorconfig",
-    ".jshintrc",
 
     "gulp/e2e-tests.js",
     "gulp/proxy.js",
@@ -16,6 +15,7 @@
   ],
   "templates": [
     ".gitignore",
+    ".jshintrc",
 
     "package.json",
     "bower.json",
diff --git a/app/src/preprocessors.js b/app/src/preprocessors.js
@@ -47,8 +47,6 @@ module.exports = function(GulpAngularGenerator) {
     }
 
     this.watchTaskDeps.push('\'inject\'');
-
-    console.log('this.watchTaskDeps', this.watchTaskDeps);
   };
 
   /**
diff --git a/app/templates/_.jshintrc b/app/templates/_.jshintrc
@@ -1,6 +1,8 @@
 {
   "node": true,
+<% if(props.jsPreprocessor.srcExtension === 'es6') { %>
   "esnext": true,
+<% } %>
   "bitwise": true,
   "camelcase": true,
   "curly": true,
diff --git a/app/templates/gulp/_inject.js b/app/templates/gulp/_inject.js
@@ -7,7 +7,7 @@ var $ = require('gulp-load-plugins')();
 var wiredep = require('wiredep').stream;
 
 module.exports = function(options) {
-  gulp.task('inject', function () {
+  gulp.task('inject', ['scripts', 'styles'], function () {
     var injectStyles = gulp.src([
 <% if (props.cssPreprocessor.key !== 'none') { %>
       options.tmp + '/serve/{app,components}/**/*.css',
diff --git a/app/templates/gulp/_scripts.js b/app/templates/gulp/_scripts.js
@@ -23,8 +23,6 @@ module.exports = function(options) {
       .pipe($.jshint.reporter('jshint-stylish'))
 <%   } if (props.jsPreprocessor.key !== 'none') { %>
       .pipe($.sourcemaps.init())
-<%   } if (props.jsPreprocessor.key === 'traceur') { %>
-      .pipe($.traceur()).on('error', options.errorHandler('Traceur'))
 <%   } if (props.jsPreprocessor.key === 'coffee') { %>
       .pipe($.coffeelint())
       .pipe($.coffeelint.reporter())
@@ -39,45 +37,50 @@ module.exports = function(options) {
 <%   } %>
 <%   if (props.jsPreprocessor.key === 'typescript') { %>
       .pipe($.toJson({filename: options.tmp + '/sortOutput.json', relative:true}))
-<%   } %>
-<%   if (props.jsPreprocessor.key === 'traceur') { %>
-      .pipe(gulp.dest(options.tmp + '/traceur'))
-<%   } else if (props.jsPreprocessor.key !== 'none') { %>
+<%   } if (props.jsPreprocessor.key !== 'none') { %>
       .pipe(gulp.dest(options.tmp + '/serve/'))
 <%   } %>
       .pipe(browserSync.reload({ stream: true }))
       .pipe($.size());
   });
 <% } else { %>
   function webpack(watch, callback) {
-    return gulp.src(options.src + '/app/index.js')
-      .pipe($.webpack({
-        watch: watch,
-        module: {
-          preLoaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'jshint-loader'}],
+    var webpackOptions = {
+      watch: watch,
+      module: {
+        preLoaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'jshint-loader'}],
 <%   if (props.jsPreprocessor.key === 'babel') { %>
-          loaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader'}]
+        loaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader'}]
 <%   } if (props.jsPreprocessor.key === 'traceur') { %>
-          loaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'traceur-loader'}]
+        loaders: [{ test: /\.js$/, exclude: /node_modules/, loader: 'traceur-loader'}]
 <%   } %>
-        },
-        output: { filename: 'index.js' }
-      }, null, function(err, stats) {
-        if(err) {
-          options.errorHandler('Webpack')(err);
-        }
-        $.util.log(stats.toString({
-          colors: $.util.colors.supportsColor,
-          chunks: false,
-          hash: false,
-          version: false
-        }));
-        browserSync.reload();
-        if(watch) {
-          watch = false;
-          callback();
-        }
-      }))
+      },
+      output: { filename: 'index.js' }
+    };
+
+    if(watch) {
+      webpackOptions.devtool = 'inline-source-map';
+    }
+
+    var webpackChangeHandler = function(err, stats) {
+      if(err) {
+        options.errorHandler('Webpack')(err);
+      }
+      $.util.log(stats.toString({
+        colors: $.util.colors.supportsColor,
+        chunks: false,
+        hash: false,
+        version: false
+      }));
+      browserSync.reload();
+      if(watch) {
+        watch = false;
+        callback();
+      }
+    };
+
+    return gulp.src(options.src + '/app/index.js')
+      .pipe($.webpack(webpackOptions, null, webpackChangeHandler))
       .pipe(gulp.dest(options.tmp + '/serve/app'));
   }
 
diff --git a/app/templates/src/app/_index.es6 b/app/templates/src/app/_index.es6
@@ -1,10 +1,9 @@
 'use strict';
-/*jshint esnext: true */
 
 import MainCtrl from './main/main.controller';
 import NavbarCtrl from '../components/navbar/navbar.controller';
 
 angular.module('<%= appName %>', [<%= modulesDependencies %>])
   .controller('MainCtrl', MainCtrl)
   .controller('NavbarCtrl', NavbarCtrl)
-  <%= routerJs %>;
+<%= routerJs %>;
diff --git a/app/templates/src/app/_index.ts b/app/templates/src/app/_index.ts
@@ -9,5 +9,5 @@ module <%= appName %> {
   angular.module('<%= appName %>', [<%= modulesDependencies %>])
     .controller('MainCtrl', MainCtrl)
     .controller('NavbarCtrl', NavbarCtrl)
-    <%= routerJs %>;
+<%= routerJs %>;
 }
diff --git a/app/templates/src/app/main/_main.controller.es6 b/app/templates/src/app/main/_main.controller.es6
@@ -1,5 +1,4 @@
 'use strict';
-/*jshint esnext: true */
 
 class MainCtrl {
   constructor ($scope) {
diff --git a/app/templates/src/components/navbar/_navbar.controller.es6 b/app/templates/src/components/navbar/_navbar.controller.es6
@@ -1,5 +1,4 @@
 'use strict';
-/*jshint esnext: true */
 
 class NavbarCtrl {
   constructor ($scope) {
diff --git a/test/node/test-preprocessors.js b/test/node/test-preprocessors.js
@@ -46,36 +46,27 @@ describe('gulp-angular generator preprocessors script', function () {
     });
   });
 
-  describe('compute dependencies for the gulp inject task', function() {
-    it('should be scripts if no preprocessors', function() {
+  describe('compute dependencies for the gulp watch task', function() {
+    it('should be inject if no es6 or html prepro', function() {
       generator.props = {
-        cssPreprocessor: { key: 'none' },
-        jsPreprocessor: { key: 'none' }
-      };
-      generator.computeInjectTaskDeps();
-      generator.injectTaskDeps.length.should.be.equal(1);
-      generator.injectTaskDeps[0].should.be.equal('\'scripts\'');
-    });
-
-    it('should be styles and scripts when there is preprocessors', function() {
-      generator.props = {
-        cssPreprocessor: { key: 'not none' },
-        jsPreprocessor: { key: 'not none' }
+        jsPreprocessor: { srcExtension: 'notes6' },
+        htmlPreprocessor: { key: 'none' }
       };
-      generator.computeInjectTaskDeps();
-      generator.injectTaskDeps.length.should.be.equal(2);
-      generator.injectTaskDeps[0].should.be.equal('\'styles\'');
-      generator.injectTaskDeps[1].should.be.equal('\'scripts\'');
+      generator.computeWatchTaskDeps();
+      generator.watchTaskDeps.length.should.be.equal(1);
+      generator.watchTaskDeps[0].should.be.equal('\'inject\'');
     });
 
-    it('should be browserify for traceur', function() {
+    it('should be inject, scripts:watch and markups when needed', function() {
       generator.props = {
-        cssPreprocessor: { key: 'none' },
-        jsPreprocessor: { key: 'traceur' }
+        jsPreprocessor: { srcExtension: 'es6' },
+        htmlPreprocessor: { key: 'notnone' }
       };
-      generator.computeInjectTaskDeps();
-      generator.injectTaskDeps.length.should.be.equal(1);
-      generator.injectTaskDeps[0].should.be.equal('\'browserify\'');
+      generator.computeWatchTaskDeps();
+      generator.watchTaskDeps.length.should.be.equal(3);
+      generator.watchTaskDeps[0].should.be.equal('\'scripts:watch\'');
+      generator.watchTaskDeps[1].should.be.equal('\'markups\'');
+      generator.watchTaskDeps[2].should.be.equal('\'inject\'');
     });
   });
 
diff --git a/test/template/mock-model.js b/test/template/mock-model.js
@@ -23,7 +23,7 @@ module.exports = function() {
     routerHtml: null,
     routerJs: null,
     isVendorStylesPreprocessed: false,
-    injectTaskDeps: null,
+    watchTaskDeps: [],
     wiredepExclusions: [],
     processedFileExtension: null,
     includeModernizr: false,
diff --git a/test/template/test-inject.js b/test/template/test-inject.js
@@ -23,16 +23,6 @@ describe('gulp-angular inject template', function () {
     model = mockModel();
   });
 
-  it('should insert inject task dependencies', function() {
-    model.injectTaskDeps = [];
-    var result = inject(model);
-    result.should.match(/gulp\.task\('inject', function/);
-
-    model.injectTaskDeps = ['\'a\'', '\'b\'', '\'c\''];
-    result = inject(model);
-    result.should.match(/gulp\.task\('inject', \['a', 'b', 'c'\], function/);
-  });
-
   it('should inject styles for src or tmp depending on the css preprocessor', function() {
     model.props.cssPreprocessor.key = 'none';
     var result = inject(model);
diff --git a/test/template/test-jshintrc.js b/test/template/test-jshintrc.js
@@ -0,0 +1,36 @@
+'use strict';
+/* jshint expr:true */
+
+var chai = require('chai');
+var sinonChai = require('sinon-chai');
+chai.should();
+chai.use(sinonChai);
+
+var templateTools = require('../template-tools');
+var mockModel = require('./mock-model');
+
+describe('gulp-angular jshint template', function () {
+  var jshint, model;
+
+  before(function() {
+    return templateTools.load('_.jshintrc')
+      .then(function(templateModule) {
+        jshint = templateModule;
+      });
+  });
+
+  beforeEach(function() {
+    model = mockModel();
+  });
+
+  it('should add esnext for es6 js prepro', function() {
+    model.props.jsPreprocessor.srcExtension = 'notes6';
+    var result = jshint(model);
+    result.should.not.match(/esnext/);
+
+    model.props.jsPreprocessor.srcExtension = 'es6';
+    result = jshint(model);
+    result.should.match(/"esnext": true/);
+  });
+
+});
diff --git a/test/template/test-package.js b/test/template/test-package.js
@@ -96,8 +96,8 @@ describe('gulp-angular package template', function () {
     model.props.jsPreprocessor.key = 'babel';
     model.props.jsPreprocessor.srcExtension = 'es6';
     result = packageJson(model);
-    result.should.match(/browserify"/);
-    result.should.match(/babelify/);
+    result.should.match(/gulp-webpack/);
+    result.should.match(/babel-loader/);
     result.should.not.match(/coffee/);
     result.should.not.match(/traceur/);
     result.should.not.match(/typescript/);
@@ -106,8 +106,8 @@ describe('gulp-angular package template', function () {
     model.props.jsPreprocessor.key = 'traceur';
     model.props.jsPreprocessor.srcExtension = 'es6';
     result = packageJson(model);
-    result.should.match(/browserify"/);
-    result.should.match(/gulp-traceur/);
+    result.should.match(/gulp-webpack/);
+    result.should.match(/traceur-loader/);
     result.should.not.match(/coffee/);
     result.should.not.match(/babel/);
     result.should.not.match(/typescript/);
diff --git a/test/template/test-scripts.js b/test/template/test-scripts.js
@@ -25,28 +25,13 @@ describe('gulp-angular scripts template', function () {
 
   it('should require the needed modules', function() {
     model.props.jsPreprocessor.key = 'none';
-    model.props.jsPreprocessor.srcExtension = 'js';
     var result = scripts(model);
     result.should.match(/var browserSync = require\('browser-sync'\);\n\nvar \$/);
 
     model.props.jsPreprocessor.key = 'typescript';
     result = scripts(model);
     result.should.match(/require\('mkdirp'\);/);
-    result.should.not.match(/browserify/);
     result.should.not.match(/babelify/);
-
-    model.props.jsPreprocessor.key = 'not babel';
-    model.props.jsPreprocessor.srcExtension = 'es6';
-    result = scripts(model);
-    result.should.match(/require\('browserify'\);/);
-    result.should.not.match(/mkdirp/);
-    result.should.not.match(/babelify/);
-
-    model.props.jsPreprocessor.key = 'babel';
-    result = scripts(model);
-    result.should.match(/require\('browserify'\);/);
-    result.should.match(/require\('babelify'\);/);
-    result.should.not.match(/mkdirp/);
   });
 
   it('should add tsd:install as dependencies for typescript', function() {
@@ -91,22 +76,22 @@ describe('gulp-angular scripts template', function () {
 
     model.props.jsPreprocessor.key = 'babel';
     model.props.jsPreprocessor.extension = 'js';
+    model.props.jsPreprocessor.srcExtension = 'es6';
     result = scripts(model);
-    result.should.match(/browserify\(\{ debug: true \}\)/);
-    result.should.match(/\.add\('\.\/' \+ options\.src \+ '\/app\/index\.js'\)/);
-    result.should.match(/\.transform\(babelify\)/);
-    result.should.not.match(/gulp\.src/);
+    result.should.match(/function webpack\(watch, callback\)/);
+    result.should.match(/loaders:.*loader: 'babel-loader'/);
+    result.should.match(/gulp\.task\('scripts:watch'/);
     result.should.not.match(/traceur/);
     result.should.not.match(/coffee/);
     result.should.not.match(/typescript/);
 
     model.props.jsPreprocessor.key = 'traceur';
     model.props.jsPreprocessor.extension = 'js';
+    model.props.jsPreprocessor.srcExtension = 'es6';
     result = scripts(model);
-    result.should.match(/gulp\.src\(options\.src \+ '[^\s]*\.js'\)/);
-    result.should.match(/\$\.jshint\(/);
-    result.should.match(/\$\.traceur\(/);
-    result.should.match(/gulp\.task\('browserify', \['scripts'\]/);
+    result.should.match(/function webpack\(watch, callback\)/);
+    result.should.match(/loaders:.*loader: 'traceur-loader'/);
+    result.should.match(/gulp\.task\('scripts:watch'/);
     result.should.not.match(/babel/);
     result.should.not.match(/coffee/);
     result.should.not.match(/typescript/);
diff --git a/test/template/test-watch.js b/test/template/test-watch.js

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ module.exports = function(GulpAngularGenerator) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`this.watchTaskDeps.push('\'inject\'');`
`50`		`-`
`51`		`- console.log('this.watchTaskDeps', this.watchTaskDeps);`
`52`	`50`	`};`
`53`	`51`
`54`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"node": true,`
	`3`	`+<% if(props.jsPreprocessor.srcExtension === 'es6') { %>`
`3`	`4`	`"esnext": true,`
	`5`	`+<% } %>`
`4`	`6`	`"bitwise": true,`
`5`	`7`	`"camelcase": true,`
`6`	`8`	`"curly": true,`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ module <%= appName %> {`
`9`	`9`	`angular.module('<%= appName %>', [<%= modulesDependencies %>])`
`10`	`10`	`.controller('MainCtrl', MainCtrl)`
`11`	`11`	`.controller('NavbarCtrl', NavbarCtrl)`
`12`		`- <%= routerJs %>;`
	`12`	`+<%= routerJs %>;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`'use strict';`
`2`		`-/jshint esnext: true /`
`3`	`2`
`4`	`3`	`class MainCtrl {`
`5`	`4`	`constructor ($scope) {`