@videinfra/static-website-builder 1.10.1 → 1.11.0

package/tasks/html/task.js

@@ -1,91 +1,91 @@
-const gulp = require('gulp');
-const data = require('gulp-data');
-const gulpif = require('gulp-if');
-const htmlmin = require('gulp-htmlmin')
-const memoize = require('nano-memoize');
-const cached = require('gulp-cached');
-const dependents = require('gulp-dependents');
-const ignore = require('gulp-ignore');
-
-const getPaths = require('./../../lib/get-path');
-const getConfig = require('./../../lib/get-config');
-const globs = require('./../../lib/globs-helper');
-
-const taskStart = require('../../lib/gulp/task-start');
-const taskEnd = require('../../lib/gulp/task-end');
-const taskBeforeDest = require('../../lib/gulp/task-before-dest');
-const taskWatch = require('../../lib/gulp/task-watch');
-
-const getData = require('../data/get-data');
-
-
-const getGlobPaths = memoize(function () {
-    const sourcePaths = getPaths.getSourcePaths('html');
-    const extensions = getConfig.getTaskConfig('html', 'extensions');
-
-    return globs.generate([
-        globs.paths(sourcePaths).filesWithExtensions(extensions), // HTML / TWIG files
-    ]);
-});
-
-const getGlobIgnorePaths = memoize(function () {
-    const ignore = getConfig.getTaskConfig('html', 'ignore');
-
-    return globs.generate([
-        globs.paths(ignore),         // Exclude files and folders from being rendered
-    ]);
-});
-
-const getWatchGlobPaths = memoize(function () {
-    const sourcePaths = getPaths.getSourcePaths('html');
-    const extensions = getConfig.getTaskConfig('html', 'extensions');
-    const dataExtensions = getConfig.getTaskConfig('data', 'extensions');
-
-    return globs.generate(
-        globs.paths(sourcePaths).filesWithExtensions(extensions),     // HTML / TWIG files
-        globs.paths(sourcePaths).filesWithExtensions(dataExtensions)  // Data files
-    );
-});
-
-
-const getEngine = memoize(function () {
-    const engine = getConfig.getTaskConfig('html', 'engine');
-    return engine ? engine() : (() => {});
-});
-
-function html (options) {
-    const build = options && !!options.build;
-
-    return function html () {
-        return gulp.src(getGlobPaths())
-            .pipe(taskStart())
-
-            // Faster incremental builds, skip files which didn't changed or their dependencies didn't changed
-            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'dependents'), cached('html')))
-            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'dependents'), dependents(getConfig.getTaskConfig('dependents'))))
-
-            // Prevent file from being rendered if it's in the ignore list
-            .pipe(ignore.exclude(getGlobIgnorePaths(), {}))
-
-            // Preprocess using TWIG
-            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'engine'), data(getData({ build: build }))))
-            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'engine'), getEngine()))
-
-            // Minify
-            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'htmlmin'), htmlmin(getConfig.getTaskConfig('html', 'htmlmin'))))
-
-            .pipe(taskBeforeDest())
-            .pipe(gulp.dest(getPaths.getDestPath('html')))
-
-            // Reload on change
-            .pipe(taskEnd());
-    };
-}
-
-function htmlWatch () {
-    return taskWatch(getWatchGlobPaths(), html({ build: false }));
-}
-
-
-exports.build = html({ build: true });
-exports.watch = htmlWatch;
+const gulp = require('gulp');
+const data = require('gulp-data');
+const gulpif = require('gulp-if');
+const htmlmin = require('gulp-htmlmin')
+const memoize = require('nano-memoize');
+const cached = require('gulp-cached');
+const dependents = require('gulp-dependents');
+const ignore = require('gulp-ignore');
+
+const getPaths = require('./../../lib/get-path');
+const getConfig = require('./../../lib/get-config');
+const globs = require('./../../lib/globs-helper');
+
+const taskStart = require('../../lib/gulp/task-start');
+const taskEnd = require('../../lib/gulp/task-end');
+const taskBeforeDest = require('../../lib/gulp/task-before-dest');
+const taskWatch = require('../../lib/gulp/task-watch');
+
+const getData = require('../data/get-data');
+
+
+const getGlobPaths = memoize(function () {
+    const sourcePaths = getPaths.getSourcePaths('html');
+    const extensions = getConfig.getTaskConfig('html', 'extensions');
+
+    return globs.generate([
+        globs.paths(sourcePaths).filesWithExtensions(extensions), // HTML / TWIG files
+    ]);
+});
+
+const getGlobIgnorePaths = memoize(function () {
+    const ignore = getConfig.getTaskConfig('html', 'ignore');
+
+    return globs.generate([
+        globs.paths(ignore),         // Exclude files and folders from being rendered
+    ]);
+});
+
+const getWatchGlobPaths = memoize(function () {
+    const sourcePaths = getPaths.getSourcePaths('html');
+    const extensions = getConfig.getTaskConfig('html', 'extensions');
+    const dataExtensions = getConfig.getTaskConfig('data', 'extensions');
+
+    return globs.generate(
+        globs.paths(sourcePaths).filesWithExtensions(extensions),     // HTML / TWIG files
+        globs.paths(sourcePaths).filesWithExtensions(dataExtensions)  // Data files
+    );
+});
+
+
+const getEngine = memoize(function () {
+    const engine = getConfig.getTaskConfig('html', 'engine');
+    return engine ? engine() : (() => {});
+});
+
+function html (options) {
+    const build = options && !!options.build;
+
+    return function html () {
+        return gulp.src(getGlobPaths())
+            .pipe(taskStart())
+
+            // Faster incremental builds, skip files which didn't changed or their dependencies didn't changed
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'dependents'), cached('html')))
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'dependents'), dependents(getConfig.getTaskConfig('dependents'))))
+
+            // Prevent file from being rendered if it's in the ignore list
+            .pipe(ignore.exclude(getGlobIgnorePaths(), {}))
+
+            // Preprocess using TWIG
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'engine'), data(getData({ build: build }))))
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'engine'), getEngine()))
+
+            // Minify
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'htmlmin'), htmlmin(getConfig.getTaskConfig('html', 'htmlmin'))))
+
+            .pipe(taskBeforeDest())
+            .pipe(gulp.dest(getPaths.getDestPath('html')))
+
+            // Reload on change
+            .pipe(taskEnd());
+    };
+}
+
+function htmlWatch () {
+    return taskWatch(getWatchGlobPaths(), html({ build: false }));
+}
+
+
+exports.build = html({ build: true });
+exports.watch = htmlWatch;

