minista 3.0.0-alpha.21 → 3.0.0-alpha.22

package/dist/cli/build.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { parse as parseUrl } from "node:url";
 import fs from "fs-extra";
 import pc from "picocolors";
 import {
@@ -84,27 +85,42 @@ async function build(inlineConfig = {}) {
     return ssgPages.map((page) => {
       const pathname = page.path;
       let parsedHtml = parseHtml(page.html);
-      const links = parsedHtml.querySelectorAll("link").filter(
-        (el) => el.getAttribute("href")?.startsWith("/@minista-entry/")
-      );
-      const scripts = parsedHtml.querySelectorAll("script").filter(
-        (el) => el.getAttribute("src")?.startsWith("/@minista-entry/")
-      );
+      function hasEntryFile(src) {
+        const isAbsolute = parseUrl(src).protocol;
+        if (!src || isAbsolute) {
+          return false;
+        }
+        const filePath = path.join(resolvedRoot, src);
+        return fs.existsSync(filePath);
+      }
+      const links = parsedHtml.querySelectorAll("link").filter((el) => {
+        const url = el.getAttribute("href") || "";
+        return hasEntryFile(url);
+      });
+      const scripts = parsedHtml.querySelectorAll("script").filter((el) => {
+        const url = el.getAttribute("src") || "";
+        return hasEntryFile(url);
+      });
       if (links.length === 0 && scripts.length === 0) {
         return {
           fileName: page.fileName,
           data: page.html
         };
       }
-      function registerSsgEntries(items, srcAttr, outExt, selfEntries, otherEntries) {
+      function registerSsgEntries(items, selfEntries, otherEntries) {
         items.map((item) => {
+          const tagName = item.tagName.toLowerCase();
+          const isScript = tagName === "script";
+          const srcAttr = isScript ? "src" : "href";
+          const outExt = isScript ? "js" : "css";
           let src = "";
           src = item.getAttribute(srcAttr) || "";
-          src = src.replace("/@minista-entry/", "");
           src = path.join(resolvedRoot, src);
           let name = "";
           name = item.getAttribute("data-minista-entry-name") || "";
           name = name ? name : path.parse(src).name;
+          let attributes = "";
+          attributes = item.getAttribute("data-minista-entry-attributes") || "";
           let assetPath = "";
           assetPath = path.join(assets.outDir, name + "." + outExt);
           assetPath = getBasedAssetPath({
@@ -112,8 +128,25 @@ async function build(inlineConfig = {}) {
             pathname,
             assetPath
           });
+          if (isScript && attributes) {
+            item.removeAttribute("type");
+          }
+          if (attributes && attributes !== "false") {
+            const attrStrArray = attributes.split(/\s+/);
+            let attrObj = {};
+            attrStrArray.map((attrStr) => {
+              const parts = attrStr.split("=");
+              const key = parts[0];
+              const value = parts[1].replace(/\"/g, "");
+              return attrObj[key] = value;
+            });
+            for (const key in attrObj) {
+              item.setAttribute(key, attrObj[key]);
+            }
+          }
           item.setAttribute(srcAttr, assetPath);
           item.removeAttribute("data-minista-entry-name");
+          item.removeAttribute("data-minista-entry-attributes");
           const duplicateName = `${name}-ministaDuplicateName0`;
           if (Object.hasOwn(selfEntries, name)) {
             return;
@@ -129,8 +162,8 @@ async function build(inlineConfig = {}) {
           return;
         });
       }
-      registerSsgEntries(links, "href", "css", ssgLinks, ssgScripts);
-      registerSsgEntries(scripts, "src", "js", ssgScripts, ssgLinks);
+      registerSsgEntries(links, ssgLinks, ssgScripts);
+      registerSsgEntries(scripts, ssgScripts, ssgLinks);
       const htmlStr = parsedHtml.toString();
       return {
         fileName: page.fileName,

package/dist/config/vite.js

@@ -94,10 +94,6 @@ async function resolveViteConfig(mainConfig, subConfig) {
           find: "/@minista-project-root",
           replacement: path.resolve(subConfig.resolvedRoot)
         },
-        {
-          find: "/@minista-entry",
-          replacement: path.resolve(subConfig.resolvedRoot)
-        },
         {
           find: "/@minista-temp",
           replacement: path.resolve(subConfig.tempDir)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Static site generator with 100% static export from React and Vite",
-  "version": "3.0.0-alpha.21",
+  "version": "3.0.0-alpha.22",
   "type": "module",
   "engines": {
     "node": ">=16.8.0"