@videinfra/static-website-builder 1.10.1 → 1.11.1

package/lib/get-path.js

@@ -1,109 +1,109 @@
-const path = require('path');
-const memoize = require('nano-memoize');
-const getConfig = require('./get-config');
-
-
-/**
- * Returns builder and project specific path configurations merged
- *
- * @returns {object} Configuration
- */
-
-const getPathConfig = memoize(function () {
-    return getConfig.getConfig().paths;
-});
-
-/**
- * Returns a path relative to the project folder
- *
- * @param  {...any} paths List of paths
- * @returns {string} Path
- */
-function getProjectPath (...paths) {
-    return path.resolve(process.env.INIT_CWD || process.cwd(), ...paths);
-};
-
-/**
- * Returns a path relative to the builder folder
- *
- * @param  {...any} paths List of paths
- * @returns {string} Path
- */
-function getBuilderPath (...paths) {
-    return path.resolve(__dirname, '../', ...paths);
-};
-
-/**
- * Returns task source path or paths
- *
- * @param {string} name Task name
- * @param  {...string} paths Additional sub paths
- * @returns {string|array} Task source path or list of paths
- */
-function getSourcePath (name, ...paths) {
-    const pathConfig = getPathConfig();
-    const path = pathConfig[name].src;
-
-    if (typeof path === 'string') {
-        return getProjectPath(pathConfig.src, path, ...paths);
-    } else if (Array.isArray(path)) {
-        return path.map((path) => getProjectPath(pathConfig.src, path, ...paths));
-    } else {
-        return null;
-    }
-}
-
-/**
- * Returns task source paths
- *
- * @param {string} name Task name
- * @param  {...string} paths Additional sub paths
- * @returns {array} Task source paths
- */
-function getSourcePaths (name, ...paths) {
-    const path = getSourcePath(name, ...paths);
-
-    if (typeof path === 'string') {
-        return [path];
-    } else {
-        return path;
-    }
-}
-
-/**
- * Returns task destination path
- *
- * @param {string} [name] Task name
- * @param  {...string} paths Additional sub paths
- * @returns {string} Task destination path
- */
-function getDestPath (name, ...paths) {
-    const pathConfig = getPathConfig();
-
-    if (name) {
-        return getProjectPath(pathConfig.dest, pathConfig[name].dest || '', ...paths);
-    } else {
-        return getProjectPath(pathConfig.dest);
-    }
-}
-
-/**
- * Returns public path
- *
- * @param {string} [name] Task name
- * @returns {string} Task public path
- */
-function getPublicPath (name) {
-    const destFullPath = getDestPath(name);
-    const destPath = getDestPath();
-    return destFullPath.replace(destPath, '') + '/';
-}
-
-
-exports.getPathConfig = getPathConfig;
-exports.getSourcePath = getSourcePath;
-exports.getSourcePaths = getSourcePaths;
-exports.getDestPath = getDestPath;
-exports.getProjectPath = getProjectPath;
-exports.getBuilderPath = getBuilderPath;
-exports.getPublicPath = getPublicPath;
+const path = require('path');
+const memoize = require('nano-memoize');
+const getConfig = require('./get-config');
+
+
+/**
+ * Returns builder and project specific path configurations merged
+ *
+ * @returns {object} Configuration
+ */
+
+const getPathConfig = memoize(function () {
+    return getConfig.getConfig().paths;
+});
+
+/**
+ * Returns a path relative to the project folder
+ *
+ * @param  {...any} paths List of paths
+ * @returns {string} Path
+ */
+function getProjectPath (...paths) {
+    return path.resolve(process.env.INIT_CWD || process.cwd(), ...paths);
+};
+
+/**
+ * Returns a path relative to the builder folder
+ *
+ * @param  {...any} paths List of paths
+ * @returns {string} Path
+ */
+function getBuilderPath (...paths) {
+    return path.resolve(__dirname, '../', ...paths);
+};
+
+/**
+ * Returns task source path or paths
+ *
+ * @param {string} name Task name
+ * @param  {...string} paths Additional sub paths
+ * @returns {string|array} Task source path or list of paths
+ */
+function getSourcePath (name, ...paths) {
+    const pathConfig = getPathConfig();
+    const path = pathConfig[name].src;
+
+    if (typeof path === 'string') {
+        return getProjectPath(pathConfig.src, path, ...paths);
+    } else if (Array.isArray(path)) {
+        return path.map((path) => getProjectPath(pathConfig.src, path, ...paths));
+    } else {
+        return null;
+    }
+}
+
+/**
+ * Returns task source paths
+ *
+ * @param {string} name Task name
+ * @param  {...string} paths Additional sub paths
+ * @returns {array} Task source paths
+ */
+function getSourcePaths (name, ...paths) {
+    const path = getSourcePath(name, ...paths);
+
+    if (typeof path === 'string') {
+        return [path];
+    } else {
+        return path;
+    }
+}
+
+/**
+ * Returns task destination path
+ *
+ * @param {string} [name] Task name
+ * @param  {...string} paths Additional sub paths
+ * @returns {string} Task destination path
+ */
+function getDestPath (name, ...paths) {
+    const pathConfig = getPathConfig();
+
+    if (name) {
+        return getProjectPath(pathConfig.dest, pathConfig[name].dest || '', ...paths);
+    } else {
+        return getProjectPath(pathConfig.dest);
+    }
+}
+
+/**
+ * Returns public path
+ *
+ * @param {string} [name] Task name
+ * @returns {string} Task public path
+ */
+function getPublicPath (name) {
+    const destFullPath = getDestPath(name);
+    const destPath = getDestPath();
+    return destFullPath.replace(destPath, '') + '/';
+}
+
+
+exports.getPathConfig = getPathConfig;
+exports.getSourcePath = getSourcePath;
+exports.getSourcePaths = getSourcePaths;
+exports.getDestPath = getDestPath;
+exports.getProjectPath = getProjectPath;
+exports.getBuilderPath = getBuilderPath;
+exports.getPublicPath = getPublicPath;

