@sugarat/theme 0.1.36-beta.0 → 0.1.36-beta.2

package/node.js

@@ -206,9 +206,6 @@ var tabsPlugin = (md) => {
   };
 };
 
-// src/node.ts
-var import_vitepress_plugin_mermaid = require("vitepress-plugin-mermaid");
-
 // src/utils/index.ts
 function formatDate(d, fmt = "yyyy-MM-dd hh:mm:ss") {
   if (!(d instanceof Date)) {
@@ -355,7 +352,8 @@ function getThemeConfig(cfg) {
     cfg.mermaid = cfg?.mermaid ?? false;
   }
   if (cfg?.mermaid !== false) {
-    markdownPlugin.push(import_vitepress_plugin_mermaid.MermaidMarkdown);
+    const { MermaidMarkdown } = require("vitepress-plugin-mermaid");
+    markdownPlugin.push(MermaidMarkdown);
   }
   if (markdownPlugin.length) {
     extraConfig.markdown = {
@@ -444,31 +442,26 @@ function assignMermaid(config) {
     config.vite = {};
   if (!config.vite.plugins)
     config.vite.plugins = [];
-  config.vite.plugins.push((0, import_vitepress_plugin_mermaid.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"
-    ]
-  };
+  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.0",
+  "version": "0.1.36-beta.2",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "main": "src/index.ts",
   "exports": {
@@ -34,15 +34,15 @@
   },
   "dependencies": {
     "@mdit-vue/shared": "^0.12.0",
-    "@mermaid-js/mermaid-mindmap": "^9.3.0",
     "@vue/shared": "^3.2.45",
     "@vueuse/core": "^9.6.0",
     "fast-glob": "^3.2.12",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.7.0",
+    "vue-command-palette": "^0.1.4",
+    "@mermaid-js/mermaid-mindmap": "^9.3.0",
     "mermaid": "^10.2.4",
-    "vitepress-plugin-mermaid": "^2.0.13",
-    "vue-command-palette": "^0.1.4"
+    "vitepress-plugin-mermaid": "^2.0.13"
   },
   "devDependencies": {
     "@element-plus/icons-vue": "^2.1.0",

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