Issue 6104 - Minified code in help center repository

gulpfile.js

 /*!
  * 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');
 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
  ******************************************************************************/
 
-const entryScssFile = 'main';

[juliandoucette, 2017/12/06 15:01:36]

NIT: Discussed in-person. I think this is unnecessary/overdeveloped.

[ire, 2017/12/07 14:54:18]

Done.

-
-gulp.task('css', ['css-default', 'css-minified']);
-
-/* Expanded CSS

[juliandoucette, 2017/12/06 15:01:36]

NIT: It seems like this comment describes the task below, not a category of
tasks below. If the comment is necessary, then I suggest using a jsdoc comment
instead.

[ire, 2017/12/07 14:54:23]

Ack. This isn't necessary anymore since we are only having the minified file

- ******************************************************************************/
-
-gulp.task('css-default', function() {

[juliandoucette, 2017/12/06 15:01:35]

I don't think that it's necessary to output both minified/not versions of our
CSS if we have sourcemaps enabled.

[ire, 2017/12/07 14:54:19]

Done.

-  return gulp.src(`./static/src/scss/${entryScssFile}.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/dist/css'))
-});
-
-/* Minified CSS
- ******************************************************************************/
-
-gulp.task('css-minified', function() {
-  return gulp.src(`./static/src/scss/${entryScssFile}.scss`)
+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(`./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(`${entryScssFile}.min.css`))
+    .pipe(rename(`main.min.css`))
     .pipe(sourcemaps.write('./'))
     .pipe(gulp.dest('./static/dist/css'));
 });
 
 /******************************************************************************
  * JS
  ******************************************************************************/
 
 gulp.task('js', function() {

[juliandoucette, 2017/12/06 15:01:34]

It seems like we should be able to combine the src -> dist vendor/not tasks?

[ire, 2017/12/07 14:54:20]

You're right. I didn't think it would preserve the vendor directory, but looks
like it does.

Done.

-  return gulp.src(['./static/src/js/*.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(['./static/src/js/vendor/*.js'])
-    .pipe(sourcemaps.init())
-    .pipe(minify({
-      ext: {src:'.js', min:'.min.js'},
-      preserveComments: 'some'
-    }))
-    .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest('./static/dist/js/vendor'))
 });
 
 /******************************************************************************
  * Watch
  ******************************************************************************/
 
 gulp.task('watch', function() {
   gulp.watch('./static/src/scss/**/*.scss', ['css']);
-  gulp.watch('./static/src/js/*.js', ['js']);

[juliandoucette, 2017/12/06 15:01:35]

You could watch './static/src/js/**/*.js' instead of *.js && vendor/*.js

[ire, 2017/12/07 14:54:22]

Done.

-  gulp.watch('./static/src/js/vendor/*.js', ['js-vendor']);
+  gulp.watch('./static/src/js/**/*.js', ['js']);
 });
 
 /******************************************************************************
  * Default
  ******************************************************************************/
 
-gulp.task('default', ['css', 'js', 'js-vendor', 'watch']);
+gulp.task('default', ['css', 'js', 'watch']);