@videinfra/static-website-builder 1.5.2 → 1.6.1

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.1] - 2022-10-21
+### Fixed
+- `false` task config being overwritten by empty array resulting in task being performed
+
+## [1.6.0] - 2022-06-20
+### Updated
+- gulp-sass to use latest node-sass version
+### Added
+- `stylesheets.legacy` configuration option to turn off `node-sass` and use `sass`
+
 ## [1.5.2] - 2022-06-17
 ### Updated
 - In build mode prevent data from being read more than once

package/lib/get-config.js

@@ -85,6 +85,7 @@ function getTaskConfig (...path) {
  * @protected
  */
 function itterateConfig (config, fn) {
+    if (config === false) return false;
     const base = isPlainObject(config) ? {} : [];
 
     return reduce(config, (object, value, key) => {
@@ -111,7 +112,13 @@ function itterateConfig (config, fn) {
 function mergeConfigMode (config) {
     if ('production' in config || 'development' in config) {
         const mode = global.production ? 'production' : 'development';
-        return omit(merge(config, config[mode]), ['production', 'development']);
+        const value = merge(config, config[mode]);
+
+        if (value !== false) {
+            return omit(value, ['production', 'development']);
+        } else {
+            return value;
+        }
     } else {
         return config;
     }

package/lib/merge.js

@@ -17,7 +17,11 @@ function customizer (objValue, srcValue, key) {
  */
 module.exports = function merge (object, ...sources) {
     for (let i = 0; i < sources.length; i++) {
-        object = mergeWith(object, sources[i], customizer);
+        if (sources[i] && typeof sources[i] === 'object') {
+            object = mergeWith(object, sources[i], customizer);
+        } else {
+            object = sources[i];
+        }
     }
     return object;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@videinfra/static-website-builder",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {
@@ -43,7 +43,7 @@
     "gulp-ignore": "^3.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-postcss": "^8.0.0",
-    "gulp-sass": "^4.1.1",
+    "gulp-sass": "^5.1.0",
     "gulp-sizereport": "^1.2.1",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",
@@ -51,6 +51,8 @@
     "gulp-twig": "^1.2.0",
     "minimist": "^1.2.6",
     "nano-memoize": "^1.3.0",
+    "node-sass": "^7.0.1",
+    "sass": "^1.52.3",
     "webpack": "^4.46.0",
     "webpack-stream": "^5.2.1"
   },

package/plugins/sass-engine/preprocess-config.js

@@ -2,7 +2,7 @@ const paths = require('./../../lib/get-path');
 const getConfig = require('./../../lib/get-config');
 const getPaths = require('./../../lib/get-path');
 const assign = require('lodash/assign');
-const sass = require('gulp-sass');
+const gulpSass = require('gulp-sass');
 
 
 /**
@@ -22,6 +22,7 @@ module.exports = function processSASSConfig (config, fullConfig) {
 
         // Engine is a function which returns a gulp pipe function
         config.engine = function getSASSEngine () {
+            const sass = config.legacy ? gulpSass(require('node-sass')) : gulpSass(require('sass'));
             return sass(getConfig.getTaskConfig('stylesheets', 'sass')).on('error', sass.logError)
         };
 

package/plugins/sass.js

@@ -5,6 +5,9 @@ exports.stylesheets = {
     // Add sass to the extensions
     extensions: ['scss', 'sass'],
 
+    // Use legacy `node-sass` instead of `sass`
+    legacy: true,
+
     // SASS options
     // see https://github.com/sass/node-sass#options
     sass: {