@tenjuu99/blog 0.2.32 → 0.2.34

package/bin/dev-server

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 
 import { spawn } from 'child_process'
-import { srcDir, watch as watchDir, packageDir, packageDirCore, watchCallback } from '../lib/dir.js'
+import { srcDir, watch as watchDir, packageDir, packageDirCore } from '../lib/dir.js'
 import { watchers, watch } from '../lib/watcher.js'
-import generate from '../lib/generate.js'
 import path from 'path'
 import { fileURLToPath } from 'url';
 
@@ -12,23 +11,15 @@ const libDir = path.dirname(__filename) + '/../lib/'
 const binDir = path.dirname(__filename) + '/../bin/'
 
 watchers.push({
-  paths: [srcDir],
+  paths: [srcDir, libDir, packageDirCore],
   event: ['change', 'add', 'unlink'],
-  callback: (path) => {
-    watchCallback(path)
-    generate()
-  },
-  watchOptions: {
-    ignoreInitial: true
-  },
-  prior: true,
-})
-watchers.push({
-  paths: [watchDir.serverDir, watchDir.helperDir, libDir, packageDir, packageDirCore],
-  callback: () => {
+  callback: async (path) => {
     childProcess.kill('SIGINT')
     childProcess = proceed()
     console.error('restarting')
+  },
+  watchOptions: {
+    ignoreInitial: true
   }
 })
 watch()

package/lib/applyTemplate.js

@@ -1,11 +1,10 @@
 "use strict"
 import applyCss from './cssGenerator.js'
 import includeFilter from './includeFilter.js'
-import { watch } from './dir.js'
-import { staticFile, staticFiles, warmUp, reload } from './files.js'
-import { watchers } from './watcher.js'
+import { staticFile, staticFiles, warmUp } from './files.js'
 
 let templates = {}
+let loaded = false
 
 const applyTemplate = async (name = 'default.html') => {
   if (templates[name]) {
@@ -19,20 +18,17 @@ 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()
-  }
-})
-
 export { applyTemplate, warmUpTemplate }

package/lib/cssGenerator.js

@@ -4,8 +4,7 @@ import { staticFile } from './files.js'
 import { minifyCss } from './minify.js'
 import { createHash } from 'crypto'
 import path from 'path'
-import { distDir, watch } from './dir.js'
-import { watchers } from './watcher.js'
+import { distDir } from './dir.js'
 import { styleText } from 'node:util'
 import config from './config.js'
 
@@ -62,9 +61,4 @@ const applyCss = async (text) => {
   return text
 }
 
-watchers.push({
-  paths: watch.cssDir,
-  callback: () => { cacheBuster = {} }
-})
-
 export default applyCss

package/lib/dir.js

@@ -1,5 +1,4 @@
 import config from './config.js'
-import { watchers } from './watcher.js'
 import fs from 'node:fs'
 import { styleText } from 'node:util'
 import path from 'path'
@@ -64,58 +63,6 @@ const cache = () => {
 // generate の中でもコールしているが、同一プロセスであれば alreadyCached 変数で制御される
 cache()
 
-let packageDirectoriesLoaded = []
-const packageDirectories = () => {
-  if (packageDirectoriesLoaded.length > 0) {
-    return packageDirectoriesLoaded
-  }
-  const watchTargetDir = ['pages', 'template', 'css', 'helper', 'server', 'js']
-  const packages = config.packages.split(',').reduce((prev, packageName) => {
-    if (fs.existsSync(`${packageDir}/${packageName}`)) {
-      prev.push(fs.realpathSync(`${packageDir}/${packageName}`))
-    }
-    prev.push(fs.realpathSync(`${packageDirCore}/${packageName}`))
-    return prev
-  }, [srcDir])
-
-  for (const baseDir of packages) {
-    for (const target of watchTargetDir) {
-      if (!fs.existsSync(`${baseDir}/${target}`)) {
-        continue;
-      }
-      const targetDir = `${baseDir}/${target}`
-      packageDirectoriesLoaded.push(targetDir)
-    }
-  }
-  return packageDirectoriesLoaded
-}
-
-const resolveDestinationPath = (path) => {
-  for (const targetDir of packageDirectories()) {
-    if (path.startsWith(targetDir)) {
-      const dir = targetDir.split('/').pop()
-      const srcFile = `${dir}${path.replace(targetDir, '')}`
-      return `${cacheDir}/${srcFile}`
-    }
-  }
-}
-const watchCallback = ( path ) => {
-  const dest = resolveDestinationPath(path)
-  if (!dest) {
-    console.log(styleText('red', `[watcher] cannot resolve destination path: ${path}`))
-    alreadyCached = false
-    cache()
-    return true
-  }
-  if (fs.existsSync(path)) {
-    fs.cpSync(path, dest, { force: true })
-    console.log(styleText('blue', `update ${path} => ${dest}`))
-  } else {
-    fs.unlinkSync(dest)
-    console.log(styleText('red', `unlink ${dest}`))
-  }
-}
-
 export {
   rootDir,
   srcDir,
@@ -129,6 +76,5 @@ export {
   watch,
   cache,
   packageDir,
-  packageDirCore,
-  watchCallback
+  packageDirCore
 }

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/files.js

@@ -1,6 +1,5 @@
 import fs from "node:fs/promises";
-import { templateDir, cssDir, watch } from './dir.js'
-import { watchers } from './watcher.js'
+import { templateDir, cssDir } from './dir.js'
 
 let staticFilesContainer = {}
 let loaded = false
@@ -32,9 +31,4 @@ const staticFile = (name) => {
 const staticFiles = () => {
   return Object.entries(staticFilesContainer)
 }
-const reload = async () => {
-    loaded = false
-    return await warmUp()
-}
-
-export { staticFile, staticFiles, warmUp, reload }
+export { staticFile, staticFiles, warmUp }

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.34",
   "description": "blog template",
   "main": "index.js",
   "scripts": {