@videinfra/static-website-builder 1.12.0 → 1.12.1

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.12.0",
+  "version": "1.12.1",
   "description": "Customizable static site project builder",
   "license": "MIT",
   "engines": {

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

@@ -1,54 +1,54 @@
-const paths = require('./../../lib/get-path');
-const getConfig = require('./../../lib/get-config');
-const getPaths = require('./../../lib/get-path');
-const assign = require('lodash/assign');
-const gulpSass = require('gulp-sass');
-
-
-/**
- * Modify configuration
- *
- * @param {object} config Stylesheet configuration
- * @param {object} fullConfig Full configuration
- * @returns {object} Transformed stylesheet configuration
- */
-module.exports = function processSASSConfig (config, fullConfig) {
-    if (config && config.sass) {
-        if (config.sass.includePaths) {
-            // Map include paths to the project folder
-            config.sass.includePaths = config.sass.includePaths.map((path) => paths.getProjectPath(path));
-        } else {
-            config.sass.includePaths = [];
-        }
-
-        // Add stylesheet source path
-        const stylesheetSourcePath = getPaths.getSourcePaths('stylesheets')
-
-        stylesheetSourcePath.forEach((path) => {
-            if (!config.sass.includePaths.includes(path)) {
-                config.sass.includePaths.push(path);
-            }
-        });
-
-        // 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)
-        };
-
-        // Main 'dependents' config is shared between all tasks
-        if (config.dependents) {
-
-            for (let extension in config.dependents) {
-                config.dependents[extension].basePaths = config.dependents[extension].basePaths || [];
-                config.dependents[extension].basePaths = config.dependents[extension].basePaths.concat(
-                    getPaths.getSourcePaths('stylesheets')
-                );
-            }
-
-            fullConfig.dependents = assign(fullConfig.dependents || {}, config.dependents);
-        }
-    }
-
-    return config;
-}
+const paths = require('./../../lib/get-path');
+const getConfig = require('./../../lib/get-config');
+const getPaths = require('./../../lib/get-path');
+const assign = require('lodash/assign');
+const gulpSass = require('gulp-sass');
+
+
+/**
+ * Modify configuration
+ *
+ * @param {object} config Stylesheet configuration
+ * @param {object} fullConfig Full configuration
+ * @returns {object} Transformed stylesheet configuration
+ */
+module.exports = function processSASSConfig (config, fullConfig) {
+    if (config && config.sass) {
+        if (config.sass.includePaths) {
+            // Map include paths to the project folder
+            config.sass.includePaths = config.sass.includePaths.map((path) => paths.getProjectPath(path));
+        } else {
+            config.sass.includePaths = [];
+        }
+
+        // Add stylesheet source path
+        const stylesheetSourcePath = getPaths.getSourcePaths('stylesheets')
+
+        stylesheetSourcePath.forEach((path) => {
+            if (!config.sass.includePaths.includes(path)) {
+                config.sass.includePaths.push(path);
+            }
+        });
+
+        // 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)
+        };
+
+        // Main 'dependents' config is shared between all tasks
+        if (config.dependents) {
+
+            for (let extension in config.dependents) {
+                config.dependents[extension].basePaths = config.dependents[extension].basePaths || [];
+                config.dependents[extension].basePaths = config.dependents[extension].basePaths.concat(
+                    getPaths.getSourcePaths('stylesheets')
+                );
+            }
+
+            fullConfig.dependents = assign(fullConfig.dependents || {}, config.dependents);
+        }
+    }
+
+    return config;
+}

package/plugins/sass.js

