Updated hugo, node, yarn, gulp, webpack, fontawesome, highlight

pom.xml

@@ -30,9 +30,9 @@
     <packaging>pom</packaging>
 
     <properties>
-        <node.version>v8.9.1</node.version>
-        <yarn.version>v1.19.1</yarn.version>
-        <frontend.plugin.version>1.8.0</frontend.plugin.version>
+        <node.version>v16.14.0</node.version>
+        <yarn.version>v1.22.17</yarn.version>
+        <frontend.plugin.version>1.12.0</frontend.plugin.version>
         <gulp.task>serve</gulp.task>
         <!-- Host and port for dev mode, can be set via mvn (e.g. -Ddev.host="192.168.1.2" -Ddev.port=80) -->
         <dev.host>localhost</dev.host>

src/main/assets/gulp/build.js

@@ -19,9 +19,16 @@
 
 const gulp   = require("gulp");
 const reload = require("browser-sync").reload;
+require("./reference.js");
 
-gulp.task('build:content', ['reference:content'], reload);
+gulp.task('build:content', gulp.series('reference:content', function (done) {
+        reload();
+        done();
+    }));
 
-gulp.task('build:all', ['reference:all'], reload);
+gulp.task('build:all', gulp.series('reference:all', function (done) {
+        reload();
+        done();
+    }));
 
-gulp.task('build:publish', ['reference:publish']);
+gulp.task('build:publish', gulp.series('reference:publish'));

src/main/assets/gulp/bundle.js

@@ -18,5 +18,6 @@
  */
 
 const gulp = require("gulp");
+require("./build.js");
 
-gulp.task('bundle', ['build:publish']);
+gulp.task('bundle', gulp.series('build:publish'));

src/main/assets/gulp/default.js

@@ -18,5 +18,6 @@
  */
 
 const gulp = require('gulp');
+require('./serve.js');
 
-gulp.task('default', ['serve']);
+gulp.task('default', gulp.series('serve'));

src/main/assets/gulp/fonts.js

@@ -18,8 +18,9 @@
  */
 
 const gulp = require('gulp');
+require("./util.js");
 
-gulp.task('fonts', ['clean-static'], function() {
-    return gulp.src(['styles/fonts/*', 'node_modules/font-awesome/fonts/*'])
+gulp.task('fonts', gulp.series('clean-static', function() {
+    return gulp.src(['styles/fonts/*', 'node_modules/@fortawesome/fontawesome-free/webfonts/*'])
         .pipe(gulp.dest('../site/static/css/fonts'));
-});
+}));

src/main/assets/gulp/hugo.js

@@ -16,35 +16,40 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 const gulp = require('gulp');
 const childProcess = require('child_process');
