Update: JShint and modules JS

dionarodrigues · Feb 22, 2017 · 14b6094 · 14b6094
1 parent 9688a55
commit 14b6094
Show file tree

Hide file tree

Showing 15 changed files with 10,341 additions and 15 deletions.
diff --git a/.jshintignore b/.jshintignore
@@ -0,0 +1,3 @@
+src/js/libs/
+src/js/plugins/
+
diff --git a/README.md b/README.md
@@ -35,7 +35,10 @@ Then you need to install the dependencies to run this boilerplate:
 │   │   │   ├── fonts
 │   │   ├── img
 │   │   ├── js 
-│   │   │   └── main.js
+│   │   │   └── libs/*.js
+│   │   │   ├── plugins/*.js
+│   │   │   ├── modules/*.js
+│   │   │   ├── main.js
 │   ├── index.html
 ├── gulpfile.js
 ├── package.json

diff --git a/deploy/assets/css/main.css b/deploy/assets/css/main.css
diff --git a/deploy/assets/js/main.js b/deploy/assets/js/main.js
diff --git a/deploy/index.html b/deploy/index.html
@@ -28,15 +28,15 @@
   <body>
     <header class="header-page">
       <div class="container">
-        <div class="brand"><img src="assets/img/logo-iceberg-boilerplate.svg" alt="Iceberg Simple Boilerplate" width="300px"/>
-          <h1 class="brand-description">The Iceberg Simple Boilerplate is a simple boilerplate using Gulp, Jade, Stylus and Browsersync.</h1>
+        <div class="header-page__brand brand"><img class="brand__media" src="assets/img/logo-iceberg-boilerplate.svg" alt="Iceberg Simple Boilerplate" width="300px"/>
+          <h1 class="brand__description">The Iceberg Simple Boilerplate is a simple boilerplate using Gulp, Jade, Stylus and Browsersync.</h1>
         </div>
       </div>
     </header>
     <div class="container">
       <main class="main-page"><a class="btn" href="https://github.com/diogorodrigues/iceberg-boilerplate">Fork me on github</a></main>
     </div>
-    <footer class="footer-page">By <a href="https://github.com/diogorodrigues">Diogo Rodrigues</a></footer>
+    <footer class="footer-page">By <a class="footer-page__link" href="https://github.com/diogorodrigues">Diogo Rodrigues</a></footer>
     <script async="async" src="assets/js/main.js"></script>
   </body>
 </html:5>
diff --git a/gulpfile.js b/gulpfile.js
@@ -11,6 +11,7 @@ var gulp        = require('gulp'),
     prefixer    = require('autoprefixer-stylus'),
     cssnano     = require('gulp-cssnano'),
     uglify      = require('gulp-uglify'),
+    jshint      = require("gulp-jshint"),
     concat      = require('gulp-concat'), 
     imagemin    = require('gulp-imagemin'),
     browserSync = require('browser-sync'),
@@ -27,13 +28,19 @@ var gulp        = require('gulp'),
                     bower: "./bower_components/"
                 },
     srcPaths    = {
-                    jsVendors: paths.dev + 'js/vendor/*.js',
                     js: paths.dev + 'js/*.js',
+                    jsLibs: paths.dev + 'js/libs/*.js',
+                    jsPlugins: paths.dev + 'js/plugins/*.js',
+                    jsModules: paths.dev + 'js/modules/*.js',
+
                     css: paths.dev + 'styl/**/*.styl',
                     mainStyl: paths.dev + 'styl/main.styl',
+
                     pug: paths.dev + 'views/**/*.pug',
                     pugPages: paths.dev + 'views/pages/**/*.pug',
+
                     img: paths.dev + 'img/**/*.{jpg,png,gif,svg}',
+
                     fonts: paths.dev + 'fonts/*',
                 },
     buildPaths  = {
@@ -93,10 +100,13 @@ gulp.task('fonts', function() {
 
 // Javascript Task
 gulp.task('js', function() {
-    return gulp.src([srcPaths.jsVendors, srcPaths.js])
+    return gulp.src([ srcPaths.jsLibs, srcPaths.jsPlugins, srcPaths.jsModules, srcPaths.js ])
             .pipe(plumber())
+            .pipe(jshint())
+            .pipe(jshint.reporter('default'))
             .pipe(concat('main.js'))
             .pipe(uglify()) //--> minify js
+            .pipe(browserSync.reload({stream:true}))
             .pipe(gulp.dest(buildPaths.js))
             .pipe(reload({stream: true}));
 });
@@ -118,7 +128,7 @@ gulp.task('watch', function () {
         gulp.start('css', done);
     }));
 
-    watch(srcPaths.js, batch(function(event, done){
+    watch([srcPaths.jsModules, srcPaths.js], batch(function(event, done){
         gulp.start('js', done);
     }));
 

diff --git a/package.json b/package.json
@@ -26,13 +26,15 @@
     "gulp-concat": "^2.6.0",
     "gulp-cssnano": "^2.1.1",
     "gulp-imagemin": "^2.4.0",
+    "gulp-jshint": "^2.0.4",
     "gulp-plumber": "^1.1.0",
     "gulp-pug": "^3.0.4",
     "gulp-rucksack": "^0.1.3",
     "gulp-stylus": "^2.3.1",
     "gulp-uglify": "^1.5.3",
     "gulp-watch": "^4.3.5",
     "jeet": "^6.1.1",
+    "jshint": "^2.9.4",
     "kouto-swiss": "^0.11.14",
     "run-sequence": "^1.1.5",
     "rupture": "^0.6.1"