@videinfra/static-website-builder 2.0.10 → 2.1.0

package/CHANGELOG.md

@@ -4,6 +4,11 @@ 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/).
 
+## [2.1.0] - 2026-03-04
+### Changed
+- Updated gulp-sass to use sass-embedded instead of sass
+- Updated gulp-sass to remove legacy code and use only sync mode
+
 ## [2.0.9] - 2026-02-19
 ### Fixed
 - Removed file extension from the sitemap URLs

package/init/test/src/stylesheets/env-test.scss

@@ -1,13 +1,15 @@
+@use 'sass:map';
+
 .env-test:before {
-    content: map-get($env, host);
+    content: map.get($env, host);
 }
 
 :root {
-    #{ --env-test-type-number }: map-get($env, typeNumber);
-    #{ --env-test-type-empty }: map-get($env, typeEmpty);
+    #{ --env-test-type-number }: map.get($env, typeNumber);
+    #{ --env-test-type-empty }: map.get($env, typeEmpty);
 }
 
-@if map-get($env, typeBoolTrue) {
+@if map.get($env, typeBoolTrue) {
     :root {
         --env-test-bool-true: true;
     }
@@ -17,7 +19,7 @@
     }
 }
 
-@if map-get($env, typeBoolFalse) {
+@if map.get($env, typeBoolFalse) {
     :root {
         --env-test-bool-false: true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@videinfra/static-website-builder",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {
@@ -58,7 +58,7 @@
     "minimist": "^1.2.8",
     "nano-memoize": "3.0.16",
     "rolldown": "^1.0.0-rc.1",
-    "sass": "^1.97.3",
+    "sass-embedded": "^1.97.3",
     "through": "^2.3.8",
     "twig": "^1.17.1"
   },

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

@@ -4,7 +4,7 @@ import merge from './../../lib/merge.js';
 import getEnvData from './../../tasks/env/get-env.js';
 import gulpSass from '../../vendor/gulp-sass/index.js';
 import assign from 'lodash/assign.js';
-import * as sass from 'sass';
+import * as sass from 'sass-embedded';
 
 /**
  * Modify configuration
@@ -32,7 +32,15 @@ export default function processSASSConfig(config, fullConfig) {
         });
 
         // Engine is a function which returns a gulp pipe function
-        config.engine = function getSASSEngine() {
+        config._engineCache = null;
+        config.engine = function getSASSEngine(disposeOnly = false) {
+            if (config._engineCache) {
+                config._engineCache.dispose();
+            }
+            if (disposeOnly) {
+                return;
+            }
+
             const sassEngine = gulpSass(sass);
             const sassConfig = getTaskConfig('stylesheets', 'sass');
 
@@ -41,7 +49,10 @@ export default function processSASSConfig(config, fullConfig) {
             }
 
             sassConfig.data = merge(getEnvData().sass, sassConfig.data || {});
-            return sassEngine(sassConfig, /* sync */ true).on('error', sassEngine.logError);
+            config._engineCache = sassEngine(sassConfig).on('error', sassEngine.logError);
+            config._engineCache.dispose = sassEngine.dispose;
+
+            return config._engineCache;
         };
 
         // Main 'dependents' config is shared between all tasks

package/tasks/stylesheets/task.js

@@ -33,13 +33,13 @@ const getGlobPaths = nanomemoize.nanomemoize(function () {
 });
 
 