package/tasks/icons/config.js

@@ -1,52 +1,52 @@
-exports.icons = {
-    // Glob list of files, which to ignore, relative to the icon source folder
-    // see https://gulpjs.com/docs/en/getting-started/explaining-globs/
-    ignore: [],
-
-    // Filename extensions
-    extensions: ['svg'],
-
-    // SVG store configuration
-    // see https://github.com/w0rm/gulp-svgstore
-    svgstore: {
-    },
-
-    // SVG min configuration
-    // see https://github.com/ben-eb/gulp-svgmin#plugins
-    svgmin: [
-        {
-            removeUnknownsAndDefaults: false
-        }
-    ],
-
-    // Production only settings, overwrites default settings
-    production: {
-    },
-
-    // Development only settings, overwrites default settings
-    development: {
-    },
-};
-
-exports.preprocess = {
-    icons: [
-        require('./preprocess-config'),
-    ]
-};
-
-exports.tasks = {
-    icons: [
-        require('./task'),
-    ]
-};
-
-
-/**
- * Paths relative to the global src and dest folders
- */
-exports.paths = {
-    icons: {
-        'src': 'icons',
-        'dest': 'assets/images',
-    }
-};
+exports.icons = {
+    // Glob list of files, which to ignore, relative to the icon source folder
+    // see https://gulpjs.com/docs/en/getting-started/explaining-globs/
+    ignore: [],
+
+    // Filename extensions
+    extensions: ['svg'],
+
+    // SVG store configuration
+    // see https://github.com/w0rm/gulp-svgstore
+    svgstore: {
+    },
+
+    // SVG min configuration
+    // see https://github.com/ben-eb/gulp-svgmin#plugins
+    svgmin: [
+        {
+            removeUnknownsAndDefaults: false
+        }
+    ],
+
+    // Production only settings, overwrites default settings
+    production: {
+    },
+
+    // Development only settings, overwrites default settings
+    development: {
+    },
+};
+
+exports.preprocess = {
+    icons: [
+        require('./preprocess-config'),
+    ]
+};
+
+exports.tasks = {
+    icons: [
+        require('./task'),
+    ]
+};
+
+
+/**
+ * Paths relative to the global src and dest folders
+ */
+exports.paths = {
+    icons: {
+        'src': 'icons',
+        'dest': 'assets/images',
+    }
+};

package/tasks/javascripts/preprocess-config.js

@@ -3,6 +3,17 @@ const merge = require('../../lib/merge');
 const get = require('lodash/get');
 const map = require('lodash/map');
 const webpack = require('webpack');
