vitepress 0.20.5 → 0.20.9

package/client.d.ts

@@ -0,0 +1,4 @@
+// re-export vite client types
+// with strict installers like pnpm, user won't be able to reference vite/client
+// in project root
+/// <reference types="vite/client" />

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var serve = require('./serve-f83deb60.js');
+var serve = require('./serve-61783397.js');
 require('fs');
 require('path');
 require('url');

package/dist/node/index.d.ts

@@ -83,7 +83,7 @@ export declare interface ServeOptions {
     port?: number;
 }
 
-export declare interface SiteConfig<ThemeConfig = any> {
+export declare interface SiteConfig<ThemeConfig = any> extends Pick<UserConfig, 'markdown' | 'vue' | 'vite' | 'shouldPreload' | 'mpa'> {
     root: string;
     srcDir: string;
     site: SiteData<ThemeConfig>;
@@ -93,10 +93,6 @@ export declare interface SiteConfig<ThemeConfig = any> {
     tempDir: string;
     alias: AliasOptions;
     pages: string[];
-    markdown: MarkdownOptions | undefined;
-    vue: Options | undefined;
-    vite: UserConfig_2 | undefined;
-    mpa: boolean;
 }
 
 export declare interface SiteData<ThemeConfig = any> {
@@ -153,6 +149,7 @@ export declare interface UserConfig<ThemeConfig = any> {
     vite?: UserConfig_2;
     srcDir?: string;
     srcExclude?: string[];
+    shouldPreload?: (link: string, page: string) => boolean;
     /**
      * Enable MPA / zero-JS mode
      * @experimental

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var serve = require('./serve-f83deb60.js');
+var serve = require('./serve-61783397.js');
 require('vite');
 require('readline');
 require('assert');

package/dist/node/{serve-f83deb60.js → serve-61783397.js}

@@ -13372,6 +13372,7 @@ async function resolveConfig(root = process.cwd(), command = "serve", mode = "de
     alias: resolveAliases(themeDir),
     vue: userConfig.vue,
     vite: userConfig.vite,
+    shouldPreload: userConfig.shouldPreload,
     mpa: !!userConfig.mpa
   };
   return config;
@@ -36431,6 +36432,81 @@ const getHeadMetaContent = (head, name) => {
   return meta && meta[1].content;
 };
 
+const loaderMatch = /\.data\.(j|t)s$/;
+let server;
+const idToLoaderModulesMap = Object.create(null);
+let idToPendingPromiseMap = Object.create(null);
+let isBuild = false;
+const staticDataPlugin = {
+  name: "vitepress:data",
+  configResolved(config) {
+    isBuild = config.command === "build";
+  },
+  configureServer(_server) {
+    server = _server;
+  },
+  async load(id) {
+    var _a;
+    if (loaderMatch.test(id)) {
+      let _resolve;
+      if (isBuild) {
+        if (idToPendingPromiseMap[id]) {
+          return idToPendingPromiseMap[id];
+        }
+        idToPendingPromiseMap[id] = new Promise((r) => {
+          _resolve = r;
+        });
+      }
+      const base = path$p.dirname(id);
+      let pattern;
+      let loader;
+      const existing = idToLoaderModulesMap[id];
+      if (existing) {
+        ({ pattern, loader } = existing);
+      } else {
+        const loaderModule = (_a = await vite.loadConfigFromFile({}, id)) == null ? void 0 : _a.config;
+        pattern = typeof loaderModule.watch === "string" ? [loaderModule.watch] : loaderModule.watch;
+        if (pattern) {
+          pattern = pattern.map((p) => {
+            return p.startsWith("./") ? p.slice(2) : p;
+          });
+        }
+        loader = loaderModule.load;
+      }
+      const data = await loader();
+      if (server) {
+        idToLoaderModulesMap[id] = { base, pattern, loader };
+      }
+      const result = `export const data = JSON.parse(${JSON.stringify(JSON.stringify(data))})`;
+      if (_resolve)
+        _resolve(result);
+      return result;
+    }
+  },
+  transform(_code, id) {
+    if (server && loaderMatch.test(id)) {
+      const { base, pattern } = idToLoaderModulesMap[id];
+      server._globImporters[id] = {
+        module: server.moduleGraph.getModuleById(id),
+        importGlobs: pattern == null ? void 0 : pattern.map((pattern2) => ({ base, pattern: pattern2 }))
+      };
+    }
+    return null;
+  },
+  handleHotUpdate(ctx) {
+    for (const id in idToLoaderModulesMap) {
+      const { base, pattern } = idToLoaderModulesMap[id];
+      const isLoaderFile = vite.normalizePath(ctx.file) === id;
+      if (isLoaderFile) {
+        delete idToLoaderModulesMap[id];
+      }
+      if (isLoaderFile || pattern && micromatch_1.isMatch(path$p.relative(base, ctx.file), pattern)) {
+        ctx.modules.push(server.moduleGraph.getModuleById(id));
+      }
+    }
+  }
+};
+
 var __defProp$1 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
 var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
@@ -36624,7 +36700,12 @@ function createVitePressPlugin(root, siteConfig, ssr = false, pageToHashMap, cli
       }
     }
   };
-  return [vitePressPlugin, vuePlugin, ...(userViteConfig == null ? void 0 : userViteConfig.plugins) || []];
+  return [
+    vitePressPlugin,
+    vuePlugin,
+    ...(userViteConfig == null ? void 0 : userViteConfig.plugins) || [],
+    staticDataPlugin
+  ];
 }
 
 async function createServer(root = process.cwd(), serverOptions = {}) {
@@ -39961,13 +40042,25 @@ async function renderPage(config, page, result, appChunk, cssChunk, pageToHashMa
   const pageClientJsFileName = `assets/${pageName}.${pageHash}.lean.js`;
   const { __pageData } = require(path__default["default"].join(config.tempDir, pageServerJsFileName));
   const pageData = JSON.parse(__pageData);
-  const preloadLinks = (config.mpa ? appChunk ? [appChunk.fileName] : [] : result && appChunk ? [
-    ...resolvePageImports(config, page, result, appChunk),
-    pageClientJsFileName,
-    appChunk.fileName
-  ] : []).map((file) => {
+  let preloadLinks = config.mpa ? appChunk ? [appChunk.fileName] : [] : result && appChunk ? [
+    ...new Set([
+      ...resolvePageImports(config, page, result, appChunk),
+      pageClientJsFileName,
+      appChunk.fileName
+    ])
+  ] : [];
+  let prefetchLinks = [];
+  const { shouldPreload } = config;
+  if (shouldPreload) {
+    prefetchLinks = preloadLinks.filter((link) => !shouldPreload(link, page));
+    preloadLinks = preloadLinks.filter((link) => shouldPreload(link, page));
+  }
+  const preloadLinksString = preloadLinks.map((file) => {
     return `<link rel="modulepreload" href="${siteData.base}${file}">`;
   }).join("\n    ");
+  const prefetchLinkString = prefetchLinks.map((file) => {
+    return `<link rel="prefetch" href="${siteData.base}${file}">`;
+  }).join("\n    ");
   const stylesheetLink = cssChunk ? `<link rel="stylesheet" href="${siteData.base}${cssChunk.fileName}">` : "";
   const title = pageData.title && pageData.title !== "Home" ? `${pageData.title} | ${siteData.title}` : siteData.title;
   const head = addSocialTags(title, ...siteData.head, ...filterOutHeadDescription(pageData.frontmatter.head));
@@ -39992,7 +40085,8 @@ async function renderPage(config, page, result, appChunk, cssChunk, pageToHashMa
     <title>${title}</title>
     <meta name="description" content="${pageData.description || siteData.description}">
     ${stylesheetLink}
-    ${preloadLinks}
+    ${preloadLinksString}
+    ${prefetchLinkString}
     ${renderHead(head)}
   </head>
   <body>
@@ -40006,15 +40100,15 @@ async function renderPage(config, page, result, appChunk, cssChunk, pageToHashMa
   await lib$1.ensureDir(path__default["default"].dirname(htmlFileName));
   await lib$1.writeFile(htmlFileName, html);
 }
-function resolvePageImports(config, page, result, indexChunk) {
+function resolvePageImports(config, page, result, appChunk) {
   const srcPath = vite.normalizePath(lib$1.realpathSync(path__default["default"].resolve(config.srcDir, page)));
   const pageChunk = result.output.find((chunk) => chunk.type === "chunk" && chunk.facadeModuleId === srcPath);
-  return Array.from(new Set([
-    ...indexChunk.imports,
-    ...indexChunk.dynamicImports,
+  return [
+    ...appChunk.imports,
+    ...appChunk.dynamicImports,
     ...pageChunk.imports,
     ...pageChunk.dynamicImports
-  ]));
+  ];
 }
 function renderHead(head) {
   return head.map(([tag, attrs = {}, innerHTML = ""]) => {

package/dist/vitepress.d.ts

@@ -83,7 +83,7 @@ export declare interface ServeOptions {
     port?: number;
 }
 
-export declare interface SiteConfig<ThemeConfig = any> {
+export declare interface SiteConfig<ThemeConfig = any> extends Pick<UserConfig, 'markdown' | 'vue' | 'vite' | 'shouldPreload' | 'mpa'> {
     root: string;
     srcDir: string;
     site: SiteData<ThemeConfig>;
@@ -93,10 +93,6 @@ export declare interface SiteConfig<ThemeConfig = any> {
     tempDir: string;
     alias: AliasOptions;
     pages: string[];
-    markdown: MarkdownOptions | undefined;
-    vue: Options | undefined;
-    vite: UserConfig_2 | undefined;
-    mpa: boolean;
 }
 
 export declare interface SiteData<ThemeConfig = any> {
@@ -153,6 +149,7 @@ export declare interface UserConfig<ThemeConfig = any> {
     vite?: UserConfig_2;
     srcDir?: string;
     srcExclude?: string[];
+    shouldPreload?: (link: string, page: string) => boolean;
     /**
      * Enable MPA / zero-JS mode
      * @experimental

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.20.5",
+  "version": "0.20.9",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",
@@ -10,7 +10,8 @@
   "files": [
     "bin",
     "dist",
-    "types"
+    "types",
+    "client.d.ts"
   ],
   "engines": {
     "node": ">=12.0.0"
@@ -63,6 +64,7 @@
     "@types/koa-static": "^4.0.1",
     "@types/lru-cache": "^5.1.0",
     "@types/markdown-it": "^12.0.1",
+    "@types/micromatch": "^4.0.2",
     "@types/node": "^15.6.1",
     "@types/polka": "^0.5.3",
     "chalk": "^4.1.1",
@@ -75,6 +77,7 @@
     "esbuild": "^0.13.4",
     "escape-html": "^1.0.3",
     "execa": "^5.0.0",
+    "fast-glob": "^3.2.7",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.3",
     "gray-matter": "^4.0.3",
@@ -87,6 +90,7 @@
     "markdown-it-container": "^3.0.0",
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-table-of-contents": "^0.5.2",
+    "micromatch": "^4.0.4",
     "minimist": "^1.2.5",
     "npm-run-all": "^4.1.5",
     "ora": "^5.4.0",