-const getEngine = function () {
+const getEngine = function (disposeOnly = false) {
     const engine = getTaskConfig('stylesheets', 'engine');
-    return engine ? engine() : (() => {});
+    return engine ? engine(disposeOnly) : (() => {});
 };
 
 
-function stylesheets () {
+function stylesheetsBuild () {
     return gulp.src(getGlobPaths())
         .pipe(taskStart())
 
@@ -65,9 +65,14 @@ function stylesheets () {
 }
 
 function stylesheetsWatch () {
-    return taskWatch(getWatchGlobPaths(true), stylesheets);
+    return taskWatch(getWatchGlobPaths(true), stylesheetsBuild);
+}
+
+function stylesheetsBuildEnd () {
+    getEngine(true);
+    return Promise.resolve();
 }
 
 
-export const build = stylesheets;
+export const build = gulp.series(stylesheetsBuild, stylesheetsBuildEnd);
 export const watch = stylesheetsWatch;

package/vendor/gulp-sass/index.js

@@ -1,4 +1,6 @@
 // 2025-01-20, Kaspars Zuks: added "options.data" support for variables
+// 2026-03-04, Kaspars Zuks: updated to use "compileString" instead of "renderSync"
+// 2026-03-04, Kaspars Zuks: removed async version
 'use strict';
 
 import path from 'path';
@@ -8,54 +10,17 @@ import PluginError from 'plugin-error';
 import replaceExtension from 'replace-ext';
 import stripAnsi from 'strip-ansi';
 import clonedeep from 'lodash.clonedeep';
-import applySourceMap from 'vinyl-sourcemaps-apply';
 import sassStingify from './sass-stringify.js';
 
 const PLUGIN_NAME = 'gulp-sass';
 
-const MISSING_COMPILER_MESSAGE = `
-gulp-sass no longer has a default Sass compiler; please set one yourself.
-Both the "sass" and "node-sass" packages are permitted.
-For example, in your gulpfile:
-
-  import * as sass from 'sass';
-  import gulpSass from 'gulp-sass';
-  const instance = gulpSass(sass);
-`;
-
 const transfob = (transform) => new Transform({ transform, objectMode: true });
 
 /**
  * Handles returning the file to the stream
  */
-const filePush = (file, sassObject, callback) => {
-    // Build Source Maps!
-    if (sassObject.map) {
-        // Transform map into JSON
-        const sassMap = JSON.parse(sassObject.map.toString());
-        // Grab the stdout and transform it into stdin
-        const sassMapFile = sassMap.file.replace(/^stdout$/, 'stdin');
-        // Grab the base filename that's being worked on
-        const sassFileSrc = file.relative;
-        // Grab the path portion of the file that's being worked on
-        const sassFileSrcPath = path.dirname(sassFileSrc);
-
-        if (sassFileSrcPath) {
-            const sourceFileIndex = sassMap.sources.indexOf(sassMapFile);
-            // Prepend the path to all files in the sources array except the file that's being worked on
-            sassMap.sources = sassMap.sources.map((source, index) => (index === sourceFileIndex ? source : path.join(sassFileSrcPath, source)));
-        }
-
-        // Remove 'stdin' from souces and replace with filenames!
-        sassMap.sources = sassMap.sources.filter((src) => src !== 'stdin' && src);
-
-        // Replace the map file with the original filename (but new extension)
-        sassMap.file = replaceExtension(sassFileSrc, '.css');
-        // Apply the map
-        applySourceMap(file, sassMap);
-    }
-
-    file.contents = sassObject.css;
+const filePush = (file, css, callback) => {
+    file.contents = css;
     file.path = replaceExtension(file.path, '.css');
 
     if (file.stat) {
@@ -81,32 +46,13 @@ const handleError = (error, file, callback) => {
     return callback(new PluginError(PLUGIN_NAME, error));
 };
 
-/**
- * Escape SCSS variable value for output in SCSS
- * @param {any} value Value
- * @returns {string} Escaped value
- */
-const escapeSCSSVariable = (value) => {
-    if (value !== '' && (value === true || value === false || !isNaN(value))) {
-        return String(value);
-    } else {
-        // Convert to string
-        return "'" + value.toString().replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/\n/g, '\\n') + "'";
-    }
-};
-
 /**
  * Main Gulp Sass function
  */
 
 // eslint-disable-next-line arrow-body-style
-const gulpSass = (options, sync) => {
+const gulpSass = (options) => {
     return transfob((file, encoding, callback) => {
-        if (file.isNull()) {
-            callback(null, file);
-            return;
-        }
-
         if (file.isStream()) {
             callback(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
             return;
@@ -117,23 +63,21 @@ const gulpSass = (options, sync) => {
             return;
         }
 
-        if (!file.contents.length) {
+        if (file.contents && !file.contents.length) {
             file.path = replaceExtension(file.path, '.css');
             callback(null, file);
             return;
         }
 
         const opts = clonedeep(options || {});
-        opts.data = file.contents.toString();
+        let source = file.contents.toString();
 
         // Stringiyfy variables
-        if (options.data) {
-            opts.data = sassStingify(options.data) + opts.data;
+        if (opts.data) {
+            source = sassStingify(opts.data) + source;
+            delete(opts.data);
         }
 
-        // We set the file path here so that libsass can correctly resolve import paths
-        opts.file = file.path;
-
         // Ensure `indentedSyntax` is true if a `.sass` file
         if (path.extname(file.path) === '.sass') {
             opts.indentedSyntax = true;
@@ -150,59 +94,35 @@ const gulpSass = (options, sync) => {
 
         opts.includePaths.unshift(path.dirname(file.path));
 
-        // Generate Source Maps if the source-map plugin is present
-        if (file.sourceMap) {
-            opts.sourceMap = file.path;
-            opts.omitSourceMapUrl = true;
-            opts.sourceMapContents = true;
-        }
+        // Rename `includePaths` to `loadPaths`
+        opts.loadPaths = opts.includePaths;
+        delete(opts.includePaths);
 
-        if (sync !== true) {
-            /**
-             * Async Sass render
-             */
-            gulpSass.compiler.render(opts, (error, obj) => {
-                if (error) {
-                    handleError(error, file, callback);
-                    return;
-                }
-
-                filePush(file, obj, callback);
-            });
-        } else {
-            /**
-             * Sync Sass render
-             */
-            try {
-                filePush(file, gulpSass.compiler.renderSync(opts), callback);
-            } catch (error) {
-                handleError(error, file, callback);
-            }
+        try {
+            const result = gulpSass.compiler.compileString(source, opts);
+            filePush(file, Buffer.from(result.css, 'utf8'), callback);
+        } catch (error) {
+            handleError(error, file, callback);
         }
     });
 };
 
-/**
- * Sync Sass render
- */
-gulpSass.sync = (options) => gulpSass(options, true);
-
 /**
  * Log errors nicely
  */
 gulpSass.logError = function logError(error) {
-    const message = new PluginError('sass', error.messageFormatted).toString();
+    const message = new PluginError('sass', error.messageFormatted || error.message).toString();
     process.stderr.write(`${message}\n`);
     this.emit('end');
 };
 
-export default (compiler) => {
-    if (!compiler || !compiler.render) {
-        const message = new PluginError(PLUGIN_NAME, MISSING_COMPILER_MESSAGE, { showProperties: false }).toString();
-        process.stderr.write(`${message}\n`);
-        process.exit(1);
+gulpSass.dispose = function () {
+    if (gulpSass.compiler.dispose) {
+        gulpSass.compiler.dispose();
     }
+}
 
-    gulpSass.compiler = compiler;
+export default (compiler) => {
+    gulpSass.compiler = compiler.initCompiler();
     return gulpSass;
 };

package/vendor/gulp-sass/package.json

@@ -55,7 +55,7 @@
     "node-sass": "^7.0.1",
     "postcss": "^8.4.5",
     "rimraf": "^3.0.2",
-    "sass": "^1.45.1",
+    "sass-embedded": "^1.97.3",
     "vinyl": "^2.2.1"
   }
 }