@tenjuu99/blog 0.2.30 → 0.2.32

package/bin/dev-server

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn } from 'child_process'
-import { srcDir, watch as watchDir, packageDir, packageDirCore } from '../lib/dir.js'
+import { srcDir, watch as watchDir, packageDir, packageDirCore, watchCallback } from '../lib/dir.js'
 import { watchers, watch } from '../lib/watcher.js'
 import generate from '../lib/generate.js'
 import path from 'path'
@@ -12,19 +12,16 @@ const libDir = path.dirname(__filename) + '/../lib/'
 const binDir = path.dirname(__filename) + '/../bin/'
 
 watchers.push({
-  paths: srcDir,
-  watchOptions: {
-    ignored: [watchDir.pageDir, watchDir.serverDir, watchDir.helperDir],
+  paths: [srcDir],
+  event: ['change', 'add', 'unlink'],
+  callback: (path) => {
+    watchCallback(path)
+    generate()
   },
-  callback: generate
-})
-watchers.push({
-  paths: watchDir.pageDir,
-  callback: generate,
   watchOptions: {
     ignoreInitial: true
   },
-  event: ['change', 'unlink', 'add']
+  prior: true,
 })
 watchers.push({
   paths: [watchDir.serverDir, watchDir.helperDir, libDir, packageDir, packageDirCore],

package/lib/applyTemplate.js

@@ -2,7 +2,7 @@
 import applyCss from './cssGenerator.js'
 import includeFilter from './includeFilter.js'
 import { watch } from './dir.js'
-import { staticFile, staticFiles, warmUp } from './files.js'
+import { staticFile, staticFiles, warmUp, reload } from './files.js'
 import { watchers } from './watcher.js'
 
 let templates = {}
@@ -28,7 +28,11 @@ const warmUpTemplate = async () => {
 
 watchers.push({
   paths: [watch.cssDir, watch.templateDir],
-  callback: () => { templates = {} }
+  callback: async () => {
+    templates = {}
+    await reload()
+    await warmUpTemplate()
+  }
 })
 
 export { applyTemplate, warmUpTemplate }

package/lib/dir.js

@@ -99,30 +99,23 @@ const resolveDestinationPath = (path) => {
     }
   }
 }
-watchers.push({
-  paths: [srcDir, packageDir, packageDirCore],
-  event: ['change', 'add', 'unlink'],
-  callback: ( 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}`))
-    }
-  },
-  watchOptions: {
-    ignoreInitial: true
-  },
-  prior: true,
-})
+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,
@@ -136,5 +129,6 @@ export {
   watch,
   cache,
   packageDir,
-  packageDirCore
+  packageDirCore,
+  watchCallback
 }

package/lib/files.js

@@ -32,12 +32,9 @@ const staticFile = (name) => {
 const staticFiles = () => {
   return Object.entries(staticFilesContainer)
 }
-watchers.push({
-  paths: [watch.cssDir, watch.templateDir],
-  callback: async () => {
+const reload = async () => {
     loaded = false
-    await warmUp()
-  }
-})
+    return await warmUp()
+}
 
-export { staticFile, staticFiles, warmUp }
+export { staticFile, staticFiles, warmUp, reload }

package/package.json

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