webspresso 0.0.96 → 0.0.98

package/src/njk-frontmatter.js

@@ -152,9 +152,20 @@ function loadNjkRouteTemplate(absPath, isDev) {
   return fresh;
 }
 
+const clearHooks = new Set();
+
+function registerClearHook(fn) {
+  if (typeof fn === 'function') clearHooks.add(fn);
+}
+
 function clearNjkFrontmatterCaches() {
   prodRouteCache.clear();
   devRouteCache.clear();
+  for (const fn of clearHooks) {
+    try {
+      fn();
+    } catch (_) {}
+  }
 }
 
 module.exports = {
@@ -162,5 +173,6 @@ module.exports = {
   frontmatterToPatches,
   loadNjkRouteTemplate,
   clearNjkFrontmatterCaches,
+  registerClearHook,
   extractFrontmatterBlock,
 };

package/src/pages/page-loader.js

@@ -8,8 +8,16 @@
 
 const fs = require('fs');
 const path = require('path');
-const { createHelpers } = require('../helpers');
-const { loadI18n, createTranslator, detectLocale, resolveMiddlewares } = require('../file-router');
+const { createHelpers, getAssetManager } = require('../helpers');
+const {
+  loadI18n,
+  createTranslator,
+  detectLocale,
+  resolveMiddlewares,
+  translatorCache,
+  resolvePageAssets,
+  applyPageAssetsToTemplateData,
+} = require('../file-router');
 
 const EMPTY_ARRAY = Object.freeze([]);
 
@@ -111,13 +119,29 @@ function createPageHandler(descriptor, context) {
 
       // i18n
       const defaultLocale = process.env.DEFAULT_LOCALE || 'en';
-      const translations = loadI18n(pagesDir, '', locale, isDev);
-      const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, isDev) : undefined;
-      const t = createTranslator(translations, {
-        locale,
-        fallbackTranslations,
-        fallbackLocale: defaultLocale,
-      });
+      let t;
+      if (!isDev && translatorCache) {
+        const transKey = `${pagesDir}::::${locale}::${defaultLocale}`;
+        t = translatorCache.get(transKey);
+        if (!t) {
+          const translations = loadI18n(pagesDir, '', locale, false);
+          const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, false) : undefined;
+          t = createTranslator(translations, {
+            locale,
+            fallbackTranslations,
+            fallbackLocale: defaultLocale,
+          });
+          translatorCache.set(transKey, t);
+        }
+      } else {
+        const translations = loadI18n(pagesDir, '', locale, isDev);
+        const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, isDev) : undefined;
+        t = createTranslator(translations, {
+          locale,
+          fallbackTranslations,
+          fallbackLocale: defaultLocale,
+        });
+      }
 
       const pageCtx = {
         req,
@@ -163,10 +187,36 @@ function createPageHandler(descriptor, context) {
       const templateExists = hasNjkTemplate !== null ? hasNjkTemplate : fs.existsSync(njkCandidate);
 
       if (templateExists && nunjucks) {
+        let pageHead = headData;
+        let pageAssetsActive = false;
+        const pageAssetsOpt = context.pageAssets || (appOptions && appOptions.pageAssets);
+        if (pageAssetsOpt) {
+          const pageAssetsResolved = resolvePageAssets(pageAssetsOpt);
+          if (pageAssetsResolved.enabled) {
+            const pageAssetBundle = applyPageAssetsToTemplateData(
+              pageAssetsResolved,
+              loadedData,
+              {
+                file: descriptor.source || descriptor.file,
+                routePath: descriptor.path,
+              },
+              fsy?.assetManager || getAssetManager()
+            );
+            loadedData = pageAssetBundle.data;
+            pageHead = {
+              ...headData,
+              stylesheets: [...(headData.stylesheets || []), ...(pageAssetBundle.pageHead?.stylesheets || [])],
+              scripts: [...(headData.scripts || []), ...(pageAssetBundle.pageHead?.scripts || [])],
+            };
+            pageAssetsActive = true;
+          }
+        }
+
         const templateData = {
           ...loadedData,
-          head: headData,
-          pageHead: headData,
+          head: pageHead,
+          pageHead,
+          pageAssets: pageAssetsActive || Boolean(loadedData.pageAssets),
           fsy,
           locale,
           t,