@lexho111/plainblog 0.3.2 → 0.3.4

package/Blog.js

@@ -2,10 +2,7 @@ import http from "http";
 import crypto from "crypto";
 import fs from "fs";
 import { URLSearchParams } from "url";
-import { Readable, Transform, Writable, pipeline } from "stream";
 import { MapTransform } from "./streams.js";
-import { fromEvent, firstValueFrom } from "rxjs";
-import { map, scan, takeUntil, last, defaultIfEmpty } from "rxjs/operators";
 import Article from "./Article.js";
 import DatabaseModel from "./model/DatabaseModel.js";
 import { fetchData, postData } from "./model/APIModel.js";
@@ -16,8 +13,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { exec } from "child_process";
 import { promisify } from "util";
-import Vinyl from "vinyl";
-import { compileStyles, compileScripts } from "./gulp_frontend/gulpfile.js";
+import { compileStyles } from "./build-styles.js";
 
 const execPromise = promisify(exec);
 
@@ -144,14 +140,12 @@ export default class Blog {
     }
   
     async handleLogin(req, res) {
-      const body$ = fromEvent(req, "data").pipe(
-        map((chunk) => chunk.toString()),
-        scan((acc, chunk) => acc + chunk, ""),
-        takeUntil(fromEvent(req, "end")),
-        last(),
-        defaultIfEmpty("")
-      );
-      const body = await firstValueFrom(body$);
+      const body = await new Promise((resolve, reject) => {
+        let data = "";
+        req.on("data", (chunk) => (data += chunk.toString()));
+        req.on("end", () => resolve(data));
+        req.on("error", reject);
+      });
       const params = new URLSearchParams(body);
   
       if (params.get("password") === this.#password) {
@@ -219,22 +213,12 @@ export default class Blog {
 
   /** post a blog article */
   async postArticle(req, res) {
-    // OLD CODE
-    /*let body = "";
-    req.on("data", (chunk) => {
-      body += chunk.toString();
-    });*/
-    // NEW CODE
-    // Create a stream of the body string
-    const body$ = fromEvent(req, "data").pipe(
-      map((chunk) => chunk.toString()),
-      scan((acc, chunk) => acc + chunk, ""), // Accumulate chunks
-      takeUntil(fromEvent(req, "end")), // Stop when 'end' emits
-      last(), // Emit only the final full string
-      defaultIfEmpty("") // Handle empty bodies
-    );
-
-    const body = await firstValueFrom(body$);
+    const body = await new Promise((resolve, reject) => {
+      let data = "";
+      req.on("data", (chunk) => (data += chunk.toString()));
+      req.on("end", () => resolve(data));
+      req.on("error", reject);
+    });
 
     //req.on("end", async () => {
     const params = new URLSearchParams(body);
@@ -499,7 +483,7 @@ export default class Blog {
     const styleFiles = files.filter(
       (f) => (f.endsWith(".scss") || f.endsWith(".css")) && !f.endsWith(".min.css")
     );
-    const scriptFiles = files.filter((f) => f.endsWith(".js") && !f.endsWith(".min.js"));
+    //const scriptFiles = files.filter((f) => f.endsWith(".js") && !f.endsWith(".min.js"));
 
     // --- Process Styles ---
     if (styleFiles.length > 0) {
@@ -523,20 +507,10 @@ export default class Blog {
       if (currentHash !== this.#stylesHash) {
         console.log("Style assets have changed. Recompiling...");
         this.#stylesHash = currentHash;
-
-        const vinyls = fileData.map(
-          (f) =>
-            new Vinyl({
-              cwd: process.cwd(),
-              base: path.dirname(f.path),
-              path: f.path,
-              contents: f.content,
-            })
-        );
-
-        const stream = Readable.from(vinyls);
-        const outputStream = compileStyles(stream);
-        this.compiledStyles = await this.#streamToString(outputStream);
+        
+        // Compile styles using the standalone script
+        this.compiledStyles = await compileStyles();
+        
         await fs.promises.writeFile(
           path.join(__dirname, "styles.min.css"),
           this.compiledStyles + `\n/* source-hash: ${currentHash} */`
@@ -545,66 +519,6 @@ export default class Blog {
         console.log("styles are up-to-date")
       }
     }
-
-    // --- Process Scripts ---
-    if (scriptFiles.length > 0) {
-      const fileData = await Promise.all(
-        scriptFiles.sort().map(async (f) => {
-          const content = await fs.promises.readFile(f);
-          return { path: f, content };
-        })
-      );
-
-      const currentHash = crypto
-        .createHash("sha256")
-        .update(
-          fileData
-            .map((f) =>
-              crypto.createHash("sha256").update(f.content).digest("hex")
-            )
-            .join("")
-        )
-        .digest("hex");
-
-      if (currentHash !== this.#scriptsHash) {
-        console.log("Script assets have changed. Recompiling...");
-        this.#scriptsHash = currentHash;
-
-        const vinyls = fileData.map(
-          (f) =>
-            new Vinyl({
-              cwd: process.cwd(),
-              base: path.dirname(f.path),
-              path: f.path,
-              contents: f.content,
-            })
-        );
-        fileData.map(
-          (f) => {
-        console.log(`${f.path} ${f.content}`)})
-
-        const stream = Readable.from(vinyls);
-        const outputStream = compileScripts(stream);
-        this.compiledScripts = await this.#streamToString(outputStream);
-        await fs.promises.writeFile(
-          path.join(__dirname, "scripts.min.js"),
-          this.compiledScripts + `\n/* source-hash: ${currentHash} */`
-        );
-      } else {
-        console.log("scripts are up-to-date")
-      }
-    }
-  }
-
-  #streamToString(stream) {
-    return new Promise((resolve, reject) => {
-      let data = "";
-      stream.on("data", (file) => {
-        if (file.contents) data += file.contents.toString();
-      });
-      stream.on("end", () => resolve(data));
-      stream.on("error", reject);
-    });
   }
 
   async #findAssetFiles() {

package/build-styles.js

@@ -0,0 +1,61 @@
+import { promises as fs } from "fs";
+import path from "path";
+import * as sass from "sass";
+import postcss from "postcss";
+import autoprefixer from "autoprefixer";
+import cssnano from "cssnano";
+
+// Configuration
+const srcDir = path.join("gulp_frontend", "src");
+
+// Helper to find files recursively
+async function getFiles(dir) {
+  const dirents = await fs.readdir(dir, { withFileTypes: true });
+  const files = await Promise.all(
+    dirents.map((dirent) => {
+      const res = path.resolve(dir, dirent.name);
+      return dirent.isDirectory() ? getFiles(res) : res;
+    })
+  );
+  return Array.prototype.concat(...files);
+}
+
+export async function compileStyles() {
+  try {
+    const allFiles = await getFiles(srcDir);
+
+    // Filter for .scss files and exclude partials (files starting with _)
+    // Sort them to ensure consistent concatenation order
+    const scssFiles = allFiles
+      .filter((f) => f.endsWith(".scss") && !path.basename(f).startsWith("_"))
+      .sort();
+
+    let combinedCss = "";
+
+    // 1. Compile Sass
+    for (const file of scssFiles) {
+      try {
+        const result = sass.compile(file, {
+          loadPaths: [srcDir],
+          style: "expanded",
+        });
+        combinedCss += result.css + "\n";
+      } catch (err) {
+        console.error(`Error compiling ${path.basename(file)}:`, err.message);
+      }
+    }
+
+    // 2. PostCSS (Autoprefixer + CSSNano)
+    if (combinedCss) {
+      const plugins = [autoprefixer(), cssnano()];
+      const result = await postcss(plugins).process(combinedCss, {
+        from: undefined,
+      });
+      return result.css;
+    }
+    return "";
+  } catch (error) {
+    console.error("Build failed:", error);
+    return "";
+  }
+}

package/gulp_frontend/package.json

@@ -15,14 +15,7 @@
     "@babel/preset-env": "^7.28.5",
     "autoprefixer": "^10.4.23",
     "cssnano": "^7.1.2",
-    "gulp": "^5.0.1",
-    "gulp-babel": "^8.0.0",
-    "gulp-concat": "^2.6.1",
-    "gulp-postcss": "^10.0.0",
-    "gulp-rename": "^2.1.0",
-    "gulp-sass": "^6.0.1",
-    "gulp-sourcemaps": "^3.0.0",
-    "gulp-uglify": "^3.0.2",
+    "postcss": "^8.4.35",
     "sass": "^1.97.1"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",
@@ -19,22 +19,11 @@
     "node-fetch": "^3.3.2",
     "pg": "^8.16.3",
     "pg-hstore": "^2.3.4",
-    "rxjs": "^7.8.2",
     "sequelize": "^6.37.7",
     "sqlite3": "^5.1.7",
-    "vinyl": "^3.0.1",
-    "@babel/core": "^7.28.5",
-    "@babel/preset-env": "^7.28.5",
     "autoprefixer": "^10.4.23",
     "cssnano": "^7.1.2",
-    "gulp": "^5.0.1",
-    "gulp-babel": "^8.0.0",
-    "gulp-concat": "^2.6.1",
-    "gulp-postcss": "^10.0.0",
-    "gulp-rename": "^2.1.0",
-    "gulp-sass": "^6.0.1",
-    "gulp-sourcemaps": "^3.0.0",
-    "gulp-uglify": "^3.0.2",
+    "postcss": "^8.4.35",
     "sass": "^1.97.1"
   },
   "devDependencies": {

package/styles.min.css

@@ -1,2 +1,2 @@
-.grid{border:0 solid #000;display:grid;gap:.25rem;grid-template-columns:1fr}.grid article{border:0 solid #ccc;border-radius:4px;min-width:0;overflow-wrap:break-word;padding:.25rem}nav a:visited{color:#3b40c1;text-decoration-color:#3b40c1}body{background-color:#fdfdfd;font-family:Arial}nav a{color:#3b40c1;font-size:20px;text-decoration:underline}.datetime{color:#434343;font-style:italic}h2{margin:0 0 5px}p{margin-top:10px}span{margin:0}
-/*# sourceMappingURL=styles.min.css.map */
+.grid{border:0 solid #000;display:grid;gap:.25rem;grid-template-columns:1fr}.grid article{border:0 solid #ccc;border-radius:4px;min-width:0;overflow-wrap:break-word;padding:.25rem}h1{color:#7f0000}nav a{color:#3b40c1;font-size:20px;text-decoration:underline}nav a:visited{color:#3b40c1;text-decoration-color:#3b40c1}
+/* source-hash: 91ab1d754238759404d2b8becfe52372f6f7b9c0f136b8b125c69faadeacd9d7 */