Issue 6104 - Minified code in help center repository

gulpfile.js

 /*!

[juliandoucette, 2017/11/29 23:30:36]

Tabs! :O

[ire, 2017/11/30 10:04:43]

Oops :O !

Fixed :)

  * This file is part of help.eyeo.com.
  * Copyright (C) 2017-present eyeo GmbH
  *
  * help.eyeo.com is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * help.eyeo.com is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with help.eyeo.com.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 const gulp = require('gulp');
 const gutil = require('gulp-util');
 const sourcemaps = require('gulp-sourcemaps');
 const rename = require('gulp-rename');
-
-/**************************************************************************
- * CSS

[juliandoucette, 2017/11/29 23:30:36]

There seems to be something wrong with the SCSS source mapping. It only finds
variables.scss.

[ire, 2017/11/30 10:04:43]

Fixed. It was because I was calling sourcemaps.write('./') twice, which it
appears you should only do once, So I had to separate the tasks for the default
and minified CSS versions

- **************************************************************************/
-
 const sass = require('gulp-sass');
 const postcss = require('gulp-postcss');
 const scss = require('postcss-scss');
 const autoprefixer = require('autoprefixer');
-const cleanCSS = require('gulp-clean-css');
+const minify = require('gulp-minify');
+
+/******************************************************************************
+ * CSS
+ ******************************************************************************/
 
 gulp.task('css', function() {

[juliandoucette, 2017/12/08 14:57:21]

Single quotes :( ...

(I love single quotes... I want to use them someday... But... You know.)

[ire, 2017/12/11 15:29:31]

Done.

-        return gulp.src('./src/scss/main.scss')
-                .pipe(sourcemaps.init())
-                .pipe(postcss([autoprefixer()], {syntax: scss}).on('error', gutil.log))
-                .pipe(sass().on('error', gutil.log))
-                .pipe(sourcemaps.write('./'))
-                .pipe(gulp.dest('./static/css'))
-                .pipe(cleanCSS())
-                .pipe(rename('main.min.css'))
-                .pipe(sourcemaps.write('./'))
-                .pipe(gulp.dest('./static/css'));
+  return gulp.src(`./static/src/scss/main.scss`)

[juliandoucette, 2017/12/08 14:57:17]

Backtics...

[ire, 2017/12/11 15:29:32]

Done.

+    .pipe(sourcemaps.init())
+    .pipe(postcss([autoprefixer()], {syntax: scss}).on('error', gutil.log))
+    .pipe(sass({outputStyle: 'compressed'}).on('error', gutil.log))
+    .pipe(rename(`main.min.css`))
+    .pipe(sourcemaps.write('./'))
+    .pipe(gulp.dest('./static/dist/css'));
 });
 
-/**************************************************************************
+/******************************************************************************
  * JS
- **************************************************************************/
-
-const minify = require('gulp-minify');

[juliandoucette, 2017/11/29 23:30:36]

Requires usually go at the top

[ire, 2017/11/30 10:04:43]

Is that a coding style thing? I thought it made sense to separate them by each
task

[juliandoucette, 2017/12/04 10:49:37]

"<kzar> julian: Yea. It's certainly a convention to generally require stuff at
the top of the file, but not a rule as far as I know."

I guess it's not a code style rule because their are circumstances where it
makes sense e.g. conditional requires and circular dependencies. I think that we
should keep them at the top for the sake of consistency. 

+ ******************************************************************************/
 
 gulp.task('js', function() {
-        return gulp.src(['./src/js/*.js'])
-                .pipe(sourcemaps.init())
-                .pipe(minify({
-                        ext: {src:'.js', min:'.min.js'},
-                        preserveComments: 'some'
-                }))
-                .pipe(sourcemaps.write('./'))
-                .pipe(gulp.dest('./static/js'))
+  return gulp.src(['./static/src/js/**/*.js'])
+    .pipe(sourcemaps.init())
+    .pipe(minify({
+      noSource: true,
+      ext: {src:'.js', min:'.min.js'},

[juliandoucette, 2017/12/08 14:57:17]

Maybe src:js is unnecessary? 

[ire, 2017/12/11 15:29:31]

Done.

+      preserveComments: 'some'
+    }))
+    .pipe(sourcemaps.write('./'))
+    .pipe(gulp.dest('./static/dist/js'))
 });
 
-gulp.task('js-vendor', function() {
-        return gulp.src(['./src/js/vendor/*.js'])
-                .pipe(sourcemaps.init())
-                .pipe(minify({
-                        ext: {src:'.js', min:'.min.js'},
-                        preserveComments: 'some'
-                }))
-                .pipe(sourcemaps.write('./'))
-                .pipe(gulp.dest('./static/js/vendor'))
+/******************************************************************************
+ * Watch
+ ******************************************************************************/
+
+gulp.task('watch', function() {
+  gulp.watch('./static/src/scss/**/*.scss', ['css']);
+  gulp.watch('./static/src/js/**/*.js', ['js']);
 });
 
-/**************************************************************************
- * Watch
- **************************************************************************/
+/******************************************************************************
+ * Default
+ ******************************************************************************/
 
-gulp.task('watch', function() {
-        gulp.watch('./src/scss/**/*.scss', ['css']);
-        gulp.watch('./src/js/*.js', ['js']);
-        gulp.watch('./src/js/vendor/*.js', ['js-vendor']);
-});
-
-/**************************************************************************
- * Default
- **************************************************************************/
-
-gulp.task('default', ['css', 'js', 'js-vendor', 'watch']);
+gulp.task('default', ['css', 'js', 'watch']);