vitepress 0.20.8 → 0.20.9

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var serve = require('./serve-13371594.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-13371594.js');
+var serve = require('./serve-61783397.js');
 require('vite');
 require('readline');
 require('assert');

package/dist/node/{serve-13371594.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;
@@ -36464,9 +36465,11 @@ const staticDataPlugin = {
         ({ pattern, loader } = existing);
       } else {
         const loaderModule = (_a = await vite.loadConfigFromFile({}, id)) == null ? void 0 : _a.config;
-        pattern = loaderModule.watch;
-        if (pattern && pattern.startsWith("./")) {
-          pattern = pattern.slice(2);
+        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;
       }
@@ -36485,7 +36488,7 @@ const staticDataPlugin = {
       const { base, pattern } = idToLoaderModulesMap[id];
       server._globImporters[id] = {
         module: server.moduleGraph.getModuleById(id),
-        importGlobs: [{ base, pattern }]
+        importGlobs: pattern == null ? void 0 : pattern.map((pattern2) => ({ base, pattern: pattern2 }))
       };
     }
     return null;
@@ -40039,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));
@@ -40070,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>
@@ -40084,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.8",
+  "version": "0.20.9",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",