@videinfra/static-website-builder 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.5.2] - 2022-06-17
+### Updated
+- In build mode prevent data from being read more than once
+
 ## [1.5.1] - 2022-04-14
 ### Fixed
 - Dependency update

package/package.json

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

package/tasks/data/get-data.js

@@ -10,7 +10,7 @@ const getFileNamesSync = require('../../lib/get-file-names');
 const camelizeFileName = require('../../lib/camelize-file-name');
 
 
-module.exports = function getData () {
+function getData () {
     const folders = getPaths.getSourcePaths('data');
     const extensions = getConfig.getTaskConfig('data', 'extensions');
     const loaders = getConfig.getTaskConfig('data', 'loaders');
@@ -63,3 +63,25 @@ module.exports = function getData () {
 
     return data;
 }
+
+
+let cache = null;
+
+module.exports = function (options) {
+    const build = options && !!options.build;
+
+    return function () {
+        if (build) {
+            // Cache during full build
+            if (!cache) {
+                cache = getData();
+            }
+
+            return cache;
+        } else {
+            // Don't cache during watch build
+            cache = null;
+            return getData();
+        }
+    }
+}

package/tasks/html/task.js

@@ -53,36 +53,39 @@ const getEngine = memoize(function () {
     return engine ? engine() : (() => {});
 });
 
+function html (options) {
+    const build = options && !!options.build;
 
-function html () {
-    return gulp.src(getGlobPaths())
-        .pipe(taskStart())
+    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'))))
+            // 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(), {}))
+            // 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)))
-        .pipe(gulpif(!!getConfig.getTaskConfig('html', 'engine'), getEngine()))
+            // 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'))))
+            // Minify
+            .pipe(gulpif(!!getConfig.getTaskConfig('html', 'htmlmin'), htmlmin(getConfig.getTaskConfig('html', 'htmlmin'))))
 
-        .pipe(taskBeforeDest())
-        .pipe(gulp.dest(getPaths.getDestPath('html')))
+            .pipe(taskBeforeDest())
+            .pipe(gulp.dest(getPaths.getDestPath('html')))
 
-        // Reload on change
-        .pipe(taskEnd());
+            // Reload on change
+            .pipe(taskEnd());
+    };
 }
 
 function htmlWatch () {
-    return taskWatch(getWatchGlobPaths(), html);
+    return taskWatch(getWatchGlobPaths(), html({ build: false }));
 }
 
 
-exports.build = html;
+exports.build = html({ build: true });
 exports.watch = htmlWatch;