-const hugo = require('hugo-bin');
-
-function runHugo(publish) {
-    const src = global.hugoConfig.srcDir;
-    const dst = global.hugoConfig.publicDir;
-    const conf = global.hugoConfig.srcDir + 'config.yaml';
-    const argv = require('yargs').argv;
-
-    let cmd = hugo + ' --config=' + conf + ' -s ' + src + ' -d ' + dst;
-
-    if (publish) {
-        cmd += ' --baseUrl="' + argv.prod_host + '" ';
-    } else {
-        cmd += ' --baseUrl="http://' + argv.host + ':' + argv.port + '/" '
-            + ' --buildDrafts=true --verbose=true --buildFuture';
-    }
-
-    console.log("Running " + cmd);
-    const result = childProcess.execSync(cmd, {encoding: 'utf-8'});
-    console.log('hugo out: \n' + result);
+require("./revision.js");
+
+async function runHugo(publish) {
+    return new Promise(async (resolve, reject) => {
+            const hugo = await import('hugo-bin');
+
+            const src = global.hugoConfig.srcDir;
+            const dst = global.hugoConfig.publicDir;
+            const conf = global.hugoConfig.srcDir + 'config.yaml';
+            const argv = require('yargs').argv;
+
+            let cmd = hugo.default + ' --config=' + conf + ' -s ' + src + ' -d ' + dst;
+
+            if (publish) {
+                cmd += ' --baseUrl="' + argv.prod_host + '" ';
+            } else {
+                cmd += ' --baseUrl="http://' + argv.host + ':' + argv.port + '/" '
+                    + ' --buildDrafts=true --verbose=true --buildFuture';
+            }
+
+            console.log("Running " + cmd);
+            const result = childProcess.execSync(cmd, {encoding: 'utf-8'});
+            console.log('hugo out: \n' + result);
+
+            resolve();
+        })
 }
 
-gulp.task('hugo:all', ['revision'], function() {
-    runHugo(false);
-});
+gulp.task('hugo:all', gulp.series('revision:all', function(done) {
+  runHugo(false).then(function () { done(); })
+}));
 
-gulp.task('hugo:publish', ['revision'], function() {
-    runHugo(true);
-});
+gulp.task('hugo:publish', gulp.series('revision:publish', function(done) {
+    runHugo(true).then(function () { done(); })
+}));

src/main/assets/gulp/images.js

@@ -18,12 +18,20 @@
  */
 
 const gulp     = require('gulp');
-const imagemin = require('gulp-imagemin');
 const changed  = require('gulp-changed');
+require("./util.js");
 
-gulp.task('images', ['clean-static'], function () {
-  return gulp.src('images/**/*.*')
-    .pipe(changed(global.hugoConfig.stagingDir + '/img'))
-    .pipe(imagemin())
-    .pipe(gulp.dest(global.hugoConfig.stagingDir + '/img'));
-});
+async function configImage() {
+    const imagemin = (await import("gulp-imagemin")).default;
+    return new Promise(function (resolve, reject) {
+                                   gulp.src('images/**/*.*')
+                                        .pipe(changed(global.hugoConfig.stagingDir + '/img'))
+                                        .pipe(imagemin())
+                                        .pipe(gulp.dest(global.hugoConfig.stagingDir + '/img'))
+                                        .on('finish', resolve)
+                                        .on('error', reject);
+                                   });}
+
+gulp.task('images', gulp.series('clean-static', function(done) {
+                                                  configImage().then(function () { done();})
+    }));

src/main/assets/gulp/publish.js

@@ -18,5 +18,6 @@
  */
 
 const gulp = require("gulp");
+require("./build.js");
 
-gulp.task('publish', ['build:publish']);
+gulp.task('publish', gulp.series('build:publish'));

src/main/assets/gulp/reference.js

@@ -21,6 +21,8 @@ const gulp    = require("gulp");
 const replace = require("gulp-rev-replace");
 const size    = require('gulp-size');
 const del     = require('del');
+require('./revision.js');
+require('./hugo.js');
 
 // replace references to generated resources inside content,
 // like <script src='bundle.js' -> <script src='styles-f12328c2b2.js'..
@@ -42,16 +44,16 @@ function updateResourceRefs() {
 }
 
 // dev start
-gulp.task('reference:all', ['hugo:all'], function() {
+gulp.task('reference:all', gulp.series('hugo:all', function() {
     return updateResourceRefs();
-});
+}));
 
 // release build
-gulp.task('reference:publish', ['hugo:publish'], function() {
+gulp.task('reference:publish', gulp.series('hugo:publish', function() {
     return updateResourceRefs();
-});
+}));
 
 // live rebuild
-gulp.task('reference:content', ['revision'], function() {
+gulp.task('reference:content', gulp.series('revision:all', function() {
     return updateResourceRefs();
-});
+}));

src/main/assets/gulp/revision.js

@@ -22,25 +22,12 @@ const rev   = require('gulp-rev');
 const del   = require('rev-del');
 const path  = require('path');
 const clean = require('gulp-clean');
+require("./styles.js");
+require("./scripts.js");
+require("./images.js");
+require("./fonts.js");
 
-// styles, scripts, images, fonts depends on this
-gulp.task('clean-static', function() {
-    return gulp.src(
-        [
-            global.hugoConfig.srcDir + '/static/css/**/*.css',
-            global.hugoConfig.srcDir + '/static/js/**/*.js',
-            global.hugoConfig.srcDir + '/static/js/**/*.js.map'
-        ],{base: global.hugoConfig.srcDir, read: false})
-        .pipe(clean({force: true}));
-});
-
-// separately copy source maps
-gulp.task('copy-js-map', ['scripts'], function () {
-    return gulp.src(global.hugoConfig.stagingDir + '/js/**/*.js.map')
-        .pipe(gulp.dest(global.hugoConfig.srcDir + '/static/js'));
-});
-
-gulp.task('revision', ['styles', 'scripts', 'images', 'fonts', 'copy-js-map'], function() {
+function revisionTask() {
     return gulp.src(
         [
             global.hugoConfig.stagingDir + '/css/**/*.css',
@@ -54,4 +41,18 @@ gulp.task('revision', ['styles', 'scripts', 'images', 'fonts', 'copy-js-map'], f
         .pipe(rev.manifest('../../../../target/site/staging/rev-manifest.json'))
         .pipe(del({dest: global.hugoConfig.srcDir + '/static', force: true}))
         .pipe(gulp.dest(global.hugoConfig.srcDir + '/static'));
-});
+}
+
+// separately copy source maps
+gulp.task('copy-js-map', gulp.series( function () {
+    return gulp.src(global.hugoConfig.stagingDir + '/js/**/*.js.map')
+        .pipe(gulp.dest(global.hugoConfig.srcDir + '/static/js'));
+}));
+
+gulp.task('revision:all', gulp.series(gulp.parallel('styles', 'scripts:all', 'images', 'fonts'),'copy-js-map', function() {
+    return revisionTask();
+}));
+
+gulp.task('revision:publish', gulp.series(gulp.series('styles', 'scripts:publish', 'images', 'fonts'),'copy-js-map', function() {
+    return revisionTask();
+}));

src/main/assets/gulp/scripts.js

@@ -22,13 +22,14 @@ const jshint  = require('gulp-jshint');
 const uglify  = require('gulp-uglify');
 const webpack = require('webpack'); // use newer version of webpack
 const gulpWebpack  = require('webpack-stream');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 
-gulp.task('scripts', ['clean-static'], function() {
+function scriptConfig(modeType) {
     return gulp.src('scripts/**/*.js')
         .pipe(jshint())
         .pipe(jshint.reporter("default"))
         .pipe(gulpWebpack({
+                mode: modeType,
                 output: {
                     filename: 'bundle.js'
                 },
@@ -41,11 +42,18 @@ gulp.task('scripts', ['clean-static'], function() {
                         Popper: ['popper.js', 'default'],
                         Util: "exports-loader?Util!bootstrap/js/dist/util"
                     }),
-                    new UglifyJsPlugin({
-                        sourceMap: true
-                    })
+                    new TerserPlugin()
                 ],
                 devtool: "source-map"
         }, webpack))
         .pipe(gulp.dest(global.hugoConfig.stagingDir + '/js'));
-});
+}
+
+gulp.task('scripts:all', gulp.series('clean-static', function() {
+   return scriptConfig('development');
+}));
+
+gulp.task('scripts:publish', gulp.series('clean-static', function() {
+   return scriptConfig('production');
+}));
+

src/main/assets/gulp/serve.js

@@ -20,8 +20,9 @@
 const gulp        = require("gulp");
 const browserSync = require("browser-sync");
 const watch       = require("gulp-watch");
+require("./build.js");
 
-gulp.task('serve', ['build:all'], function() {
+gulp.task('serve', gulp.series('build:all', function(done) {
 
     const argv = require('yargs').argv;
 
@@ -40,10 +41,7 @@ gulp.task('serve', ['build:all'], function() {
             global.hugoConfig.srcDir + '/data/**/*',
             global.hugoConfig.srcDir + '/layouts/**/*',
             global.hugoConfig.srcDir + '/config.yaml'
-        ], {},
-        function handle() {
-		    gulp.start('build:all');
-	    }
+        ], gulp.series('build:all')
     );
 
     watch(
@@ -52,9 +50,7 @@ gulp.task('serve', ['build:all'], function() {
             'styles/**/*.css',
             'scripts/**/*.js',
             'images/**/*.*'
-        ], {},
-        function handle() {
-		    gulp.start('build:all');
-        }
+        ], gulp.series('build:all')
     );
-});
+    done();
+}));

src/main/assets/gulp/styles.js

@@ -18,13 +18,14 @@
  */
 
 const gulp 		 = require('gulp');
-const sass 		 = require('gulp-sass');
+const sass 		 = require('gulp-sass')(require('sass'));
 const autoprefixer = require('gulp-autoprefixer');
 const cleancss 	 = require('gulp-clean-css');
 const merge 	 = require('merge-stream');
 const concat 	 = require('gulp-concat');
+require("./util.js");
 
-gulp.task('styles', ['clean-static'], function() {
+gulp.task('styles', gulp.series('clean-static', function() {
     const scssStream = gulp.src('styles/**/*.scss')
         .pipe(sass())
         .pipe(concat('scss-files.css'));
@@ -37,4 +38,4 @@ gulp.task('styles', ['clean-static'], function() {
 		.pipe(cleancss({advanced:false}))
         .pipe(concat('styles.css'))
         .pipe(gulp.dest(global.hugoConfig.stagingDir + '/css'));
-});
+}));

src/main/assets/gulp/util.js

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const gulp  = require('gulp');
+const clean = require('gulp-clean');// styles, scripts, images, fonts depends on this
+
+gulp.task('clean-static', function() {
+    return gulp.src(
+        [
+            global.hugoConfig.srcDir + '/static/css/**/*.css',
+            global.hugoConfig.srcDir + '/static/js/**/*.js',
+            global.hugoConfig.srcDir + '/static/js/**/*.js.map'
+        ],{base: global.hugoConfig.srcDir, read: false})
+        .pipe(clean({force: true}));
+});