@@ -1,38 +1,38 @@
-/**
- * SASS plugin attaches itself to the stylesheets task
- */
-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: {
-        includePaths: ['./node_modules'],
-    },
-
-    // Dependents plugin for faster builds
-    dependents: {
-        '.scss': {
-            parserSteps:
-            [
-                // The language semantics allow import statements with a comma-separated list of file paths.
-                // Therefore, we first extract the whole statement, and then extract each of the paths from that.
-                /(?:^|;|{|}|\*\/)\s*@(import|use|forward)\s+((?:"[^"]+"|'[^']+'|url\((?:"[^"]+"|'[^']+'|[^)]+)\))(?:\s*,\s*(?:"[^"]+"|'[^']+'|url\((?:"[^"]+"|'[^']+'|[^)]+)\)))*)(?=[^;]*;)/gm,
-                /"([^"]+)"|'([^']+)'|url\((?:"([^"]+)"|'([^']+)'|([^)]+))\)/gm
-            ],
-            prefixes: ['', '_'],
-            postfixes: ['.scss', '.sass'],
-            basePaths: []
-        },
-    },
-};
-
-exports.preprocess = {
-    stylesheets: [
-        require('./sass-engine/preprocess-config'),
-    ]
-};
+/**
+ * SASS plugin attaches itself to the stylesheets task
+ */
+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: {
+        includePaths: ['./node_modules'],
+    },
+
+    // Dependents plugin for faster builds
+    dependents: {
+        '.scss': {
+            parserSteps:
+            [
+                // The language semantics allow import statements with a comma-separated list of file paths.
+                // Therefore, we first extract the whole statement, and then extract each of the paths from that.
+                /(?:^|;|{|}|\*\/)\s*@(import|use|forward)\s+((?:"[^"]+"|'[^']+'|url\((?:"[^"]+"|'[^']+'|[^)]+)\))(?:\s*,\s*(?:"[^"]+"|'[^']+'|url\((?:"[^"]+"|'[^']+'|[^)]+)\)))*)(?=[^;]*;)/gm,
+                /"([^"]+)"|'([^']+)'|url\((?:"([^"]+)"|'([^']+)'|([^)]+))\)/gm
+            ],
+            prefixes: ['', '_'],
+            postfixes: ['.scss', '.sass'],
+            basePaths: []
+        },
+    },
+};
+
+exports.preprocess = {
+    stylesheets: [
+        require('./sass-engine/preprocess-config'),
+    ]
+};

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

@@ -1,47 +1,47 @@
-const twig = require('../../vendor/gulp-twig/index');
-const getConfig = require('./../../lib/get-config');
-const getPaths = require('./../../lib/get-path');
-const flattenDeep = require('lodash/flattenDeep');
-const assign = require('lodash/assign');
-
-
-/**
- * Modify configuration
- *
- * @param {object} config HTML configuration
- * @param {object} fullConfig Full configuration
- * @returns {object} Transformed HTML configuration
- */
-module.exports = function preprocessHTMLConfig (config = {}, fullConfig) {
-    if (config.twig) {
-        config.twig.base = getPaths.getSourcePaths('html');
-
-        // Engine is a function which returns a gulp pipe function
-        config.engine = function getTwigEngine () {
-            return twig(getConfig.getTaskConfig('html', 'twig'));
-        };
-
-        if (config.twig.functions) {
-            config.twig.functions = flattenDeep(config.twig.functions);
-        }
-        if (config.twig.filters) {
-            config.twig.filters = flattenDeep(config.twig.filters);
-        }
-
-        // Main 'dependents' config is shared between all tasks
-        if (config.dependents) {
-            for (let extension in config.dependents) {
-                config.dependents[extension].basePaths = config.dependents[extension].basePaths || [];
-                config.dependents[extension].basePaths = config.dependents[extension].basePaths.concat(
-                    config.twig.base
-                );
-            }
-
-            fullConfig.dependents = assign(fullConfig.dependents || {}, config.dependents);
-        }
-    } else {
-        config.twig = false;
-    }
-
-    return config;
-}
+const twig = require('../../vendor/gulp-twig/index');
+const getConfig = require('./../../lib/get-config');
+const getPaths = require('./../../lib/get-path');
+const flattenDeep = require('lodash/flattenDeep');
+const assign = require('lodash/assign');
+
+
+/**
+ * Modify configuration
+ *
+ * @param {object} config HTML configuration
+ * @param {object} fullConfig Full configuration
+ * @returns {object} Transformed HTML configuration
+ */
+module.exports = function preprocessHTMLConfig (config = {}, fullConfig) {
+    if (config.twig) {
+        config.twig.base = getPaths.getSourcePaths('html');
+
+        // Engine is a function which returns a gulp pipe function
+        config.engine = function getTwigEngine () {
+            return twig(getConfig.getTaskConfig('html', 'twig'));
+        };
+
+        if (config.twig.functions) {
+            config.twig.functions = flattenDeep(config.twig.functions);
+        }
+        if (config.twig.filters) {
+            config.twig.filters = flattenDeep(config.twig.filters);
+        }
+
+        // Main 'dependents' config is shared between all tasks
+        if (config.dependents) {
+            for (let extension in config.dependents) {
+                config.dependents[extension].basePaths = config.dependents[extension].basePaths || [];
+                config.dependents[extension].basePaths = config.dependents[extension].basePaths.concat(
+                    config.twig.base
+                );
+            }
+
+            fullConfig.dependents = assign(fullConfig.dependents || {}, config.dependents);
+        }
+    } else {
+        config.twig = false;
+    }
+
+    return config;
+}