Merge branch 'release/0.5.4'

app/templates/_gulp_config.json

@@ -8,8 +8,7 @@
     "css": [
       ""
     ],
-    "js": [
-      "node_modules/jquery/dist/jquery.js"<% if (bootstrapSass) { %>,
+    "js": [<% if (bootstrapSass) { %>,
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/affix.js",
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/alert.js",
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/button.js",

app/templates/_package.json

@@ -2,12 +2,14 @@
   "name": "<%= slug(name).toLowerCase() %>",
   "version": "0.0.0",
   "main": "index.html",
-  "browserify-shim": {},
+  "browserify-shim": {
+    "jquery": "global:jQuery"
+  },
   "dependencies": {<% if (bootstrap4) { %>
     "bootstrap": "[email protected]:twbs/bootstrap.git#v4-dev",<% } else if (bootstrapSass) { %>
     "bootstrap-sass": "~3.3.5",<% } %>
     "html5shiv": "^3.7.3",
-    "jquery": "^2.1.4",
+    "jquery": "^2.2.4",
     "respond.js": "^1.4.2"
   },
   "devDependencies": {

app/templates/assets/templates/base.html.swig

@@ -40,8 +40,9 @@
       </div>
     {% endif %}
 
+    <script src="https://code.jquery.com/jquery-2.2.4.min.js" crossorigin="anonymous"></script>
     <script src="/build/js/vendors.min.js"></script>
-    <script src="/build/js/main.js"></script>
+    <script src="/build/js/bundle.js"></script>
 
     {% if styleguide %}
       <script>

app/templates/tasks/scripts.js

@@ -15,19 +15,17 @@ var gulp            = require('gulp'),
 module.exports = function() {
 
   function errorAlert(error){
+    var args = Array.prototype.slice.call(arguments);
+
     if (!argv.production) {
       $.notify.onError({title: 'JS Error', message: 'Check your terminal', sound: 'Sosumi'})(error);
-      $.util.log(error.messageFormatted);
-    }
-    this.emit('end');
-  };
 
-  function handleErrors() {
-    var args = Array.prototype.slice.call(arguments);
-    $.notify.onError({
-      title: 'Compile Error',
-      message: '<%= error.message %>'
-    }).apply(this, args);
+      if (args) {
+        $.util.log(args);
+      } else {
+        $.util.log(error.messageFormatted);
+      }
+    }
     this.emit('end');
   }
 
@@ -48,14 +46,14 @@ module.exports = function() {
           sourceMaps: true
         }))
         .bundle()
-        .on('error', handleErrors)
+        .on('error', errorAlert)
         .pipe(source('bundle.js'))
         .pipe(buffer())
         .pipe($.sourcemaps.init({loadMaps: true}))
             .pipe($.if(argv.production, $.uglify()))
-            .on('error', handleErrors)
+            .on('error', errorAlert)
         .pipe(argv.production ? $.util.noop() : $.sourcemaps.write('./'))
-        .pipe(gulp.dest(config.build));
+        .pipe(gulp.dest(config.build + '/js'));
     } else {
       return browserify(
         {
@@ -68,15 +66,15 @@ module.exports = function() {
         }))
         .transform(browserifyshim)
         .bundle()
-        .on('error', handleErrors)
+        .on('error', errorAlert)
         .pipe(source('bundle.js'))
         .pipe(buffer())
         .pipe($.sourcemaps.init({loadMaps: true}))
             .pipe($.if(argv.production, $.uglify()))
-            .on('error', handleErrors)
+            .on('error', errorAlert)
         .pipe(argv.production ? $.util.noop() : $.sourcemaps.write('./'))
         .pipe($.size({title: 'BUNDLE SIZE', showFiles: true}))
-        .pipe(gulp.dest(config.build));
+        .pipe(gulp.dest(config.build + '/js'));
     }
   });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-toolbox",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Yeoman generator",
   "license": "MIT",
   "main": "app/index.js",