@videinfra/static-website-builder 1.15.2 → 1.15.4

package/init/test/.env

@@ -1,2 +1,6 @@
 HOST=https://test-global.tld
 FOO=foo-global
+TYPE_BOOL_TRUE=true
+TYPE_BOOL_FALSE=false
+TYPE_NUMBER=123.456
+TYPE_EMPTY=

package/init/test/config/config.js

@@ -38,6 +38,10 @@ exports.env = {
         'HOST': 'host',
         'FOO': 'foo',
         'BAR': 'bar',
+        'TYPE_BOOL_TRUE': 'typeBoolTrue',
+        'TYPE_BOOL_FALSE': 'typeBoolFalse',
+        'TYPE_NUMBER': 'typeNumber',
+        'TYPE_EMPTY': 'typeEmpty',
     },
 };
 

package/init/test/src/html/env.twig

@@ -4,4 +4,18 @@
 {% block body %}
     <p>HOST: {{ host }}</p>
     <p>HOST FROM GLOBAL JS: {{ hostFromGlobalJS }}</p>
+
+    {% if typeBoolTrue %}
+        <p>TYPE_BOOL_TRUE: pass</p>
+    {% else %}
+        <p>TYPE_BOOL_TRUE: fail</p>
+    {% endif %}
+
+    {% if typeBoolFalse %}
+        <p>TYPE_BOOL_FALSE: fail</p>
+    {% else %}
+        <p>TYPE_BOOL_FALSE: pass</p>
+    {% endif %}
+
+    <p>TYPE_NUMBER: {{ typeNumber }}</p>
 {% endblock %}

package/init/test/src/javascripts/main.js

@@ -3,3 +3,6 @@ console.log('Hello from main page!');
 console.log('env.host ==', process.env.host);
 console.log('env.foo ==', process.env.foo);
 console.log('env.bar ==', process.env.bar);
+console.log('env.typeBoolTrue ==', process.env.typeBoolTrue);
+console.log('env.typeBoolFalse ==', process.env.typeBoolFalse);
+console.log('env.typeNumber ==', process.env.typeNumber);

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

@@ -1,3 +1,28 @@
 .env-test:before {
     content: map-get($env, host);
 }
+
+:root {
+    #{ --env-test-type-number }: map-get($env, typeNumber);
+    #{ --env-test-type-empty }: map-get($env, typeEmpty);
+}
+
+@if map-get($env, typeBoolTrue) {
+    :root {
+        --env-test-bool-true: true;
+    }
+} @else {
+    :root {
+        --env-test-bool-true: false;
+    }
+}
+
+@if map-get($env, typeBoolFalse) {
+    :root {
+        --env-test-bool-false: true;
+    }
+} @else {
+    :root {
+        --env-test-bool-false: false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@videinfra/static-website-builder",
-  "version": "1.15.2",
+  "version": "1.15.4",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {

package/tasks/env/get-env.js

@@ -3,7 +3,7 @@ const dotenv = require('dotenv');
 const getConfig = require('../../lib/get-config');
 
 function escapeJSVariable (value) {
-    if (value === true || value === false || !isNaN(value)) {
+    if (value === 'true' || value === 'false' || value === true || value === false || !isNaN(value)) {
         return value;
     } else {
         // Convert to string
@@ -11,6 +11,18 @@ function escapeJSVariable (value) {
     }
 }
 
+function normalizeTwigVariable (value) {
+    if (value === 'true') {
+        return true;
+    } else if (value === 'false') {
+        return false;
+    } else if (value !== '' && !isNaN(value)) {
+        return parseFloat(value);
+    } else {
+        return value;
+    }
+}
+
 function getEnvData () {
     const envVariables = {};
     const twigVariables = {};
@@ -34,8 +46,8 @@ function getEnvData () {
         if (key in envVariables) {
             const value = envVariables[key];
             const camelCase = map[key];
-            const kebabCase = map[key].replace(/([a-z])([A-Z])/g, '$1-$2').replace(/_([a-z])/ig, '-$1').toLowerCase();
-            twigVariables[camelCase] = value;
+            const kebabCase = map[key];
+            twigVariables[camelCase] = normalizeTwigVariable(value);
             envOutVariables[camelCase] = value;
             jsVariables[`process.env.${ camelCase }`] = escapeJSVariable(value);
             scssVariables.env[kebabCase] = value;

package/tests/build/build.test.js

@@ -99,12 +99,22 @@ test('.env and .env.local files loaded', () => {
             expect(js.indexOf('console.log("env.host ==","https://test-local.tld")')).not.toBe(-1);
             expect(js.indexOf('console.log("env.foo ==","foo-global")')).not.toBe(-1);
             expect(js.indexOf('console.log("env.bar ==","bar-local")')).not.toBe(-1);
+            expect(js.indexOf('console.log("env.typeBoolTrue ==",!0)')).not.toBe(-1);
+            expect(js.indexOf('console.log("env.typeBoolFalse ==",!1)')).not.toBe(-1);
+            expect(js.indexOf('console.log("env.typeNumber ==",123.456)')).not.toBe(-1);
         }),
         fsPromises.readFile(path.resolve(publicPath, 'env.html'), {'encoding': 'utf8'}).then((html) => {
             expect(html.indexOf('<p>HOST: https://test-local.tld</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_BOOL_TRUE: pass</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_BOOL_FALSE: pass</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_NUMBER: 123.456</p>')).not.toBe(-1);
         }),
         fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/env-test.css'), {'encoding': 'utf8'}).then((css) => {
             expect(css.indexOf('.env-test:before{content:"https://test-local.tld"}')).not.toBe(-1);
+            expect(css.indexOf('--env-test-bool-true:true')).not.toBe(-1);
+            expect(css.indexOf('--env-test-bool-false:false')).not.toBe(-1);
+            expect(css.indexOf('--env-test-type-number:123.456')).not.toBe(-1);
+            expect(css.indexOf('--env-test-type-empty:""')).not.toBe(-1);
         }),
     ]);
 });

package/vendor/gulp-sass/sass-stringify.js

@@ -1,7 +1,7 @@
 module.exports = function sassStingify (data, isDeep = false) {
     if (data === null || data === undefined) {
         return 'false';
-    } else if (data !== '' && (data === true || data === false || !isNaN(data))) {
+    } else if (data !== '' && (data === 'true' || data === 'false' || data === true || data === false || !isNaN(data))) {
         // Convert to simple value
         return String(data);
     } else if (Array.isArray(data)) {