+const WatchExternalFilesPlugin = require('webpack-watch-files-plugin');
+
+/**
+ * Require file without caching it
+ * @param {string} module Module path
+ * @returns {any} Module
+ */
+function requireUncached(module) {
+    delete require.cache[require.resolve(module)];
+    return require(module);
+}
 
 /**
  * Returns JS entry files
@@ -13,10 +24,31 @@ const webpack = require('webpack');
 function getEntry (config) {
     const entryFile = paths.getSourcePath('javascripts', config.entryList);
 
-    // Dynamic imports only for webpack 5
-    // return () => require(entryFile);
+    // console.log(require(entryFile));
+    // return () => {
+    //     return new Promise((resolve) => {
+    //         resolve(require(entryFile));
+    //     });
+    // };
 
-    return require(entryFile);
+    // return () => new Promise((resolve) => {
+    //     resolve(['./demo', './demo2'])
+    // });
+
+    return function getEntries () {
+        // const entryURL = pathToFileURL(entryFile).href + '?_invalidate-cache=' + (++entriesCounter);
+
+        // console.log(require.cache.);
+        // console.log('loading entries:', entryURL);
+        // return import(entryURL).then((entries) => {
+        //     console.log('loaded entries:', entries.default);
+        //     return entries.default;
+        // });
+
+        const entries = requireUncached(entryFile);
+        console.log('entries:', entries);
+        return entries;
+    }
 }
 
 /**
@@ -51,7 +83,13 @@ module.exports = function preprocessJavascriptsConfig (config, fullConfig) {
             plugins: [
                 new webpack.DefinePlugin({
                     'process.env.NODE_ENV': JSON.stringify(global.production ? 'production' : 'development'),
-                })
+                }),
+                new WatchExternalFilesPlugin.default({
+                    verbose: false,
+                    files: [
+                        paths.getSourcePath('javascripts', config.entryList),
+                    ],
+                }),
             ].concat(webpackPlugins),
 
             // Imports

package/tasks/javascripts/task.js

@@ -1,6 +1,6 @@
 const gulp = require('gulp');
 const webpack = require('webpack');
-const gulpWebpack = require('webpack-stream');
+const gulpWebpack = require('../../vendor/webpack-stream/index.js');
 const memoize = require('nano-memoize');
 
 const merge = require('../../lib/merge');

package/tasks/stylesheets/config.js

@@ -1,88 +1,88 @@
-exports.stylesheets = {
-    // Engine is a function which returns a gulp pipe function, eg. sass()
-    // Intended to be used by plugins, not manually
-    engine: null,
-
-    // Glob list of files, which to ignore, relative to the stylesheet source folder
-    // see https://gulpjs.com/docs/en/getting-started/explaining-globs/
-    ignore: [],
-
-    // File extensions
-    extensions: ['css'],
-
-    // Auto prefixer options
-    // see https://github.com/postcss/autoprefixer#options
-    autoprefixer: {
-    },
-
-    // PostCSS Nested Calc
-    // see https://www.npmjs.com/package/@csstools/postcss-nested-calc
-    nestedCalc: {
-        preserve: false,
-    },
-
-    // PostCSS plugins and options
-    // see https://github.com/postcss/postcss
-    postcss: {
-        plugins: [],
-        options: {},
-    },
-
-    // Production only settings, overwrites default settings
-    production: {
-        // Source maps dsabled in production mode
-        sourcemaps: false,
-
-        // Minify CSS in production mode
-        // see https://cssnano.co/guides/optimisations
-        cssnano: {
-            // Preset
-            preset: 'default',
-
-            // Configuration options
-            calc: false,
-            zindex: false,
-            mergeIdents: false,
-            reduceIdents: false,
-            discardUnused: {
-                fontFace: false
-            }
-        },
-    },
-
-    // Development only settings, overwrites default settings
-    development: {
-        // Enable source maps in development mode
-        // See https://www.npmjs.com/package/gulp-sourcemaps
-        sourcemaps: {
-            init: {},
-            write: {}
-        },
-
-        // Minification disabled in development mode
-        cssnano: false,
-    },
-};
-
-exports.preprocess = {
-    stylesheets: [
-        require('./preprocess-config'),
-    ]
-};
-
-exports.tasks = {
-    stylesheets: [
-        require('./task'),
-    ]
-};
-
-
-/**
- * Paths relative to the global src and dest folders
- */
-exports.paths = {
-    stylesheets: {
-        'src': 'stylesheets',
-        'dest': 'assets/stylesheets',
-    }
-};
+exports.stylesheets = {
+    // Engine is a function which returns a gulp pipe function, eg. sass()
+    // Intended to be used by plugins, not manually
+    engine: null,
+
+    // Glob list of files, which to ignore, relative to the stylesheet source folder
+    // see https://gulpjs.com/docs/en/getting-started/explaining-globs/
+    ignore: [],
+
+    // File extensions
+    extensions: ['css'],
+
+    // Auto prefixer options
+    // see https://github.com/postcss/autoprefixer#options
+    autoprefixer: {
+    },
+
+    // PostCSS Nested Calc
+    // see https://www.npmjs.com/package/@csstools/postcss-nested-calc
+    nestedCalc: {
+        preserve: false,
+    },
+
+    // PostCSS plugins and options
+    // see https://github.com/postcss/postcss
+    postcss: {
+        plugins: [],
+        options: {},
+    },
+
+    // Production only settings, overwrites default settings
+    production: {
+        // Source maps dsabled in production mode
+        sourcemaps: false,
+
+        // Minify CSS in production mode
+        // see https://cssnano.co/guides/optimisations
+        cssnano: {
+            // Preset
+            preset: 'default',
+
+            // Configuration options
+            calc: false,
+            zindex: false,
+            mergeIdents: false,
+            reduceIdents: false,
+            discardUnused: {
+                fontFace: false
+            }
+        },
+    },
+
+    // Development only settings, overwrites default settings
+    development: {
+        // Enable source maps in development mode
+        // See https://www.npmjs.com/package/gulp-sourcemaps
+        sourcemaps: {
+            init: {},
+            write: {}
+        },
+
+        // Minification disabled in development mode
+        cssnano: false,
+    },
+};
+
+exports.preprocess = {
+    stylesheets: [
+        require('./preprocess-config'),
+    ]
+};
+
+exports.tasks = {
+    stylesheets: [
+        require('./task'),
+    ]
+};
+
+
+/**
+ * Paths relative to the global src and dest folders
+ */
+exports.paths = {
+    stylesheets: {
+        'src': 'stylesheets',
+        'dest': 'assets/stylesheets',
+    }
+};

