@sugarat/theme 0.1.36-beta.1 → 0.1.36

package/node.js

@@ -115,10 +115,10 @@ var ruleBlockTabs = (state, startLine, endLine, silent) => {
 var tabBreakRE = /^\s*::(.+)$/;
 var forbiddenCharsInSlotNames = /[ '"]/;
 var parseTabBreakLine = (line) => {
-  const m2 = line.match(tabBreakRE);
-  if (!m2)
+  const m = line.match(tabBreakRE);
+  if (!m)
     return null;
-  const trimmed = m2[1].trim();
+  const trimmed = m[1].trim();
   if (forbiddenCharsInSlotNames.test(trimmed)) {
     throw new Error(
       `contains forbidden chars in slot names (space and quotes) (${JSON.stringify(
@@ -206,86 +206,24 @@ var tabsPlugin = (md) => {
   };
 };
 
-// ../../node_modules/.pnpm/vitepress-plugin-mermaid@2.0.13_mermaid@10.2.4_vitepress@1.0.0-beta.2/node_modules/vitepress-plugin-mermaid/dist/vitepress-plugin-mermaid.es.mjs
-var m = (e) => {
-  const r = e.renderer.rules.fence.bind(e.renderer.rules);
-  e.renderer.rules.fence = (a, i, t, s, o) => {
-    const n = a[i];
-    if (n.info.trim() === "mermaid")
-      try {
-        return `
-      <Suspense> 
-      <template #default>
-      <Mermaid id="mermaid-${i}"  graph="${encodeURIComponent(
-          n.content
-        )}"></Mermaid>
-      </template>
-        <!-- loading state via #fallback slot -->
-        <template #fallback>
-          Loading...
-        </template>
-      </Suspense>`;
-      } catch (l) {
-        return `<pre>${l}</pre>`;
-      }
-    return n.info.trim() === "mmd" && (a[i].info = "mermaid"), r(a, i, t, s, o);
-  };
-};
-var d = {
-  securityLevel: "loose",
-  startOnLoad: false
-};
-function p(e) {
-  const r = {
-    ...d,
-    ...e
-  }, a = "virtual:mermaid-config", i = "\0" + a;
-  return {
-    name: "vite-plugin-mermaid",
-    enforce: "post",
-    transform(t, s) {
-      if (s.includes("vitepress/dist/client/app/index.js"))
-        return t = `
-import Mermaid from 'vitepress-plugin-mermaid/Mermaid.vue';
-` + t, t = t.replace(
-          "// install global components",
-          `// install global components
-		app.component('Mermaid', Mermaid);
-`
-        ), {
-          code: t,
-          map: null
-        };
-    },
-    async resolveId(t) {
-      if (t === a)
-        return i;
-    },
-    async load(t) {
-      if (t === i)
-        return `export default ${JSON.stringify(r)};`;
-    }
-  };
-}
-
 // src/utils/index.ts
-function formatDate(d2, fmt = "yyyy-MM-dd hh:mm:ss") {
-  if (!(d2 instanceof Date)) {
-    d2 = new Date(d2);
+function formatDate(d, fmt = "yyyy-MM-dd hh:mm:ss") {
+  if (!(d instanceof Date)) {
+    d = new Date(d);
   }
   const o = {
-    "M+": d2.getMonth() + 1,
-    "d+": d2.getDate(),
-    "h+": d2.getHours(),
-    "m+": d2.getMinutes(),
-    "s+": d2.getSeconds(),
-    "q+": Math.floor((d2.getMonth() + 3) / 3),
-    S: d2.getMilliseconds()
+    "M+": d.getMonth() + 1,
+    "d+": d.getDate(),
+    "h+": d.getHours(),
+    "m+": d.getMinutes(),
+    "s+": d.getSeconds(),
+    "q+": Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
   };
   if (/(y+)/.test(fmt)) {
     fmt = fmt.replace(
       RegExp.$1,
-      `${d2.getFullYear()}`.substr(4 - RegExp.$1.length)
+      `${d.getFullYear()}`.substr(4 - RegExp.$1.length)
     );
   }
   for (const k in o) {
@@ -414,7 +352,8 @@ function getThemeConfig(cfg) {
     cfg.mermaid = cfg?.mermaid ?? false;
   }
   if (cfg?.mermaid !== false) {
-    markdownPlugin.push(m);
+    const { MermaidMarkdown } = require("vitepress-plugin-mermaid");
+    markdownPlugin.push(MermaidMarkdown);
   }
   if (markdownPlugin.length) {
     extraConfig.markdown = {
@@ -484,8 +423,8 @@ function getGitTimestamp(file) {
   return new Promise((resolve, reject) => {
     const child = (0, import_child_process.spawn)("git", ["log", "-1", '--pretty="%ci"', file]);
     let output = "";
-    child.stdout.on("data", (d2) => {
-      output += String(d2);
+    child.stdout.on("data", (d) => {
+      output += String(d);
     });
     child.on("close", () => {
       resolve(+new Date(output));
@@ -503,31 +442,26 @@ function assignMermaid(config) {
     config.vite = {};
   if (!config.vite.plugins)
     config.vite.plugins = [];
-  config.vite.plugins.push(p(config.mermaid));
-  if (!config.vite.optimizeDeps)
-    config.vite.optimizeDeps = {};
-  config.vite.optimizeDeps = {
-    ...config.vite.optimizeDeps,
-    include: [
-      "@braintree/sanitize-url",
-      "dayjs",
-      "debug",
-      "cytoscape-cose-bilkent",
-      "cytoscape"
-    ]
-  };
+  const { MermaidPlugin } = require("vitepress-plugin-mermaid");
+  config.vite.plugins.push(MermaidPlugin(config.mermaid));
   if (!config.vite.resolve)
     config.vite.resolve = {};
   if (!config.vite.resolve.alias)
     config.vite.resolve.alias = {};
-  config.vite.resolve.alias = {
-    ...config.vite.resolve.alias,
-    "dayjs/plugin/advancedFormat.js": "dayjs/esm/plugin/advancedFormat",
-    "dayjs/plugin/customParseFormat.js": "dayjs/esm/plugin/customParseFormat",
-    "dayjs/plugin/isoWeek.js": "dayjs/esm/plugin/isoWeek",
-    "cytoscape/dist/cytoscape.umd.js": "cytoscape/dist/cytoscape.esm.js",
-    mermaid: "mermaid/dist/mermaid.esm.mjs"
-  };
+  config.vite.resolve.alias = [
+    ...aliasObjectToArray({
+      ...config.vite.resolve.alias,
+      "cytoscape/dist/cytoscape.umd.js": "cytoscape/dist/cytoscape.esm.js",
+      mermaid: "mermaid/dist/mermaid.esm.mjs"
+    }),
+    { find: /^dayjs\/(.*).js/, replacement: "dayjs/esm/$1" }
+  ];
+}
+function aliasObjectToArray(obj) {
+  return Object.entries(obj).map(([find, replacement]) => ({
+    find,
+    replacement
+  }));
 }
 function defineConfig(config) {
   if (config.themeConfig?.themeConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.1.36-beta.1",
+  "version": "0.1.36",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -39,12 +39,12 @@
     "fast-glob": "^3.2.12",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.7.0",
-    "vue-command-palette": "^0.1.4"
-  },
-  "devDependencies": {
+    "vue-command-palette": "^0.1.4",
     "@mermaid-js/mermaid-mindmap": "^9.3.0",
     "mermaid": "^10.2.4",
-    "vitepress-plugin-mermaid": "^2.0.13",
+    "vitepress-plugin-mermaid": "^2.0.13"
+  },
+  "devDependencies": {
     "@element-plus/icons-vue": "^2.1.0",
     "element-plus": "^2.3.4",
     "sass": "^1.56.1",

package/src/node.ts

@@ -1,3 +1,4 @@
+/* eslint-disable global-require */
 /* eslint-disable prefer-rest-params */
 import glob from 'fast-glob'
 import matter from 'gray-matter'
@@ -6,7 +7,6 @@ import { execSync, spawn, spawnSync } from 'child_process'
 import path from 'path'
 import type { SiteConfig, UserConfig } from 'vitepress'
 import { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'
-import { MermaidMarkdown, MermaidPlugin } from 'vitepress-plugin-mermaid'
 import { formatDate } from './utils/index'
 import type { Theme } from './composables/config/index'
 
@@ -181,6 +181,7 @@ export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
     cfg.mermaid = cfg?.mermaid ?? false
   }
   if (cfg?.mermaid !== false) {
+    const { MermaidMarkdown } = require('vitepress-plugin-mermaid')
     markdownPlugin.push(MermaidMarkdown)
     // extraConfig.vite = {
     //   ...extraConfig.vite,
@@ -321,31 +322,26 @@ export function assignMermaid(config: any) {
 
   if (!config.vite) config.vite = {}
   if (!config.vite.plugins) config.vite.plugins = []
+  const { MermaidPlugin } = require('vitepress-plugin-mermaid')
   config.vite.plugins.push(MermaidPlugin(config.mermaid))
-  if (!config.vite.optimizeDeps) config.vite.optimizeDeps = {}
-  config.vite.optimizeDeps = {
-    ...config.vite.optimizeDeps,
-    include: [
-      '@braintree/sanitize-url',
-      'dayjs',
-      'debug',
-      'cytoscape-cose-bilkent',
-      'cytoscape'
-    ]
-  }
   if (!config.vite.resolve) config.vite.resolve = {}
   if (!config.vite.resolve.alias) config.vite.resolve.alias = {}
 
-  config.vite.resolve.alias = {
-    ...config.vite.resolve.alias,
-    'dayjs/plugin/advancedFormat.js': 'dayjs/esm/plugin/advancedFormat',
-    'dayjs/plugin/customParseFormat.js': 'dayjs/esm/plugin/customParseFormat',
-    'dayjs/plugin/isoWeek.js': 'dayjs/esm/plugin/isoWeek',
-    'cytoscape/dist/cytoscape.umd.js': 'cytoscape/dist/cytoscape.esm.js',
-    mermaid: 'mermaid/dist/mermaid.esm.mjs'
-  }
+  config.vite.resolve.alias = [
+    ...aliasObjectToArray({
+      ...config.vite.resolve.alias,
+      'cytoscape/dist/cytoscape.umd.js': 'cytoscape/dist/cytoscape.esm.js',
+      mermaid: 'mermaid/dist/mermaid.esm.mjs'
+    }),
+    { find: /^dayjs\/(.*).js/, replacement: 'dayjs/esm/$1' }
+  ]
+}
+function aliasObjectToArray(obj: Record<string, string>) {
+  return Object.entries(obj).map(([find, replacement]) => ({
+    find,
+    replacement
+  }))
 }
-
 export function defineConfig(config: UserConfig<Theme.Config>): any {
   // 兼容低版本主题配置
   // @ts-ignore