@tenjuu99/blog 0.1.0 → 0.1.1

package/.env.prod.sample

@@ -1,7 +1,7 @@
 SITE_NAME=test_blog
 GTAG_ID=
 URL_BASE=https://amashigeseiji.github.io/blog_template
-RELATIVE_PATH=/blog_template
+RELATIVE_PATH=/tenjuu99-blog
 SRC_DIR=src-sample
 DIST_DIR=dist
 DISTRIBUTE_RAW=image

package/.github/workflows/github-page.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@master
 
       - name: npm install
-        run: npm install --production
+        run: npm install --omit=dev
 
       - name: Build
         run: cp .env.prod.sample .env && npm run generate

package/generate.js

@@ -1,11 +1,2 @@
-"use strict"
-import distribute from './lib/distribute.js'
-import { indexing } from './lib/indexer.js'
-import { srcDir, distDir } from './lib/dir.js'
-
-const start = performance.now()
-const data = await indexing(srcDir + '/pages/')
-
-await distribute(data, srcDir, distDir)
-const end = performance.now()
-console.log('build: ' + (end - start) + "ms")
+import generate from './lib/generate.js'
+generate()

package/lib/applyTemplate.js

@@ -1,6 +1,6 @@
 "use strict"
 import fs from "node:fs/promises";
-import applyCss from './cssGenerator.js'
+import { applyCss, watchCss } from './cssGenerator.js'
 import {
   replaceIfFilter,
   replaceScriptFilter,
@@ -8,9 +8,10 @@ import {
   includeFilter
 } from './filter.js'
 import { marked } from "marked";
-import { templateDir } from './dir.js'
+import { templateDir, cssDir } from './dir.js'
+import chokidar from 'chokidar'
 
-const templates = {}
+let templates = {}
 
 const applyTemplate = async (name = 'default.html') => {
   if (templates[name]) {
@@ -38,4 +39,11 @@ const render = async (templateName, data) => {
   return replaceVariablesFilter(template, data)
 }
 
-export default render
+const watchTemplate = () => {
+  chokidar.watch([cssDir, templateDir]).on('change', () => {
+    templates = {}
+  })
+  watchCss()
+}
+
+export { render, watchTemplate }

package/lib/cssGenerator.js

@@ -4,8 +4,9 @@ import { minifyCss } from './minify.js'
 import { createHash } from 'crypto'
 import path from 'path'
 import { distDir as distRoot, cssDir } from './dir.js'
+import chokidar from 'chokidar'
 
-const cacheBuster = {}
+let cacheBuster = {}
 const cacheBusterQuery = 't'
 
 /**
@@ -58,4 +59,10 @@ const applyCss = async (text) => {
   return text
 }
 
-export default applyCss
+const watchCss = () => {
+  chokidar.watch([cssDir]).on('change', (path) => {
+    cacheBuster = {}
+  })
+}
+
+export { applyCss, watchCss }

package/lib/dir.js

@@ -1,8 +1,8 @@
 const rootDir = process.cwd()
 const srcDir = `${rootDir}/${process.env.SRC_DIR}`
 const distDir = `${rootDir}/${process.env.DIST_DIR}`
-const templateDir = `${rootDir}/${process.env.SRC_DIR}/template`
-const cssDir = `${rootDir}/${process.env.SRC_DIR}/css`
+const templateDir = `${srcDir}/template`
+const cssDir = `${srcDir}/css`
 const cacheDir = `${rootDir}/.cache`
 
 export {

package/lib/distribute.js

@@ -2,7 +2,7 @@
 import fs from "node:fs/promises";
 import path from 'path'
 import { minifyHtml } from './minify.js'
-import render from './applyTemplate.js'
+import { render, watchTemplate } from './applyTemplate.js'
 
 const distribute = async (data, srcDir, distDir) => {
   if (data['__deleted']) {
@@ -32,4 +32,4 @@ const distribute = async (data, srcDir, distDir) => {
   })
 }
 
-export default distribute
+export { distribute, watchTemplate }

package/lib/generate.js

@@ -0,0 +1,15 @@
+"use strict"
+import { distribute } from './distribute.js'
+import { indexing } from './indexer.js'
+import { srcDir, distDir } from './dir.js'
+
+const generate = async () => {
+  const start = performance.now()
+  const data = await indexing(srcDir + '/pages/')
+
+  await distribute(data, srcDir, distDir)
+  const end = performance.now()
+  console.log('build: ' + (end - start) + "ms")
+}
+
+export default generate

package/package.json

@@ -1,40 +1,26 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "blog template",
   "main": "index.js",
   "scripts": {
-    "build": "npm run generate && npm run serve",
     "serve": "eval $(cat .env | tr \"\n\" \" \") node server.js",
     "generate": "eval $(cat .env | tr \"\n\" \" \") node generate.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "watch": "npm-watch build"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "watch": {
-    "build": {
-      "patterns": [
-        "src/",
-        "src-sample/",
-        "../src/",
-        "helper/",
-        "lib/",
-        "generate.js"
-      ],
-      "extensions": "html,md,css,js",
-      "quite": true
-    }
+  "bin": {
+    "generate": "generate.js",
+    "server": "server.js"
   },
   "author": "AmashigeSeiji",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/amashigeseiji/blog_template.git"
+    "url": "git+https://github.com/amashigeseiji/tenjuu99-blog.git"
   },
   "license": "MIT",
   "dependencies": {
+    "chokidar": "^3.6.0",
     "marked": "^13.x"
   },
-  "devDependencies": {
-    "npm-watch": "^0.x"
-  },
   "type": "module"
 }

package/server.js

@@ -1,8 +1,16 @@
 import http from 'http'
 import url from 'url'
 import fs from 'node:fs/promises'
-import { distDir } from './lib/dir.js'
+import { srcDir, distDir } from './lib/dir.js'
+import chokidar from 'chokidar'
+import generate from './lib/generate.js'
+import { watchTemplate } from './lib/applyTemplate.js'
 
+chokidar.watch(srcDir).on('change', (event, path) => {
+  generate()
+})
+watchTemplate()
+generate()
 const contentType = (ext) => {
     switch (ext) {
       case 'html':

package/src-sample/pages/abc.md

@@ -3,3 +3,4 @@ title: abc
 url: /abc
 published: 2024-08-31
 ---
+hoge