package/tasks/stylesheets/preprocess-config.js

@@ -1,41 +1,41 @@
-const cssnano = require('cssnano');
-const autoprefixer = require('autoprefixer');
-const postcssNestedCalc = require('@csstools/postcss-nested-calc');
-const find = require('lodash/find');
-
-/**
- * Modify configuration
- *
- * @param {object} config Stylesheet configuration
- * @param {object} fullConfig Full configuration
- * @returns {object} Transformed stylesheet configuration
- */
-module.exports = function processStylesheetsConfig (config, fullConfig) {
-    if (config && config.cssnano) {
-        // Autoprefixer ir running separatelly in postcss
-        config.cssnano.autoprefixer = false;
-    }
-
-    if (config && config.postcss) {
-        config.postcss.plugins = config.postcss.plugins || [];
-
-        // Add nestedCalc
-        if (config.nestedCalc) {
-            config.postcss.plugins.push(postcssNestedCalc(config.nestedCalc));
-        }
-
-        // Add autoprefixer
-        if (config.autoprefixer && !find(config.postcss.plugins, {'postcssPlugin': 'autoprefixer'})) {
-            config.postcss.plugins.push(autoprefixer(config.autoprefixer));
-        }
-
-        // // Add CSS nano
-        if (config.cssnano && !find(config.postcss.plugins, {'postcssPlugin': 'cssnano'})) {
-            config.postcss.plugins.push(cssnano({
-                preset: [config.cssnano.preset, config.cssnano]
-            }));
-        }
-    }
-
-    return config;
-}
+const cssnano = require('cssnano');
+const autoprefixer = require('autoprefixer');
+const postcssNestedCalc = require('@csstools/postcss-nested-calc');
+const find = require('lodash/find');
+
+/**
+ * Modify configuration
+ *
+ * @param {object} config Stylesheet configuration
+ * @param {object} fullConfig Full configuration
+ * @returns {object} Transformed stylesheet configuration
+ */
+module.exports = function processStylesheetsConfig (config, fullConfig) {
+    if (config && config.cssnano) {
+        // Autoprefixer ir running separatelly in postcss
+        config.cssnano.autoprefixer = false;
+    }
+
+    if (config && config.postcss) {
+        config.postcss.plugins = config.postcss.plugins || [];
+
+        // Add nestedCalc
+        if (config.nestedCalc) {
+            config.postcss.plugins.push(postcssNestedCalc(config.nestedCalc));
+        }
+
+        // Add autoprefixer
+        if (config.autoprefixer && !find(config.postcss.plugins, {'postcssPlugin': 'autoprefixer'})) {
+            config.postcss.plugins.push(autoprefixer(config.autoprefixer));
+        }
+
+        // // Add CSS nano
+        if (config.cssnano && !find(config.postcss.plugins, {'postcssPlugin': 'cssnano'})) {
+            config.postcss.plugins.push(cssnano({
+                preset: [config.cssnano.preset, config.cssnano]
+            }));
+        }
+    }
+
+    return config;
+}