themekit-js 1.1.13 → 1.1.15

package/dist/client/theme-default/components/blocks/Doc.vue

@@ -10,10 +10,13 @@ const docStyles= computed(() => {
 
     let styles:any=[ vw ? { '--vp-offset': "calc(50% - "+vw.value/2+"px)"} : {}];
     if(block['background-color']){
-      styles.push({ 'background-color':block['background-color']})
+       styles.push({ 'background-color':block['background-color']})
     }
     if(block['background-image']){
        styles.push({ 'background-image':"url("+block['background-image']+")"})
+    }   
+    if(block['color']){
+       styles.push({ 'color':block['color']})
     }  
     return styles
 })

package/dist/client/theme-default/components/blocks/Features.vue

@@ -24,7 +24,10 @@ if(props.block['background-color']){
 }
 if(props.block['background-image']){
    styles.push({'background-image':"url("+props.block['background-image']+")"})
-}  
+}   
+if(props.block['color']){
+       styles.push({ 'color':props.block['color']})
+    }  
 return styles
 })
 

package/dist/client/theme-default/components/blocks/Hero.vue

@@ -63,6 +63,9 @@ const styles= computed(() => {
   if(props.block['background-image']){ 
      styles.push({'background-image':"url("+props.block['background-image']+")"})
   }  
+  if(props.block['color']){
+       styles.push({ 'color':props.block['color']})
+    }  
   return styles
 })
 </script>

package/dist/client/theme-default/styles/components/vp-doc.css

@@ -1,7 +1,10 @@
 /**
  * Headings
  * -------------------------------------------------------------------------- */
+.vp-doc{
 
+  overflow: auto;
+}
 .vp-doc h1,
 .vp-doc h2,
 .vp-doc h3,
@@ -76,10 +79,9 @@
     line-height: 40px;
     font-size: 32px;
   }
