Forráskód Böngészése

Fix things, I guess.

Lee Morgan 2 hete
szülő
commit
62fbd499fd
2 módosított fájl, 16 hozzáadás és 15 törlés
  1. 11 12
      index.js
  2. 5 3
      parseDir.js

+ 11 - 12
index.js

@@ -3,29 +3,28 @@ import path from "path";
 
 import parseDir from "./parseDir.js";
 
-const srcRoot = path.join(import.meta.dirname, "src");
+export default async (express, options = {})=> {
+    console.time("Build Completed In");
 
-const main = (options)=> {
-    console.time("Build Time");
+    const app = express();
+    const root = path.join(process.cwd(), "routes");
+    readFiles(root, root, app);
+    app.use(express.static(path.join(process.cwd(), ".build")));
 
-    fs.mkdir(path.join(import.meta.dirname, ".build"), {recursive: true});
-    readFiles(srcRoot);
-
-    console.timeEnd("Build Time");
+    console.timeEnd("Build Completed In");
+    return app;
 }
 
-const readFiles = async (dir)=>{
+const readFiles = async (dir, root, app)=>{
     const files = await fs.readdir(dir, {withFileTypes: true});
 
     for(let i = 0; i < files.length; i++){
         let curDir = path.join(dir, files[i].name);
 
         if(files[i].isDirectory()) {
-            readFiles(curDir);
+            readFiles(curDir, root, app);
         }
     }
 
-    await parseDir(dir);
+    parseDir(dir);
 }
-
-main();

+ 5 - 3
parseDir.js

@@ -51,10 +51,12 @@ const bundleFiles = async (files)=>{
             collapseBooleanAttributes: true,
             collapseInlineTagWhitespace: true,
             collapseWhitespace: true,
-            conservativeCollapse: false,
             decodeEntities: true,
+            html5: true,
+            includeAutoGeneratedTags: false,
             noNewlinesBeforeTagClose: true,
-            removeComments: true
+            removeComments: true,
+            useShortDoctype: true
         }),
         js: "",
         css: ""
@@ -81,7 +83,7 @@ const mergeFiles = (contents)=>{
 }
 
 const writeHtml = async (dir, html)=>{
-    const writeDir = `${dir.replace("/src", "/.build")}`;
+    const writeDir = `${dir.replace("/routes", "/.build")}`;
     await fs.mkdir(writeDir, {recursive: true});
     fs.writeFile(`${writeDir}/index.html`, html);
 }