package/lib/globs-helper.js

@@ -1,136 +1,136 @@
-const path = require('path');
-const flatten = require('lodash/flatten');
-const map = require('lodash/map');
-const filter = require('lodash/filter');
-
-const REGEX_DOT_PREFIX = /^\.+/;
-const REGEX_WINDOWS_BACKSLASH = /\\/g;
-
-
-class GlobObject {
-    constructor () {
-        this.hadEmptyPaths = false;
-        this.isIgnore = false;
-        this.hasExtensions = false;
-        this.pathsArr = [];
-    }
-
-    paths (paths) {
-        const pathsArr = Array.isArray(paths) ? paths : (typeof paths === 'string' ? [paths] : []);
-
-        if (pathsArr.length) {
-            if (this.pathsArr.length) {
-                this.map((basePath) => {
-                    return pathsArr.map((subPath) => {
-                        // If subpath starts with specia character "!" then prepend that to the begining of full paths
-                        const negativePath = subPath[0] === '!' ? '!' : '';
-                        const subPathNormalized = negativePath ? subPath.substr(1) : subPath;
-                        return negativePath + path.join(basePath, subPathNormalized);
-                    });
-                });
-            } else {
-                this.pathsArr = pathsArr;
-            }
-        } else {
-            this.hadEmptyPaths = true;
-        }
-
-        return this;
-    }
-
-    /**
-     * Adds extensions to the paths
-     *
-     * @param {string|array} extensions An extension or list of extensions
-     * @returns {object} GlobObject
-     */
-    filesWithExtensions (extensions) {
-        const extensionsArr = typeof extensions === 'string' ? [extensions] : extensions;
-
-        if (extensionsArr && extensionsArr.length) {
-            let extensionString = '';
-
-            // Remove dot from the extension name
-            let extensionsArrNormalized = map(extensionsArr, (extension) => extension.replace(REGEX_DOT_PREFIX, ''));
-
-            if (extensionsArrNormalized.length > 1) {
-                extensionString = `/**/*.{${ extensionsArrNormalized.join(',') }}`;
-            } else {
-                extensionString = `/**/*.${ extensionsArrNormalized }`;
-            }
-
-            this.hasExtensions = true;
-            return this.map((path) => `${ path }${ extensionString }`);
-        } else {
-            return this;
-        }
-    }
-
-    /**
-     * Add a wildcard to select all files
-     *
-     * @returns {object} GlobObject
-     */
-    allFiles () {
-        return this.map((path) => `${ path }/**`);
-    }
-
-    /**
-     * Adds all paths to the ignore list
-     *
-     * @returns {object} GlobObject
-     */
-    ignore () {
-        this.isIgnore = true;
-        return this.map((path) => `!${ path }`);
-    }
-
-    /**
-     * Itterates through all paths
-     *
-     * @param {function} fn Itteratee function
-     * @returns {object} GlobObject
-     */
-    map (fn) {
-        this.pathsArr = filter(flatten(map(this.pathsArr, fn)), (path) => !!path);
-        return this;
-    }
-
-    /**
-     * Converts paths to an array of normalized glob paths
-     *
-     * @returns {array} Array of glob paths
-     */
-    toArray () {
-        if (this.hadEmptyPaths && this.isIgnore) {
-            // Since we exclude files / paths, don't return anything if path list was empty
-            return [];
-        } else {
-            return map(this.pathsArr, (path) => {
-                return path.replace(REGEX_WINDOWS_BACKSLASH, '/');
-            });
-        }
-    }
-
-    /**
-     * Alias for toArray
-     *
-     * @returns {array} Array of glob paths
-     */
-    generate () {
-        return this.toArray();
-    }
-}
-
-function paths (paths) {
-    return (new GlobObject()).paths(paths);
-}
-
-function generate (...globs) {
-    return flatten(map(flatten(globs), (glob) => glob.toArray()));
-}
-
-module.exports = {
-    generate,
-    paths,
-};
+const path = require('path');
+const flatten = require('lodash/flatten');
+const map = require('lodash/map');
+const filter = require('lodash/filter');
+
+const REGEX_DOT_PREFIX = /^\.+/;
+const REGEX_WINDOWS_BACKSLASH = /\\/g;
+
+
+class GlobObject {
+    constructor () {
+        this.hadEmptyPaths = false;
+        this.isIgnore = false;
+        this.hasExtensions = false;
+        this.pathsArr = [];
+    }
+
+    paths (paths) {
+        const pathsArr = Array.isArray(paths) ? paths : (typeof paths === 'string' ? [paths] : []);
+
+        if (pathsArr.length) {
+            if (this.pathsArr.length) {
+                this.map((basePath) => {
+                    return pathsArr.map((subPath) => {
+                        // If subpath starts with specia character "!" then prepend that to the begining of full paths
+                        const negativePath = subPath[0] === '!' ? '!' : '';
+                        const subPathNormalized = negativePath ? subPath.substr(1) : subPath;
+                        return negativePath + path.join(basePath, subPathNormalized);
+                    });
+                });
+            } else {
+                this.pathsArr = pathsArr;
+            }
+        } else {
+            this.hadEmptyPaths = true;
+        }
+
+        return this;
+    }
+
+    /**
+     * Adds extensions to the paths
+     *
+     * @param {string|array} extensions An extension or list of extensions
+     * @returns {object} GlobObject
+     */
+    filesWithExtensions (extensions) {
+        const extensionsArr = typeof extensions === 'string' ? [extensions] : extensions;
+
+        if (extensionsArr && extensionsArr.length) {
+            let extensionString = '';
+
+            // Remove dot from the extension name
+            let extensionsArrNormalized = map(extensionsArr, (extension) => extension.replace(REGEX_DOT_PREFIX, ''));
+
+            if (extensionsArrNormalized.length > 1) {
+                extensionString = `/**/*.{${ extensionsArrNormalized.join(',') }}`;
+            } else {
+                extensionString = `/**/*.${ extensionsArrNormalized }`;
+            }
+
+            this.hasExtensions = true;
+            return this.map((path) => `${ path }${ extensionString }`);
+        } else {
+            return this;
+        }
+    }
+
+    /**
+     * Add a wildcard to select all files
+     *
+     * @returns {object} GlobObject
+     */
+    allFiles () {
+        return this.map((path) => `${ path }/**`);
+    }
+
+    /**
+     * Adds all paths to the ignore list
+     *
+     * @returns {object} GlobObject
+     */
+    ignore () {
+        this.isIgnore = true;
+        return this.map((path) => `!${ path }`);
+    }
+
+    /**
+     * Itterates through all paths
+     *
+     * @param {function} fn Itteratee function
+     * @returns {object} GlobObject
+     */
+    map (fn) {
+        this.pathsArr = filter(flatten(map(this.pathsArr, fn)), (path) => !!path);
+        return this;
+    }
+
+    /**
+     * Converts paths to an array of normalized glob paths
+     *
+     * @returns {array} Array of glob paths
+     */
+    toArray () {
+        if (this.hadEmptyPaths && this.isIgnore) {
+            // Since we exclude files / paths, don't return anything if path list was empty
+            return [];
+        } else {
+            return map(this.pathsArr, (path) => {
+                return path.replace(REGEX_WINDOWS_BACKSLASH, '/');
+            });
+        }
+    }
+
+    /**
+     * Alias for toArray
+     *
+     * @returns {array} Array of glob paths
+     */
+    generate () {
+        return this.toArray();
+    }
+}
+
+function paths (paths) {
+    return (new GlobObject()).paths(paths);
+}
+
+function generate (...globs) {
+    return flatten(map(flatten(globs), (glob) => glob.toArray()));
+}
+
+module.exports = {
+    generate,
+    paths,
+};

