vitepress 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/client/app/composables/copyCode.js

@@ -1,13 +1,12 @@
 import { inBrowser } from 'vitepress';
 export function useCopyCode() {
     if (inBrowser) {
-        const timeoutIdMap = new Map();
+        const timeoutIdMap = new WeakMap();
         window.addEventListener('click', (e) => {
             const el = e.target;
             if (el.matches('div[class*="language-"] > button.copy')) {
                 const parent = el.parentElement;
-                const sibling = el.nextElementSibling
-                    ?.nextElementSibling;
+                const sibling = el.nextElementSibling?.nextElementSibling;
                 if (!parent || !sibling) {
                     return;
                 }

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 import * as vue from 'vue';
-import { Component, Ref, App, AsyncComponentLoader } from 'vue';
+import { Component, InjectionKey, Ref, App, AsyncComponentLoader } from 'vue';
 import { PageData, Awaitable, SiteData } from '../../types/shared.js';
 export { HeadConfig, Header, PageData, SiteData } from '../../types/shared.js';
 
@@ -19,6 +19,7 @@ interface Router {
 declare function useRouter(): Router;
 declare function useRoute(): Route;
 
+declare const dataSymbol: InjectionKey<VitePressData>;
 interface VitePressData<T = any> {
     /**
      * Site-level metadata
@@ -96,4 +97,4 @@ declare const Content: vue.DefineComponent<{
     as: string | Record<string, any>;
 }, {}>;
 
-export { Content, EnhanceAppContext, Route, Router, Theme, VitePressData, defineClientComponent, inBrowser, onContentUpdated, useData, useRoute, useRouter, withBase };
+export { Content, EnhanceAppContext, Route, Router, Theme, VitePressData, dataSymbol, defineClientComponent, inBrowser, onContentUpdated, useData, useRoute, useRouter, withBase };

package/dist/client/index.js

@@ -1,7 +1,7 @@
 // exports in this file are exposed to themes and md files via 'vitepress'
 // so the user can do `import { useRoute, useSiteData } from 'vitepress'`
 // composables
-export { useData } from './app/data';
+export { useData, dataSymbol } from './app/data';
 export { useRoute, useRouter } from './app/router';
 // utilities
 export { inBrowser, onContentUpdated, defineClientComponent, withBase } from './app/utils';

package/dist/client/theme-default/components/VPLocalSearchBox.vue

@@ -12,7 +12,7 @@ import {
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 import Mark from 'mark.js/src/vanilla.js'
 import MiniSearch, { type SearchResult } from 'minisearch'
-import { useRouter } from 'vitepress'
+import { useRouter, dataSymbol } from 'vitepress'
 import {
   computed,
   createApp,
@@ -27,7 +27,6 @@ import {
   type Ref
 } from 'vue'
 import type { ModalTranslations } from '../../../../types/local-search'
-import { dataSymbol } from '../../app/data'
 import { pathToFile } from '../../app/utils'
 import { useData } from '../composables/data'
 import { createTranslate } from '../support/translation'

package/dist/client/theme-default/components/VPNavBarSearch.vue

@@ -26,6 +26,7 @@ const { theme, localeIndex } = useData()
 // payload), we delay initializing it until the user has actually clicked or
 // hit the hotkey to invoke it.
 const loaded = ref(false)
+const actuallyLoaded = ref(false)
 
 const buttonText = computed(() => {
   const options = theme.value.search?.options ?? theme.value.algolia
@@ -169,9 +170,10 @@ const provider = __ALGOLIA__ ? 'algolia' : __VP_LOCAL_SEARCH__ ? 'local' : ''
       <VPAlgoliaSearchBox
         v-if="loaded"
         :algolia="theme.search?.options ?? theme.algolia"
+        @vue:beforeMount="actuallyLoaded = true"
       />
 
-      <div v-else id="docsearch">
+      <div v-if="!actuallyLoaded" id="docsearch">
         <VPNavBarSearchButton :placeholder="buttonText" @click="load" />
       </div>
     </template>

package/dist/node/cli.js

@@ -1,4 +1,4 @@
-import { o as getDefaultExportFromCjs, p as c, q as clearCache, k as build, s as serve, l as init, j as createServer } from './serve-9050e258.js';
+import { o as getDefaultExportFromCjs, p as c, q as clearCache, k as build, s as serve, l as init, j as createServer } from './serve-ec0537e0.js';
 import { createLogger } from 'vite';
 import 'url';
 import 'path';
@@ -294,7 +294,7 @@ var minimist = function (args, opts) {
 
 var minimist$1 = /*@__PURE__*/getDefaultExportFromCjs(minimist);
 
-var version = "1.0.0-beta.2";
+var version = "1.0.0-beta.3";
 
 function bindShortcuts(server, createDevServer) {
   if (!server.httpServer || !process.stdin.isTTY || process.env.CI) {

package/dist/node/index.d.ts

@@ -1939,16 +1939,18 @@ type UserConfigExport<ThemeConfig> = UserConfig<ThemeConfig> | Promise<UserConfi
 /**
  * Type config helper
  */
-declare function defineConfig(config: UserConfigExport<DefaultTheme.Config>): UserConfigExport<DefaultTheme.Config>;
+declare function defineConfig(config: UserConfig<DefaultTheme.Config>): UserConfig<DefaultTheme.Config>;
 /**
  * Type config helper for custom theme config
  */
-declare function defineConfigWithTheme<ThemeConfig>(config: UserConfigExport<ThemeConfig>): UserConfigExport<ThemeConfig>;
+declare function defineConfigWithTheme<ThemeConfig>(config: UserConfig<ThemeConfig>): UserConfig<ThemeConfig>;
 declare function resolveConfig(root?: string, command?: 'serve' | 'build', mode?: string): Promise<SiteConfig>;
 declare function resolveUserConfig(root: string, command: 'serve' | 'build', mode: string): Promise<[UserConfig, string | undefined, string[]]>;
 declare function resolveSiteData(root: string, userConfig?: UserConfig, command?: 'serve' | 'build', mode?: string): Promise<SiteData>;
 
-declare function createServer(root?: string, serverOptions?: ServerOptions, recreateServer?: () => Promise<void>): Promise<vite.ViteDevServer>;
+declare function createServer(root?: string, serverOptions?: ServerOptions & {
+    base?: string;
+}, recreateServer?: () => Promise<void>): Promise<vite.ViteDevServer>;
 
 declare function build(root?: string, buildOptions?: BuildOptions & {
     base?: string;

package/dist/node/index.js

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

package/dist/node/{serve-9050e258.js → serve-ec0537e0.js}

@@ -10761,8 +10761,8 @@ function pathToRegexp(path, keys, options) {
 
 function resolveRewrites(pages, userRewrites) {
   const rewriteRules = Object.entries(userRewrites || {}).map(([from, to]) => ({
-    toPath: compile$1(to),
-    matchUrl: match$1(from)
+    toPath: compile$1(to, { validate: false }),
+    matchUrl: match$1(from.startsWith("^") ? new RegExp(from) : from)
   }));
   const pageToRewrite = {};
   const rewriteToPage = {};
@@ -63268,11 +63268,11 @@ function trimChar(str, char) {
 }
 async function serve(options = {}) {
   var _a;
-  const port = options.port !== void 0 ? options.port : 4173;
-  const site = await resolveConfig(options.root, "serve", "production");
-  const base = trimChar((options == null ? void 0 : options.base) ?? ((_a = site == null ? void 0 : site.site) == null ? void 0 : _a.base) ?? "", "/");
+  const port = options.port ?? 4173;
+  const config = await resolveConfig(options.root, "serve", "production");
+  const base = trimChar((options == null ? void 0 : options.base) ?? ((_a = config == null ? void 0 : config.site) == null ? void 0 : _a.base) ?? "", "/");
   const notAnAsset = (pathname) => !pathname.includes("/assets/");
-  const notFound = fs$a.readFileSync(path$q.resolve(site.outDir, "./404.html"));
+  const notFound = fs$a.readFileSync(path$q.resolve(config.outDir, "./404.html"));
   const onNoMatch = (req, res) => {
     res.statusCode = 404;
     if (notAnAsset(req.path))
@@ -63280,7 +63280,7 @@ async function serve(options = {}) {
     res.end();
   };
   const compress = compression$1();
-  const serve2 = sirv(site.outDir, {
+  const serve2 = sirv(config.outDir, {
     etag: true,
     maxAge: 31536e3,
     immutable: true,
@@ -63292,13 +63292,13 @@ async function serve(options = {}) {
   });
   if (base) {
     return polka({ onNoMatch }).use(base, compress, serve2).listen(port, () => {
-      site.logger.info(
+      config.logger.info(
         `Built site served at http://localhost:${port}/${base}/`
       );
     });
   } else {
     return polka({ onNoMatch }).use(compress, serve2).listen(port, () => {
-      site.logger.info(`Built site served at http://localhost:${port}/`);
+      config.logger.info(`Built site served at http://localhost:${port}/`);
     });
   }
 }

package/dist/node-cjs/cli.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var init = require('./serve-1a76c42b.cjs');
+var init = require('./serve-9a16cbd6.cjs');
 var vite = require('vite');
 require('url');
 require('path');
@@ -296,7 +296,7 @@ var minimist = function (args, opts) {
 
 var minimist$1 = /*@__PURE__*/init.getDefaultExportFromCjs(minimist);
 
-var version = "1.0.0-beta.2";
+var version = "1.0.0-beta.3";
 
 function bindShortcuts(server, createDevServer) {
   if (!server.httpServer || !process.stdin.isTTY || process.env.CI) {

package/dist/node-cjs/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var init = require('./serve-1a76c42b.cjs');
+var init = require('./serve-9a16cbd6.cjs');
 var path = require('path');
 var vite = require('vite');
 require('dns');

package/dist/node-cjs/{serve-1a76c42b.cjs → serve-9a16cbd6.cjs}

@@ -3731,8 +3731,8 @@ picocolors.exports.createColors = createColors;
 var picocolorsExports = picocolors.exports;
 var c$2 = /*@__PURE__*/getDefaultExportFromCjs(picocolorsExports);
 
-const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-1a76c42b.cjs', document.baseURI).href)));
-const PKG_ROOT = path$q.resolve(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-1a76c42b.cjs', document.baseURI).href))), "../..");
+const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-9a16cbd6.cjs', document.baseURI).href)));
+const PKG_ROOT = path$q.resolve(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-9a16cbd6.cjs', document.baseURI).href))), "../..");
 const DIST_CLIENT_PATH = path$q.resolve(PKG_ROOT, "client");
 const APP_PATH = path$q.join(DIST_CLIENT_PATH, "app");
 path$q.join(DIST_CLIENT_PATH, "shared");
@@ -10782,8 +10782,8 @@ function pathToRegexp(path, keys, options) {
 
 function resolveRewrites(pages, userRewrites) {
   const rewriteRules = Object.entries(userRewrites || {}).map(([from, to]) => ({
-    toPath: compile$1(to),
-    matchUrl: match$1(from)
+    toPath: compile$1(to, { validate: false }),
+    matchUrl: match$1(from.startsWith("^") ? new RegExp(from) : from)
   }));
   const pageToRewrite = {};
   const rewriteToPage = {};
@@ -48132,7 +48132,7 @@ const okMark = "\x1B[32m\u2713\x1B[0m";
 const failMark = "\x1B[31m\u2716\x1B[0m";
 const lazyDefaultThemeComponentsRE = /VP(HomeSponsors|DocAsideSponsors|TeamPage|TeamMembers|LocalSearchBox|AlgoliaSearchBox|CarbonAds|DocAsideCarbonAds)/;
 const clientDir = vite.normalizePath(
-  path$q.resolve(path$q.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-1a76c42b.cjs', document.baseURI).href)))), "../client")
+  path$q.resolve(path$q.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-9a16cbd6.cjs', document.baseURI).href)))), "../client")
 );
 async function bundle(config, options) {
   const pageToHashMap = /* @__PURE__ */ Object.create(null);
@@ -48651,7 +48651,7 @@ function linkVue() {
   if (root) {
     const dest = path$q.resolve(root, "node_modules/vue");
     if (!fs$a.existsSync(dest)) {
-      const src = path$q.dirname(module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-1a76c42b.cjs', document.baseURI).href))).resolve("vue"));
+      const src = path$q.dirname(module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-9a16cbd6.cjs', document.baseURI).href))).resolve("vue"));
       fs$a.ensureSymlinkSync(src, dest, "junction");
       return () => {
         fs$a.unlinkSync(dest);
@@ -63289,11 +63289,11 @@ function trimChar(str, char) {
 }
 async function serve(options = {}) {
   var _a;
-  const port = options.port !== void 0 ? options.port : 4173;
-  const site = await resolveConfig(options.root, "serve", "production");
-  const base = trimChar((options == null ? void 0 : options.base) ?? ((_a = site == null ? void 0 : site.site) == null ? void 0 : _a.base) ?? "", "/");
+  const port = options.port ?? 4173;
+  const config = await resolveConfig(options.root, "serve", "production");
+  const base = trimChar((options == null ? void 0 : options.base) ?? ((_a = config == null ? void 0 : config.site) == null ? void 0 : _a.base) ?? "", "/");
   const notAnAsset = (pathname) => !pathname.includes("/assets/");
-  const notFound = fs$a.readFileSync(path$q.resolve(site.outDir, "./404.html"));
+  const notFound = fs$a.readFileSync(path$q.resolve(config.outDir, "./404.html"));
   const onNoMatch = (req, res) => {
     res.statusCode = 404;
     if (notAnAsset(req.path))
@@ -63301,7 +63301,7 @@ async function serve(options = {}) {
     res.end();
   };
   const compress = compression$1();
-  const serve2 = sirv(site.outDir, {
+  const serve2 = sirv(config.outDir, {
     etag: true,
     maxAge: 31536e3,
     immutable: true,
@@ -63313,13 +63313,13 @@ async function serve(options = {}) {
   });
   if (base) {
     return polka({ onNoMatch }).use(base, compress, serve2).listen(port, () => {
-      site.logger.info(
+      config.logger.info(
         `Built site served at http://localhost:${port}/${base}/`
       );
     });
   } else {
     return polka({ onNoMatch }).use(compress, serve2).listen(port, () => {
-      site.logger.info(`Built site served at http://localhost:${port}/`);
+      config.logger.info(`Built site served at http://localhost:${port}/`);
     });
   }
 }
@@ -65558,7 +65558,7 @@ function scaffold({
   var _a, _b;
   const resolvedRoot = path$q.resolve(root);
   const templateDir = path$q.resolve(
-    path$q.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-1a76c42b.cjs', document.baseURI).href)))),
+    path$q.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('serve-9a16cbd6.cjs', document.baseURI).href)))),
     "../../template"
   );
   const data = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Vite & Vue powered static site generator",
   "type": "module",
   "packageManager": "pnpm@8.6.1",

package/template/.vitepress/theme/index.js

@@ -13,7 +13,7 @@ import Theme from 'vitepress/theme'
 import './style.css'
 
 export default {
-  ...Theme,
+  extends: Theme,
   Layout: () => {
     return h(Theme.Layout, null, {
       // https://vitepress.dev/guide/extending-default-theme#layout-slots