@tenjuu99/blog 0.2.32 → 0.2.33

package/bin/dev-server

@@ -6,6 +6,7 @@ import { watchers, watch } from '../lib/watcher.js'
 import generate from '../lib/generate.js'
 import path from 'path'
 import { fileURLToPath } from 'url';
+import { warmUpTemplateCallback } from '../lib/applyTemplate.js'
 
 const __filename = fileURLToPath(import.meta.url);
 const libDir = path.dirname(__filename) + '/../lib/'
@@ -14,8 +15,9 @@ const binDir = path.dirname(__filename) + '/../bin/'
 watchers.push({
   paths: [srcDir],
   event: ['change', 'add', 'unlink'],
-  callback: (path) => {
+  callback: async (path) => {
     watchCallback(path)
+    await warmUpTemplateCallback()
     generate()
   },
   watchOptions: {

package/lib/applyTemplate.js

@@ -6,6 +6,7 @@ import { staticFile, staticFiles, warmUp, reload } from './files.js'
 import { watchers } from './watcher.js'
 
 let templates = {}
+let loaded = false
 
 const applyTemplate = async (name = 'default.html') => {
   if (templates[name]) {
@@ -19,20 +20,24 @@ const applyTemplate = async (name = 'default.html') => {
 }
 
 const warmUpTemplate = async () => {
+  if (loaded) {
+    console.log('template is already warmed up.')
+    return
+  }
+  console.log('warming up template')
   await warmUp()
   const templates = staticFiles()
     .filter(file => file[0].indexOf('template/') === 0)
     .map(f => applyTemplate(f[0].split('/')[1]))
   await Promise.all(templates)
+  loaded = true
 }
 
-watchers.push({
-  paths: [watch.cssDir, watch.templateDir],
-  callback: async () => {
-    templates = {}
-    await reload()
-    await warmUpTemplate()
-  }
-})
+const warmUpTemplateCallback = async () => {
+  templates = {}
+  loaded = false
+  await reload()
+  await warmUpTemplate()
+}
 
-export { applyTemplate, warmUpTemplate }
+export { applyTemplate, warmUpTemplate, warmUpTemplateCallback }

package/lib/distribute.js

@@ -7,7 +7,7 @@ import render from './render.js'
 import { styleText } from 'node:util'
 import config from './config.js'
 import { cacheDir } from './dir.js'
-import { applyTemplate, warmUpTemplate } from './applyTemplate.js'
+import { applyTemplate } from './applyTemplate.js'
 
 const indexFile = `${cacheDir}/index.json`
 
@@ -17,7 +17,6 @@ const renderPage = async (page) => {
 }
 
 const distribute = async (data, srcDir, distDir) => {
-  await warmUpTemplate()
   const promises = []
   const newIndex = []
   for (const name in data) {

package/lib/generate.js

@@ -2,11 +2,16 @@
 import distribute from './distribute.js'
 import { indexing, allData } from './indexer.js'
 import { srcDir, distDir, cache } from './dir.js'
+import { warmUpTemplate } from './applyTemplate.js'
 import { styleText } from 'node:util'
 
+const beforeGenerate = async () => {
+  cache()
+  await warmUpTemplate()
+}
 const generate = async () => {
   let start = performance.now()
-  cache()
+  await beforeGenerate()
   await indexing()
   let end = performance.now()
   console.log(styleText('blue', '[indexing: ' + (end - start) + "ms]"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.32",
+  "version": "0.2.33",
   "description": "blog template",
   "main": "index.js",
   "scripts": {