-}
-
+} 
 .vp-doc h2 .header-anchor {
-  top: 24px;
+  top:18px;
 }
 
 /**

package/dist/node/cli.js

@@ -1,4 +1,4 @@
-import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-CFnipkLI.js';
+import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-BI5vlbXe.js';
 import { createLogger } from 'vite';
 import 'path';
 import 'shiki';

package/dist/node/index.js

@@ -1,7 +1,7 @@
 import { normalizePath } from 'vite';
 export { loadEnv } from 'vite';
-import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, a as getDefaultExportFromCjs } from './serve-CFnipkLI.js';
-export { S as ScaffoldThemeType, b as build, p as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, o as serve } from './serve-CFnipkLI.js';
+import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, a as getDefaultExportFromCjs } from './serve-BI5vlbXe.js';
+export { S as ScaffoldThemeType, b as build, p as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, o as serve } from './serve-BI5vlbXe.js';
 import path from 'path';
 import 'crypto';
 import 'module';

package/dist/node/{serve-CFnipkLI.js → serve-BI5vlbXe.js}

@@ -38260,67 +38260,77 @@ async function createMarkdownToVueRenderFn(srcDir, options = {}, pages, isBuild
     const blocksRegex = /<!--#([\s\S]*?)#-->/g;
     let blockRaws = [];
     let blockRaw;
-    while ((blockRaw = blocksRegex.exec(src)) !== null) {
-      blockRaws.push(blockRaw[0]);
-    }
+    const regexLayout = /(?<=<!--\$layout).*?(?=-->)/g;
+    let layout;
+    let layoutVal = "doc";
+    while (layout = regexLayout.exec(src)) {
+      const attrStart = layout[0].indexOf(":");
+      layoutVal = layout[0].substring(attrStart + 1).trim();
+    }
+    console.log("Layout:" + layoutVal);
     let blocks = [];
-    for (let i = 0; i < blockRaws.length; i++) {
-      let Token2JSON2 = function(tokens, parent = {}, closeTag, start2) {
-        for (let i2 = start2; i2 < tokens.length; i2++) {
-          const token = tokens[i2];
-          if (token.type == "image") {
-            parent["children"].push({ "block_type": "img", "content": token.attrGet("content"), "src": token.attrGet("src") });
-            continue;
-          }
-          if (token.tag == "code") {
-            parent["children"].push({ "block_type": "div", "content": "", "html": md.render("```" + token.info + "\n" + token.content + "```", env) });
-            continue;
-          }
-          if (token.type.indexOf("_open") >= 0) {
-            const newBlock = { "block_type": token.tag, "content": token.content, "children": [] };
-            if (token.type == "link_open") {
-              newBlock.href = token.attrGet("href");
-            }
-            parent["children"].push(newBlock);
-            i2 = Token2JSON2(tokens, parent["children"][parent["children"].length - 1], token.tag, i2 + 1);
-          } else if (token.type.indexOf("_close") >= 0 && token.tag == closeTag) {
-            return i2;
-          } else {
-            if (token.children == null) {
-              parent["children"].push(token.content.indexOf("<!--") >= 0 ? { "block_type": "mark", "content": token.content } : { "block_type": token.tag == "" ? "text" : token.tag, "content": token.content });
+    if (layoutVal == "block") {
+      while ((blockRaw = blocksRegex.exec(src)) !== null) {
+        blockRaws.push(blockRaw[0]);
+      }
+      for (let i = 0; i < blockRaws.length; i++) {
+        let Token2JSON2 = function(tokens, parent = {}, closeTag, start2) {
+          for (let i2 = start2; i2 < tokens.length; i2++) {
+            const token = tokens[i2];
+            if (token.type == "image") {
+              parent["children"].push({ "block_type": "img", "content": token.attrGet("content"), "src": token.attrGet("src") });
+              continue;
+            }
+            if (token.tag == "code") {
+              parent["children"].push({ "block_type": "div", "content": "", "html": md.render("```" + token.info + "\n" + token.content + "```", env) });
+              continue;
+            }
+            if (token.type.indexOf("_open") >= 0) {
+              const newBlock = { "block_type": token.tag, "content": token.content, "children": [] };
+              if (token.type == "link_open") {
+                newBlock.href = token.attrGet("href");
+              }
+              parent["children"].push(newBlock);
+              i2 = Token2JSON2(tokens, parent["children"][parent["children"].length - 1], token.tag, i2 + 1);
+            } else if (token.type.indexOf("_close") >= 0 && token.tag == closeTag) {
+              return i2;
             } else {
-              Token2JSON2(token.children, parent, "item", 0);
+              if (token.children == null) {
+                parent["children"].push(token.content.indexOf("<!--") >= 0 ? { "block_type": "mark", "content": token.content } : { "block_type": token.tag == "" ? "text" : token.tag, "content": token.content });
+              } else {
+                Token2JSON2(token.children, parent, "item", 0);
+              }
             }
           }
+          return tokens.length;
+        };
+        const block = blockRaws[i];
+        src = src.replace(block, "<!--Block-->");
+        const blockVarsRegex = /(?<=<!--\$).*?(?=-->)/g;
+        let match2;
+        const blockVars = {};
+        while (match2 = blockVarsRegex.exec(block)) {
+          const attrStart = match2[0].indexOf(":");
+          const attrVal = match2[0].substring(attrStart + 1).trim();
+          const attrName = match2[0].substring(0, attrStart);
+          blockVars[attrName] = attrVal;
+        }
+        const blockTypeRegex = /(?<=<!--#).*?(?=-->)/g;
+        const blockType = blockTypeRegex.exec(block);
+        const blockContent = blockType != null && (blockType[0] == "Doc" || blockType[0] == "Github") ? md.render(block, env) : "";
+        const blockItem = Object.assign(
+          blockVars,
+          { "children": [], "block_type": blockType === null ? "blank" : blockType[0], "content": blockContent }
+        );
+        if (blockType != null && blockType[0] != "Doc" && blockType[0] != "Github") {
+          Token2JSON2(MarkdownIt({
+            html: true,
+            linkify: true,
+            ...options
+          }).parse(block, env), blockItem, "body", 0);
         }
-        return tokens.length;
-      };
-      const block = blockRaws[i];
-      src = src.replace(block, "<!--Block-->");
-      const blockVarsRegex = /(?<=<!--\$).*?(?=-->)/g;
-      let match2;
-      const blockVars = {};
-      while (match2 = blockVarsRegex.exec(block)) {
-        const attrStart = match2[0].indexOf(":");
-        const attrVal = match2[0].substring(attrStart + 1).trim();
-        const attrName = match2[0].substring(0, attrStart);
-        blockVars[attrName] = attrVal;
-      }
-      const blockTypeRegex = /(?<=<!--#).*?(?=-->)/g;
-      const blockType = blockTypeRegex.exec(block);
-      const blockContent = blockType != null && (blockType[0] == "Doc" || blockType[0] == "Github") ? md.render(block, env) : "";
-      const blockItem = Object.assign(
-        blockVars,
-        { "children": [], "block_type": blockType === null ? "blank" : blockType[0], "content": blockContent }
-      );
-      if (blockType != null && blockType[0] != "Doc" && blockType[0] != "Github") {
-        Token2JSON2(MarkdownIt({
-          html: true,
-          linkify: true,
-          ...options
-        }).parse(block, env), blockItem, "body", 0);
+        blocks.push(blockItem);
       }
-      blocks.push(blockItem);
     }
     const html = md.render(src, env);
     const {
@@ -46715,7 +46725,7 @@ function escapeHtml(string) {
 
 var escape$1 = /*@__PURE__*/getDefaultExportFromCjs(escapeHtml_1);
 
-var version = "1.1.13";
+var version = "1.1.15";
 
 async function renderPage(render, config, page, result, appChunk, cssChunk, assets, pageToHashMap, metadataScript, additionalHeadTags) {
   const routePath = `/${page.replace(/\.md$/, "")}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "themekit-js",
-  "version": "1.1.13",
+  "version": "1.1.15", 
   "description": "基于VitePress开发的Markdown静态网站生成器", 
   "type": "module",
   "packageManager": "pnpm@8.15.6",