package/lib/log-error.js

@@ -1,15 +1,15 @@
-const chalk = require('chalk');
-
-module.exports = function (error) {
-    if (error.plugin) {
-        console.log('Error \'' + chalk.cyan(error.plugin) + '\' ' + chalk.red(error.message));
-
-    } else {
-        console.log(error.toString().split(': ').join(':\n'));
-    }
-
-    // Emit the end event, to properly end the task
-    if (typeof this.emit === 'function') {
-        this.emit('end');
-    }
-}
+const chalk = require('chalk');
+
+module.exports = function (error) {
+    if (error.plugin) {
+        console.log('Error \'' + chalk.cyan(error.plugin) + '\' ' + chalk.red(error.message));
+
+    } else {
+        console.log(error.toString().split(': ').join(':\n'));
+    }
+
+    // Emit the end event, to properly end the task
+    if (typeof this.emit === 'function') {
+        this.emit('end');
+    }
+}

package/lib/merge.js

@@ -1,27 +1,27 @@
-const isArray = require('lodash/isArray');
-const mergeWith = require('lodash/mergeWith');
-
-function customizer (objValue, srcValue, key) {
-    if (objValue !== srcValue && isArray(objValue) && isArray(srcValue)) {
-        return objValue.concat(srcValue);
-    }
-}
-
-/**
- * Merge multiple objest together, with array concatanation
- * object is mutated
- *
- * @param {object|array} object Object into which to merge into
- * @param {object|array} ...sources List of sources which to merge into object
- * @returns {object|array} Merged object
- */
-module.exports = function merge (object, ...sources) {
-    for (let i = 0; i < sources.length; i++) {
-        if (sources[i] && typeof sources[i] === 'object') {
-            object = mergeWith(object, sources[i], customizer);
-        } else {
-            object = sources[i];
-        }
-    }
-    return object;
-}
+const isArray = require('lodash/isArray');
+const mergeWith = require('lodash/mergeWith');
+
+function customizer (objValue, srcValue, key) {
+    if (objValue !== srcValue && isArray(objValue) && isArray(srcValue)) {
+        return objValue.concat(srcValue);
+    }
+}
+
+/**
+ * Merge multiple objest together, with array concatanation
+ * object is mutated
+ *
+ * @param {object|array} object Object into which to merge into
+ * @param {object|array} ...sources List of sources which to merge into object
+ * @returns {object|array} Merged object
+ */
+module.exports = function merge (object, ...sources) {
+    for (let i = 0; i < sources.length; i++) {
+        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.10.1",
+  "version": "1.11.1",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {
@@ -50,14 +50,17 @@
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",
     "gulp-svgstore": "^9.0.0",
+    "lodash.clone": "^4.3.2",
+    "lodash.some": "^4.2.2",
     "map-stream": "^0.1.0",
     "minimist": "^1.2.8",
     "nano-memoize": "1.3.0",
     "node-sass": "^7.0.3",
     "sass": "^1.65.1",
+    "through": "^2.3.8",
     "twig": "^1.10.5",
     "webpack": "^4.46.0",
-    "webpack-stream": "^5.2.1"
+    "webpack-watch-files-plugin": "^1.2.1"
   },
   "devDependencies": {
     "jest": "^29.6.2"