@videinfra/static-website-builder 1.15.10 → 1.16.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.16.0] - 2025-10-22
+### Updated
+- Removed `node-sass` and use `sass` module
+
+## [1.15.11] - 2025-10-08
+- Updated "preposition_nbsp" TWIG filter
+
 ## [1.15.10] - 2025-09-26
 - Updated "preposition_nbsp" TWIG filter
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@videinfra/static-website-builder",
-  "version": "1.15.10",
+  "version": "1.16.0",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {
@@ -58,8 +58,7 @@
     "map-stream": "^0.1.0",
     "minimist": "^1.2.8",
     "nano-memoize": "1.3.0",
-    "node-sass": "^7.0.3",
-    "sass": "^1.65.1",
+    "sass": "^1.93.2",
     "through": "^2.3.8",
     "twig": "^1.10.5",
     "webpack": "^4.46.0",

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

@@ -34,9 +34,13 @@ 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'));
+            const sass = gulpSass(require('sass'));
             const sassConfig = getConfig.getTaskConfig('stylesheets', 'sass');
 
+            if (config.legacy) {
+                sassConfig.silenceDeprecations = (sassConfig.silenceDeprecations || []).concat(['import', 'global-builtin', 'slash-div']);
+            }
+
             sassConfig.data = merge(getEnvData().sass, sassConfig.data || {});
             return sass(sassConfig).on('error', sass.logError)
         };

package/plugins/sass.js

@@ -5,13 +5,14 @@ exports.stylesheets = {
     // Add sass to the extensions
     extensions: ['scss', 'sass'],
 
-    // Use legacy `node-sass` instead of `sass`
+    // Silence deprecations for `sass`
     legacy: true,
 
     // SASS options
-    // see https://github.com/sass/node-sass#options
+    // see https://sass-lang.com/documentation/js-api/interfaces/options/
     sass: {
         includePaths: ['./node_modules'],
+        silenceDeprecations: ['legacy-js-api'],
     },
 
     // Dependents plugin for faster builds

package/plugins/twig/symfony-filters/preposition_nbsp.js

@@ -10,6 +10,7 @@ const prepositions = [
 //     [^\\p{L}]    # Non-letter, works with unicode characters too
 const regexWordBoundary = '(?<=(^|[^\\p{L}]))';
 const regexEscape = /[.*+?^${}()|[\]\\]/g;
+const regexSplitTags = /<[^>]+>/ug;
 
 const regexMdash = /\s+—/uig;
 const regexNdash = /\s+–/uig;
@@ -31,27 +32,46 @@ function escapeRegExp(string) {
 }
 
 function prepositionNbsp(text) {
+    if (!text) {
+        return '';
+    }
+
     if (!prepositionsRegex) {
         const prepositionsEscaped = prepositions.map(preposition => escapeRegExp(preposition));
         prepositionsRegex = new RegExp(`${regexWordBoundary}(${prepositionsEscaped.join('|')})\\s+`, 'uig');
     }
 
-    text = text.replace(prepositionsRegex, '$2&nbsp;');
+    // Split text into regular text and HTML tags
+    const textTags = text.match(regexSplitTags) || [];
+    const textNoTags = text.split(regexSplitTags);
+
+    // Replace prepositions in regular text
+    for (let i = 0; i < textNoTags.length; i++) {
+        let textPart = textNoTags[i];
 
-    text = text.replace(regexMdash, '&nbsp;&mdash;', text);
-    text = text.replace(regexNdash, '&nbsp;&ndash;', text);
-    text = text.replace(regexHyphen, '&nbsp;&#45;', text);
-    text = text.replace(regexHyphen2, '&nbsp;&hyphen;', text);
-    text = text.replace(regexFigureDash, '&nbsp;&#x2012;', text);
+        // Replace prepositions with non-breaking space
+        textPart = textPart.replace(prepositionsRegex, '$2&nbsp;');
 
-    text = text.replace(regexMdashEntity, '&nbsp;&mdash;', text);
-    text = text.replace(regexNdashEntity, '&nbsp;&ndash;', text);
-    text = text.replace(regexHyphenEntity, '&nbsp;&#45;', text);
-    text = text.replace(regexHyphen2Entity, '&nbsp;&hyphen;', text);
-    text = text.replace(regexFigureDashEntity, '&nbsp;&#x2012;', text);
-    text = text.replace(regexDashEntity, '&nbsp;&dash;', text);
+        textPart = textPart.replace(regexMdash, '&nbsp;&mdash;', textPart);
+        textPart = textPart.replace(regexNdash, '&nbsp;&ndash;', textPart);
+        textPart = textPart.replace(regexHyphen, '&nbsp;&#45;', textPart);
+        textPart = textPart.replace(regexHyphen2, '&nbsp;&hyphen;', textPart);
+        textPart = textPart.replace(regexFigureDash, '&nbsp;&#x2012;', textPart);
+
+        textPart = textPart.replace(regexMdashEntity, '&nbsp;&mdash;', textPart);
+        textPart = textPart.replace(regexNdashEntity, '&nbsp;&ndash;', textPart);
+        textPart = textPart.replace(regexHyphenEntity, '&nbsp;&#45;', textPart);
+        textPart = textPart.replace(regexHyphen2Entity, '&nbsp;&hyphen;', textPart);
+        textPart = textPart.replace(regexFigureDashEntity, '&nbsp;&#x2012;', textPart);
+        textPart = textPart.replace(regexDashEntity, '&nbsp;&dash;', textPart);
+
+        textNoTags[i] = textPart;
+    }
 
-    return text;
+    // Iterate over regular text and and join back together with tags
+    return textNoTags.map((text, index) => {
+        return text + (textTags[index] || '');
+    }).join('');
 }
 
 module.exports = prepositionNbsp;

package/tests/build/build.test.js

@@ -47,7 +47,7 @@ test('CSS nano ignore test', () => {
 
 test('CSS nano nested calc test', () => {
     return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/nested-calc-test.css'), {'encoding': 'utf8'}).then((css) => {
-        expect(css).toBe('body{padding-top:calc(10vw + (10vh * 1.5))}');
+        expect(css).toBe('body{padding-top:calc(10vw + 15vh)}');
     });
 });
 

package/tests/preposition_nbsp.test.js

@@ -36,6 +36,12 @@ test('preposition_nbsp hyphens', () => {
     expect(preposition_nbsp('hello ‒ at world')).toEqual('hello ‒ at world');
 });
 
+test('preposition_nbsp skip tags', () => {
+    expect(preposition_nbsp('<a href="https://www.google.com">A nice day</a>')).toEqual('<a href="https://www.google.com">A&nbsp;nice day</a>');
+    expect(preposition_nbsp('Start <a download>This is a nice day</a> at <a download>another nice day</a>')).toEqual('Start <a download>This is a&nbsp;nice day</a> at&nbsp;<a download>another nice day</a>');
+    expect(preposition_nbsp('<link rel="preload" href="/assets/fonts/...ttf" as="font" type="font/ttf" crossorigin>')).toEqual('<link rel="preload" href="/assets/fonts/...ttf" as="font" type="font/ttf" crossorigin>');
+});
+
 test('Preposition TWIG filter applied', () => {
     return fsPromises.readFile(path.resolve(publicPath, 'preposition.html'), {'encoding': 'utf8'}).then((html) => {
         expect(html).toBe('<html><body>hello at&nbsp;world</body></html>');