@vuepress/core 2.0.0-rc.14 → 2.0.0-rc.16

package/README.md

@@ -5,7 +5,7 @@
 
 ## Documentation
 
-https://v2.vuepress.vuejs.org
+https://vuepress.vuejs.org
 
 ## License
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { MarkdownLink, MarkdownSfcBlocks, MarkdownOptions, Markdown, MarkdownHeader } from '@vuepress/markdown';
+import { MarkdownLink, MarkdownSfcBlocks, MarkdownOptions, Markdown } from '@vuepress/markdown';
 import { PageBase, PageData, PageFrontmatter, SiteData } from '@vuepress/shared';
 export { HeadAttrsConfig, HeadConfig, HeadTag, HeadTagEmpty, HeadTagNonEmpty, LocaleConfig, LocaleData, PageData, PageFrontmatter, PageHeader, SiteData, SiteLocaleConfig } from '@vuepress/shared';
 import { TemplateRenderer } from '@vuepress/utils';
@@ -11,15 +11,25 @@ import { TemplateRenderer } from '@vuepress/utils';
  * - build: bundle assets for deployment
  */
 interface Bundler {
+    /**
+     * Name of the bundler
+     */
     name: string;
+    /**
+     * Method to run vuepress app in dev mode, starting dev server
+     */
     dev: (app: App) => Promise<() => Promise<void>>;
+    /**
+     * Method to run vuepress app in build mode, generating static pages and assets
+     */
     build: (app: App) => Promise<void>;
 }
+type BundlerOptions = Record<string, unknown>;
 
 /**
  * Vuepress Page
  */
-type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPageFrontmatter extends Record<any, any> = Record<string, unknown>, ExtraPageFields extends Record<any, any> = Record<never, never>> = PageBase<ExtraPageFrontmatter> & ExtraPageFields & {
+type Page<ExtraPageData extends Record<string, unknown> = Record<string, unknown>, ExtraPageFrontmatter extends Record<string, unknown> = Record<string, unknown>, ExtraPageFields extends Record<string, unknown> = Record<string, unknown>> = ExtraPageFields & PageBase<ExtraPageFrontmatter> & {
     /**
      * Data of the page, which will be available in client code
      */
@@ -132,11 +142,10 @@ type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPa
  */
 interface PageOptions {
     /**
-     * If `filePath` is not set, this option will be used as the raw
-     * markdown content of the page.
+     * The raw markdown content of the page.
      *
-     * If `filePath` is set, this option will be ignored, while the
-     * content of the file will be used.
+     * If `content` is not provided, the file content of the `filePath`
+     * will be used.
      */
     content?: string;
     /**
@@ -159,7 +168,7 @@ type PromiseOrNot<T> = Promise<T> | T;
 interface Closable {
     close(): void;
 }
-interface Hook<Exposed, Normalized = Exposed, Result = Normalized extends (...args: any) => infer U ? U extends Promise<infer V> ? V : U : void> {
+interface Hook<Exposed, Normalized = Exposed, Result = Normalized extends (...args: any) => infer U ? U extends Promise<infer V> ? V : U : never> {
     exposed: Exposed;
     normalized: Normalized;
     result: Result;
@@ -167,7 +176,7 @@ interface Hook<Exposed, Normalized = Exposed, Result = Normalized extends (...ar
 type LifeCycleHook<T extends unknown[] = []> = Hook<(app: App, ...args: T) => PromiseOrNot<void>>;
 type ExtendsHook<T> = Hook<(extendable: T, app: App) => PromiseOrNot<void>>;
 type ClientConfigFileHook = Hook<string | ((app: App) => PromiseOrNot<string>), (app: App) => Promise<string>>;
-type AliasDefineHook = Hook<Record<string, any> | ((app: App, isServer: boolean) => PromiseOrNot<Record<string, any>>), (app: App, isServer: boolean) => Promise<Record<string, any>>>;
+type AliasDefineHook = Hook<Record<string, unknown> | ((app: App, isServer: boolean) => PromiseOrNot<Record<string, unknown>>), (app: App, isServer: boolean) => Promise<Record<string, unknown>>>;
 /**
  * List of hooks
  */
@@ -180,7 +189,7 @@ interface Hooks {
     extendsMarkdown: ExtendsHook<Markdown>;
     extendsPageOptions: ExtendsHook<PageOptions>;
     extendsPage: ExtendsHook<Page>;
-    extendsBundlerOptions: ExtendsHook<any>;
+    extendsBundlerOptions: ExtendsHook<BundlerOptions>;
     clientConfigFile: ClientConfigFileHook;
     alias: AliasDefineHook;
     define: AliasDefineHook;
@@ -255,7 +264,7 @@ interface PluginApi {
  *
  * A plugin package should have a `Plugin` as the default export
  */
-type Plugin<T extends PluginObject = PluginObject> = T | PluginFunction<T>;
+type Plugin<T extends PluginObject = PluginObject> = PluginFunction<T> | T;
 /**
  * Vuepress plugin function
  *
@@ -266,7 +275,13 @@ type PluginFunction<T extends PluginObject = PluginObject> = (app: App) => T;
  * Vuepress plugin object
  */
 interface PluginObject extends Partial<HooksExposed> {
+    /**
+     * Name of the plugin
+     */
     name: string;
+    /**
+     * Allow the plugin to be used multiple times or not
+     */
     multiple?: boolean;
 }
 /**
@@ -339,17 +354,87 @@ interface ThemeInfo {
  * Vuepress app common config that shared between dev and build
  */
 interface AppConfigCommon extends Partial<SiteData> {
+    /**
+     * Source directory of the markdown files.
+     *
+     * Vuepress will load markdown files from this directory.
+     *
+     * @required
+     */
     source: string;
+    /**
+     * Destination directory of the output files.
+     *
+     * Vuepress will output the static site files to this directory.
+     *
+     * @default `${source}/.vuepress/dist`
+     */
     dest?: string;
+    /**
+     * Temp files directory.
+     *
+     * Vuepress will write temp files to this directory.
+     *
+     * @default `${source}/.vuepress/.temp`
+     */
     temp?: string;
+    /**
+     * Cache files directory.
+     *
+     * Vuepress will write cache files to this directory.
+     *
+     * @default `${source}/.vuepress/.cache`
+     */
     cache?: string;
+    /**
+     * Public files directory.
+     *
+     * Vuepress will copy the files from public directory to the output directory.
+     *
+     * @default `${source}/.vuepress/public`
+     */
     public?: string;
+    /**
+     * Whether to enable debug mode
+     *
+     * @default false
+     */
     debug?: boolean;
+    /**
+     * Markdown options
+     *
+     * @default {}
+     */
     markdown?: MarkdownOptions;
+    /**
+     * Patterns to match the markdown files as pages
+     *
+     * @default ['**\/*.md', '!.vuepress', '!node_modules']
+     */
     pagePatterns?: string[];
+    /**
+     * Pattern to generate permalink for pages
+     *
+     * @default null
+     */
     permalinkPattern?: string | null;
+    /**
+     * Vuepress bundler
+     *
+     * @required
+     */
     bundler: Bundler;
+    /**
+     * Vuepress theme
+     *
+     * @required
+     */
     theme: Theme;
+    /**
+     * Vuepress plugins
+     *
+     * @default []
+     */
     plugins?: PluginConfig;
 }
 /**
@@ -391,14 +476,14 @@ interface AppConfigBuild {
      *
      * @default true
      */
-    shouldPreload?: ((file: string, type: string) => boolean) | boolean;
+    shouldPreload?: boolean | ((file: string, type: string) => boolean);
     /**
      * Determine what resource files should be prefetched. Use boolean value to
      * totally enable / disable.
      *
      * @default true
      */
-    shouldPrefetch?: ((file: string, type: string) => boolean) | boolean;
+    shouldPrefetch?: boolean | ((file: string, type: string) => boolean);
     /**
      * Specify the path of the HTML template to be used for build
      *
@@ -408,16 +493,20 @@ interface AppConfigBuild {
     /**
      * Specify the HTML template renderer to be used for build
      *
-     * @default templateRenderer from '@vuepress/utils'
+     * @default `import { templateRenderer } from '@vuepress/utils'`
      */
     templateBuildRenderer?: TemplateRenderer;
 }
 /**
- * Vuepress app config
+ * Vuepress app user config.
+ *
+ * It would be provided by user, typically via a config file.
  */
-type AppConfig = AppConfigCommon & AppConfigDev & AppConfigBuild;
+type AppConfig = AppConfigBuild & AppConfigCommon & AppConfigDev;
 /**
- * Vuepress app options
+ * Vuepress app options that resolved from user config.
+ *
+ * It fills all optional fields with a default value.
  */
 type AppOptions = Required<AppConfig>;
 
@@ -429,11 +518,29 @@ type AppDirFunction = (...args: string[]) => string;
  * Directory utils
  */
 interface AppDir {
+    /**
+     * Resolve file path in cache directory
+     */
     cache: AppDirFunction;
+    /**
+     * Resolve file path in temp directory
+     */
     temp: AppDirFunction;
+    /**
+     * Resolve file path in source directory
+     */
     source: AppDirFunction;
+    /**
+     * Resolve file path in dest directory
+     */
     dest: AppDirFunction;
+    /**
+     * Resolve file path in public directory
+     */
     public: AppDirFunction;
+    /**
+     * Resolve file path in client directory
+     */
     client: AppDirFunction;
 }
 /**
@@ -459,41 +566,33 @@ interface AppEnv {
 type AppWriteTemp = (file: string, content: string) => Promise<string>;
 
 /**
- * Vuepress app
+ * App base properties, will be available after creation, even before initialization
  */
-interface App {
+interface AppPropertiesBase {
     /**
-     * Directory utils
+     * Directory utils.
      */
     dir: AppDir;
     /**
-     * Environment flags
+     * Environment flags.
      */
     env: AppEnv;
     /**
-     * Options that filled all optional fields with a default value
+     * Options that filled all optional fields with a default value.
      */
     options: AppOptions;
     /**
-     * Plugin system
+     * Plugin system.
      */
     pluginApi: PluginApi;
     /**
-     * Site data, which will be used in client side
+     * Site data, which will be used in client side.
      */
     siteData: SiteData;
     /**
-     * Version of vuepress core
+     * Version of vuepress core.
      */
     version: string;
-    /**
-     * Write temp file
-     */
-    writeTemp: AppWriteTemp;
-    /**
-     * Use a plugin
-     */
-    use: (plugin: Plugin) => this;
     /**
      * Initialize app.
      *
@@ -507,6 +606,21 @@ interface App {
      * Should be called after `app.init()`.
      */
     prepare: () => Promise<void>;
+    /**
+     * Use a plugin.
+     *
+     * Should be called before `app.init()`.
+     */
+    use: (plugin: Plugin) => this;
+    /**
+     * Util to write temp file
+     */
+    writeTemp: AppWriteTemp;
+}
+/**
+ * App initialized properties, will only be available after initialization
+ */
+interface AppPropertiesInitialized {
     /**
      * Markdown-it instance.
      *
@@ -520,6 +634,10 @@ interface App {
      */
     pages: Page[];
 }
+/**
+ * Vuepress app instance
+ */
+type App = AppPropertiesBase & AppPropertiesInitialized;
 /**
  * Vuepress dev app
  */
@@ -543,11 +661,6 @@ interface BuildApp extends App {
     build: () => ReturnType<Bundler['build']>;
 }
 
-/**
- * Generate client configs temp file
- */
-declare const prepareClientConfigs: (app: App) => Promise<void>;
-
 /**
  * Generate page chunk temp file of a single page
  */
@@ -564,255 +677,32 @@ declare const preparePageComponent: (app: App, page: Page) => Promise<void>;
 declare const prepareRoutes: (app: App) => Promise<void>;
 
 /**
- * Generate site data temp file
- */
-declare const prepareSiteData: (app: App) => Promise<void>;
-
-/**
- * Initialize a vuepress app
+ * Create base vuepress app.
  *
- * Plugins should be used before initialization.
- */
-declare const appInit: (app: App) => Promise<void>;
-
-/**
- * Prepare files for development or build
+ * Notice that the base app could not be used for dev nor build.
  *
- * - page components
- * - page chunks
- * - routes
- * - site data
- * - other files that generated by plugins
+ * It would be used for creating dev app or build app, or for testing.
  */
-declare const appPrepare: (app: App) => Promise<void>;
-
-declare const appUse: (app: App, rawPlugin: Plugin) => App;
-
-/**
- * Create vuepress app
- */
-declare const createBaseApp: (config: AppConfig, isBuild?: boolean) => App;
+declare const createBaseApp: (config: AppConfig) => App;
 
 /**
- * Create vuepress build app
+ * Create vuepress build app.
  */
 declare const createBuildApp: (config: AppConfig) => BuildApp;
 
 /**
- * Create vuepress dev app
+ * Create vuepress dev app.
  */
 declare const createDevApp: (config: AppConfig) => DevApp;
 
-/**
- * Create directory util function
- */
-declare const createAppDirFunction: (baseDir: string) => AppDirFunction;
 /**
  * Resolve directory utils for vuepress app
  */
 declare const resolveAppDir: (options: AppOptions) => AppDir;
 
 /**
- * Resolve environment flags for vuepress app
+ * Create vuepress page object
  */
-declare const resolveAppEnv: (options: AppOptions, isBuild: boolean) => AppEnv;
-
-/**
- * Create app options with default values
- */
-declare const resolveAppOptions: ({ base, lang, title, description, head, locales, source, dest, temp, cache, public: publicDir, host, port, open, templateDev, shouldPreload, shouldPrefetch, templateBuild, bundler, debug, markdown, pagePatterns, permalinkPattern, plugins, theme, }: AppConfig) => AppOptions;
-
-/**
- * Resolve pages for vuepress app
- */
-declare const resolveAppPages: (app: App) => Promise<Page[]>;
-
-/**
- * Resolve site data for vuepress app
- *
- * Site data will also be used in client
- */
-declare const resolveAppSiteData: (options: AppOptions) => SiteData;
-
-/**
- * Resolve version of vuepress app
- */
-declare const resolveAppVersion: () => string;
-
-/**
- * Resolve write temp file util for vuepress app
- */
-declare const resolveAppWriteTemp: (dir: AppDir) => AppWriteTemp;
-
-/**
- * Resolve a plugin object according to name / path / module and config
- */
-declare const resolvePluginObject: <T extends PluginObject = PluginObject>(app: App, plugin: Plugin<T>) => T;
-
-/**
- * Resolve theme info and its parent theme info
- */
-declare const resolveThemeInfo: (app: App, theme: Theme) => ThemeInfo;
-
 declare const createPage: (app: App, options: PageOptions) => Promise<Page>;
 
-/**
- * Infer page path according to file path
- */
-declare const inferPagePath: ({ app, filePathRelative, }: {
-    app: App;
-    filePathRelative: string | null;
-}) => {
-    pathInferred: string | null;
-    pathLocale: string;
-};
-
-/**
- * Render page content and extract related info
- */
-declare const renderPageContent: ({ app, content, filePath, filePathRelative, options, }: {
-    app: App;
-    content: string;
-    filePath: string | null;
-    filePathRelative: string | null;
-    options: PageOptions;
-}) => {
-    contentRendered: string;
-    deps: string[];
-    markdownEnv: Record<string, unknown>;
-    frontmatter: PageFrontmatter;
-    headers: MarkdownHeader[];
-    links: MarkdownLink[];
-    sfcBlocks: MarkdownSfcBlocks;
-    title: string;
-};
-
-/**
- * Resolve page data file path
- */
-declare const resolvePageChunkInfo: ({ app, htmlFilePathRelative, }: {
-    app: App;
-    htmlFilePathRelative: string;
-}) => {
-    chunkFilePath: string;
-    chunkFilePathRelative: string;
-    chunkName: string;
-};
-
-/**
- * Resolve page component and related info
- */
-declare const resolvePageComponentInfo: ({ app, htmlFilePathRelative, }: {
-    app: App;
-    htmlFilePathRelative: string;
-}) => Promise<{
-    componentFilePath: string;
-    componentFilePathRelative: string;
-}>;
-
-/**
- * Resolve page date according to frontmatter or file path
- *
- * It will be resolved as 'yyyy-MM-dd' format
- */
-declare const resolvePageDate: ({ frontmatter, filePathRelative, }: {
-    frontmatter: PageFrontmatter;
-    filePathRelative: string | null;
-}) => string;
-
-/**
- * Resolve page file content according to filePath or options content
- */
-declare const resolvePageFileContent: ({ filePath, options, }: {
-    filePath: string | null;
-    options: PageOptions;
-}) => Promise<string>;
-
-/**
- * Resolve absolute and relative path of page file
- */
-declare const resolvePageFilePath: ({ app, options, }: {
-    app: App;
-    options: PageOptions;
-}) => {
-    filePath: string | null;
-    filePathRelative: string | null;
-};
-
-/**
- * Resolve page rendered html file path
- */
-declare const resolvePageHtmlInfo: ({ app, path: pagePath, }: {
-    app: App;
-    path: string;
-}) => {
-    htmlFilePath: string;
-    htmlFilePathRelative: string;
-};
-
-/**
- * Resolve language of page
- */
-declare const resolvePageLang: ({ app, frontmatter, pathLocale, }: {
-    app: App;
-    frontmatter: PageFrontmatter;
-    pathLocale: string;
-}) => string;
-
-/**
- * Resolve the final route path of a page
- */
-declare const resolvePagePath: ({ permalink, pathInferred, options, }: {
-    permalink: string | null;
-    pathInferred: string | null;
-    options: PageOptions;
-}) => string;
-
-/**
- * Resolve page permalink from frontmatter / options / pattern
- */
-declare const resolvePagePermalink: ({ app, frontmatter, slug, date, pathInferred, pathLocale, }: {
-    app: App;
-    frontmatter: PageFrontmatter;
-    slug: string;
-    date: string;
-    pathInferred: string | null;
-    pathLocale: string;
-}) => string | null;
-
-/**
- * Resolve page route meta
- */
-declare const resolvePageRouteMeta: ({ frontmatter, }: {
-    frontmatter: PageFrontmatter;
-}) => Record<string, unknown>;
-
-/**
- * Resolve page slug from filename
- */
-declare const resolvePageSlug: ({ filePathRelative, }: {
-    filePathRelative: string | null;
-}) => string;
-
-/**
- * Create hook queue for plugin system
- */
-declare const createHookQueue: <T extends keyof Hooks>(name: T) => HookQueue<T>;
-
-declare const createPluginApi: () => PluginApi;
-
-declare const createPluginApiHooks: () => PluginApi['hooks'];
-
-declare const createPluginApiRegisterHooks: (plugins: PluginApi['plugins'], hooks: PluginApi['hooks']) => PluginApi['registerHooks'];
-
-/**
- * Normalize alias and define hook
- */
-declare const normalizeAliasDefineHook: (hook: AliasDefineHook['exposed']) => AliasDefineHook['normalized'];
-
-/**
- * Normalize hook for client config file
- */
-declare const normalizeClientConfigFileHook: (hook: ClientConfigFileHook['exposed']) => ClientConfigFileHook['normalized'];
-
-export { type AliasDefineHook, type App, type AppConfig, type AppConfigBuild, type AppConfigCommon, type AppConfigDev, type AppDir, type AppDirFunction, type AppEnv, type AppOptions, type AppWriteTemp, type BuildApp, type Bundler, type ClientConfigFileHook, type DevApp, type ExtendsHook, type Hook, type HookItem, type HookQueue, type Hooks, type HooksExposed, type HooksName, type HooksNormalized, type HooksResult, type LifeCycleHook, type Page, type PageOptions, type Plugin, type PluginApi, type PluginConfig, type PluginFunction, type PluginObject, type Theme, type ThemeFunction, type ThemeInfo, type ThemeObject, appInit, appPrepare, appUse, createAppDirFunction, createBaseApp, createBuildApp, createDevApp, createHookQueue, createPage, createPluginApi, createPluginApiHooks, createPluginApiRegisterHooks, inferPagePath, normalizeAliasDefineHook, normalizeClientConfigFileHook, prepareClientConfigs, preparePageChunk, preparePageComponent, prepareRoutes, prepareSiteData, renderPageContent, resolveAppDir, resolveAppEnv, resolveAppOptions, resolveAppPages, resolveAppSiteData, resolveAppVersion, resolveAppWriteTemp, resolvePageChunkInfo, resolvePageComponentInfo, resolvePageDate, resolvePageFileContent, resolvePageFilePath, resolvePageHtmlInfo, resolvePageLang, resolvePagePath, resolvePagePermalink, resolvePageRouteMeta, resolvePageSlug, resolvePluginObject, resolveThemeInfo };
+export { type AliasDefineHook, type App, type AppConfig, type AppConfigBuild, type AppConfigCommon, type AppConfigDev, type AppDir, type AppDirFunction, type AppEnv, type AppOptions, type AppPropertiesBase, type AppPropertiesInitialized, type AppWriteTemp, type BuildApp, type Bundler, type BundlerOptions, type ClientConfigFileHook, type DevApp, type ExtendsHook, type Hook, type HookItem, type HookQueue, type Hooks, type HooksExposed, type HooksName, type HooksNormalized, type HooksResult, type LifeCycleHook, type Page, type PageOptions, type Plugin, type PluginApi, type PluginConfig, type PluginFunction, type PluginObject, type Theme, type ThemeFunction, type ThemeInfo, type ThemeObject, createBaseApp, createBuildApp, createDevApp, createPage, preparePageChunk, preparePageComponent, prepareRoutes, resolveAppDir };

package/dist/index.js

@@ -38,123 +38,12 @@ export { comp, data }
   await app.writeTemp(page.chunkFilePathRelative, content);
 };
 
-// src/app/prepare/preparePageComponent.ts
-var preparePageComponent = async (app, page) => {
-  await app.writeTemp(
-    page.componentFilePathRelative,
-    [
-      // #688: wrap the content of `<template>` with a `<div>` to avoid some potential issues of fragment component
-      `${page.sfcBlocks.template?.tagOpen}<div>${page.sfcBlocks.template?.contentStripped}</div>${page.sfcBlocks.template?.tagClose}
-`,
-      // hoist `<script>`, `<style>` and other custom blocks
-      page.sfcBlocks.script?.content,
-      page.sfcBlocks.scriptSetup?.content,
-      ...page.sfcBlocks.styles.map((item) => item.content),
-      ...page.sfcBlocks.customBlocks.map((item) => item.content)
-    ].join("\n")
-  );
-};
-
-// src/app/prepare/prepareRoutes.ts
-import { normalizeRoutePath } from "@vuepress/shared";
-var HMR_CODE2 = `
-if (import.meta.webpackHot) {
-  import.meta.webpackHot.accept()
-  if (__VUE_HMR_RUNTIME__.updateRoutes) {
-    __VUE_HMR_RUNTIME__.updateRoutes(routes)
-  }
-  if (__VUE_HMR_RUNTIME__.updateRedirects) {
-    __VUE_HMR_RUNTIME__.updateRedirects(redirects)
-  }
-}
-
-if (import.meta.hot) {
-  import.meta.hot.accept(({ routes, redirects }) => {
-    __VUE_HMR_RUNTIME__.updateRoutes(routes)
-    __VUE_HMR_RUNTIME__.updateRedirects(redirects)
-  })
-}
-`;
-var resolvePageRedirects = ({ path: path9, pathInferred }) => {
-  const redirectsSet = /* @__PURE__ */ new Set();
-  if (pathInferred !== null) {
-    const normalizedPathInferred = normalizeRoutePath(pathInferred);
-    const encodedPathInferred = encodeURI(normalizedPathInferred);
-    if (normalizedPathInferred !== path9 && encodedPathInferred !== path9) {
-      redirectsSet.add(encodedPathInferred);
-    }
-  }
-  return Array.from(redirectsSet);
-};
-var prepareRoutes = async (app) => {
-  let content = `export const redirects = JSON.parse(${JSON.stringify(
-    JSON.stringify(
-      Object.fromEntries(
-        app.pages.flatMap(
-          (page) => resolvePageRedirects(page).map((redirect) => [redirect, page.path])
-        )
-      )
-    )
-  )})
-
-export const routes = Object.fromEntries([
-${app.pages.map(
-    ({ chunkFilePath, chunkName, path: path9, routeMeta }) => `  [${JSON.stringify(path9)}, { loader: () => import(${chunkName ? `/* webpackChunkName: "${chunkName}" */` : ""}${JSON.stringify(chunkFilePath)}), meta: ${JSON.stringify(routeMeta)} }],`
-  ).join("\n")}
-]);
-`;
-  if (app.env.isDev) {
-    content += HMR_CODE2;
-  }
-  await app.writeTemp("internal/routes.js", content);
-};
-
-// src/app/prepare/prepareSiteData.ts
-var HMR_CODE3 = `
-if (import.meta.webpackHot) {
-  import.meta.webpackHot.accept()
-  if (__VUE_HMR_RUNTIME__.updateSiteData) {
-    __VUE_HMR_RUNTIME__.updateSiteData(siteData)
-  }
-}
-
-if (import.meta.hot) {
-  import.meta.hot.accept(({ siteData }) => {
-    __VUE_HMR_RUNTIME__.updateSiteData(siteData)
-  })
-}
-`;
-var prepareSiteData = async (app) => {
-  let content = `export const siteData = JSON.parse(${JSON.stringify(
-    JSON.stringify(app.siteData)
-  )})
-`;
-  if (app.env.isDev) {
-    content += HMR_CODE3;
-  }
-  await app.writeTemp("internal/siteData.js", content);
-};
-
-// src/app/appInit.ts
-import { debug as debug3 } from "@vuepress/utils";
-
-// src/app/resolveAppMarkdown.ts
-import { createMarkdown } from "@vuepress/markdown";
-var resolveAppMarkdown = async (app) => {
-  await app.pluginApi.hooks.extendsMarkdownOptions.process(
-    app.options.markdown,
-    app
-  );
-  const markdown = createMarkdown(app.options.markdown);
-  await app.pluginApi.hooks.extendsMarkdown.process(markdown, app);
-  return markdown;
-};
-
-// src/app/resolveAppPages.ts
-import { debug as debug2, globby } from "@vuepress/utils";
-
 // src/page/inferPagePath.ts
-import { ensureLeadingSlash, resolveLocalePath } from "@vuepress/shared";
+import {
+  ensureLeadingSlash,
+  inferRoutePath,
+  resolveLocalePath
+} from "@vuepress/shared";
 var inferPagePath = ({
   app,
   filePathRelative
@@ -165,7 +54,7 @@ var inferPagePath = ({
       pathLocale: "/"
     };
   }
-  const pathInferred = ensureLeadingSlash(filePathRelative).replace(/\.md$/, ".html").replace(/\/(README|index).html$/i, "/");
+  const pathInferred = inferRoutePath(ensureLeadingSlash(filePathRelative));
   const pathLocale = resolveLocalePath(app.siteData.locales, pathInferred);
   return {
     pathInferred,
@@ -173,9 +62,9 @@ var inferPagePath = ({
   };
 };
 
-// src/page/renderPageContent.ts
+// src/page/parsePageContent.ts
 import { omit } from "@vuepress/shared";
-var renderPageContent = ({
+var parsePageContent = ({
   app,
   content,
   filePath,
@@ -220,6 +109,7 @@ var renderPageContent = ({
       "frontmatter"
     ),
     sfcBlocks,
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-template-expression -- the title from frontmatter is not guaranteed to be a string
     title: frontmatter.title ? `${frontmatter.title}` : title
   };
 };
@@ -242,7 +132,7 @@ var resolvePageChunkInfo = ({
 
 // src/page/resolvePageComponentInfo.ts
 import { path as path2 } from "@vuepress/utils";
-var resolvePageComponentInfo = async ({
+var resolvePageComponentInfo = ({
   app,
   htmlFilePathRelative
 }) => {
@@ -257,8 +147,31 @@ var resolvePageComponentInfo = async ({
   };
 };
 
+// src/page/resolvePageContent.ts
+import { isString } from "@vuepress/shared";
+import { debug, fs } from "@vuepress/utils";
+var log = debug("vuepress:core/page");
+var FALLBACK_CONTENT = "";
+var resolvePageContent = async ({
+  filePath,
+  options
+}) => {
+  if (isString(options.content)) {
+    return options.content;
+  }
+  if (filePath) {
+    try {
+      const content = await fs.readFile(filePath, "utf-8");
+      return content;
+    } catch (e) {
+      log(e instanceof Error ? e.message : e);
+    }
+  }
+  return FALLBACK_CONTENT;
+};
+
 // src/page/resolvePageDate.ts
-import { formatDateString, isString } from "@vuepress/shared";
+import { formatDateString, isString as isString2 } from "@vuepress/shared";
 import { path as path3 } from "@vuepress/utils";
 var FILENAME_DATE_RE = /^(\d{4})-(\d{1,2})(?:-(\d{1,2}))?-(.*)$/;
 var DIRNAME_DATE_RE = /(\d{4})\/(\d{1,2})(?:\/(\d{1,2}))?(\/|$)/;
@@ -277,7 +190,7 @@ var resolvePageDate = ({
       DEFAULT_DATE
     );
   }
-  if (isString(frontmatter.date)) {
+  if (isString2(frontmatter.date)) {
     return formatDateString(frontmatter.date, DEFAULT_DATE);
   }
   if (filePathRelative === null) {
@@ -288,6 +201,7 @@ var resolvePageDate = ({
     const matches = filename.match(FILENAME_DATE_RE);
     if (matches) {
       return formatDateString(
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- unsafe indexed access
         `${matches[1]}-${matches[2]}-${matches[3] ?? "01"}`,
         DEFAULT_DATE
       );
@@ -298,6 +212,7 @@ var resolvePageDate = ({
     const matches = dirname.match(DIRNAME_DATE_RE);
     if (matches) {
       return formatDateString(
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- unsafe indexed access
         `${matches[1]}-${matches[2]}-${matches[3] ?? "01"}`,
         DEFAULT_DATE
       );
@@ -306,24 +221,6 @@ var resolvePageDate = ({
   return DEFAULT_DATE;
 };
 
-// src/page/resolvePageFileContent.ts
-import { debug, fs } from "@vuepress/utils";
-var log = debug("vuepress:core/page");
-var resolvePageFileContent = async ({
-  filePath,
-  options
-}) => {
-  if (filePath) {
-    try {
-      const content = await fs.readFile(filePath, "utf-8");
-      return content;
-    } catch (e) {
-      log(e instanceof Error ? e.message : e);
-    }
-  }
-  return options.content ?? "";
-};
-
 // src/page/resolvePageFilePath.ts
 import { logger, path as path4 } from "@vuepress/utils";
 var resolvePageFilePath = ({
@@ -355,7 +252,7 @@ var resolvePageHtmlInfo = ({
 }) => {
   const path9 = decodeURI(pagePath);
   const htmlFilePathRelative = removeLeadingSlash(
-    path9.endsWith("/") ? path9 + "index.html" : path9.endsWith(".html") ? path9 : path9 + ".html"
+    path9.endsWith("/") ? `${path9}index.html` : path9.endsWith(".html") ? path9 : `${path9}.html`
   );
   const htmlFilePath = app.dir.dest(htmlFilePathRelative);
   return {
@@ -365,13 +262,13 @@ var resolvePageHtmlInfo = ({
 };
 
 // src/page/resolvePageLang.ts
-import { isString as isString2 } from "@vuepress/shared";
+import { isString as isString3 } from "@vuepress/shared";
 var resolvePageLang = ({
   app,
   frontmatter,
   pathLocale
 }) => {
-  if (isString2(frontmatter.lang) && frontmatter.lang) {
+  if (isString3(frontmatter.lang) && frontmatter.lang) {
     return frontmatter.lang;
   }
   return app.siteData.locales[pathLocale]?.lang ?? app.siteData.lang;
@@ -394,7 +291,7 @@ var resolvePagePath = ({
 };
 
 // src/page/resolvePagePermalink.ts
-import { ensureLeadingSlash as ensureLeadingSlash2, isString as isString3 } from "@vuepress/shared";
+import { ensureLeadingSlash as ensureLeadingSlash2, isString as isString4 } from "@vuepress/shared";
 import { path as path5 } from "@vuepress/utils";
 var resolvePagePermalink = ({
   app,
@@ -407,14 +304,14 @@ var resolvePagePermalink = ({
   if (frontmatter.permalink === null) {
     return null;
   }
-  if (isString3(frontmatter.permalink)) {
+  if (isString4(frontmatter.permalink)) {
     return frontmatter.permalink;
   }
   if (frontmatter.permalinkPattern === null) {
     return null;
   }
   const permalinkPattern = frontmatter.permalinkPattern || app.options.permalinkPattern;
-  if (!isString3(permalinkPattern)) {
+  if (!isString4(permalinkPattern)) {
     return null;
   }
   const [year, month, day] = date.split("-");
@@ -451,7 +348,7 @@ var createPage = async (app, options) => {
     app,
     options
   });
-  const content = await resolvePageFileContent({ filePath, options });
+  const content = await resolvePageContent({ filePath, options });
   const {
     contentRendered,
     deps,
@@ -461,7 +358,7 @@ var createPage = async (app, options) => {
     markdownEnv,
     sfcBlocks,
     title
-  } = renderPageContent({
+  } = parsePageContent({
     app,
     content,
     filePath,
@@ -486,7 +383,7 @@ var createPage = async (app, options) => {
     app,
     path: path9
   });
-  const { componentFilePath, componentFilePathRelative } = await resolvePageComponentInfo({
+  const { componentFilePath, componentFilePathRelative } = resolvePageComponentInfo({
     app,
     htmlFilePathRelative
   });
@@ -534,7 +431,123 @@ var createPage = async (app, options) => {
   return page;
 };
 
+// src/page/renderPageSfcBlocksToVue.ts
+var renderPageSfcBlocksToVue = (sfcBlocks) => [
+  // #688: wrap the content of `<template>` with a `<div>` to avoid some potential issues of fragment component
+  `${sfcBlocks.template?.tagOpen}<div>${sfcBlocks.template?.contentStripped}</div>${sfcBlocks.template?.tagClose}
+`,
+  // hoist `<script>`, `<style>` and other custom blocks
+  sfcBlocks.script?.content,
+  sfcBlocks.scriptSetup?.content,
+  ...sfcBlocks.styles.map((item) => item.content),
+  ...sfcBlocks.customBlocks.map((item) => item.content)
+].join("\n");
+
+// src/app/prepare/preparePageComponent.ts
+var preparePageComponent = async (app, page) => {
+  await app.writeTemp(
+    page.componentFilePathRelative,
+    renderPageSfcBlocksToVue(page.sfcBlocks)
+  );
+};
+
+// src/app/prepare/prepareRoutes.ts
+import { normalizeRoutePath } from "@vuepress/shared";
+var HMR_CODE2 = `
+if (import.meta.webpackHot) {
+  import.meta.webpackHot.accept()
+  if (__VUE_HMR_RUNTIME__.updateRoutes) {
+    __VUE_HMR_RUNTIME__.updateRoutes(routes)
+  }
+  if (__VUE_HMR_RUNTIME__.updateRedirects) {
+    __VUE_HMR_RUNTIME__.updateRedirects(redirects)
+  }
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept(({ routes, redirects }) => {
+    __VUE_HMR_RUNTIME__.updateRoutes(routes)
+    __VUE_HMR_RUNTIME__.updateRedirects(redirects)
+  })
+}
+`;
+var resolvePageRedirects = ({ path: path9, pathInferred }) => {
+  const redirectsSet = /* @__PURE__ */ new Set();
+  if (pathInferred !== null) {
+    const normalizedPathInferred = normalizeRoutePath(pathInferred);
+    const encodedPathInferred = encodeURI(normalizedPathInferred);
+    if (normalizedPathInferred !== path9 && encodedPathInferred !== path9) {
+      redirectsSet.add(encodedPathInferred);
+    }
+  }
+  return Array.from(redirectsSet);
+};
+var prepareRoutes = async (app) => {
+  let content = `export const redirects = JSON.parse(${JSON.stringify(
+    JSON.stringify(
+      Object.fromEntries(
+        app.pages.flatMap(
+          (page) => resolvePageRedirects(page).map((redirect) => [redirect, page.path])
+        )
+      )
+    )
+  )})
+
+export const routes = Object.fromEntries([
+${app.pages.map(
+    ({ chunkFilePath, chunkName, path: path9, routeMeta }) => `  [${JSON.stringify(path9)}, { loader: () => import(${chunkName ? `/* webpackChunkName: "${chunkName}" */` : ""}${JSON.stringify(chunkFilePath)}), meta: ${JSON.stringify(routeMeta)} }],`
+  ).join("\n")}
+]);
+`;
+  if (app.env.isDev) {
+    content += HMR_CODE2;
+  }
+  await app.writeTemp("internal/routes.js", content);
+};
+
+// src/app/prepare/prepareSiteData.ts
+var HMR_CODE3 = `
+if (import.meta.webpackHot) {
+  import.meta.webpackHot.accept()
+  if (__VUE_HMR_RUNTIME__.updateSiteData) {
+    __VUE_HMR_RUNTIME__.updateSiteData(siteData)
+  }
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept(({ siteData }) => {
+    __VUE_HMR_RUNTIME__.updateSiteData(siteData)
+  })
+}
+`;
+var prepareSiteData = async (app) => {
+  let content = `export const siteData = JSON.parse(${JSON.stringify(
+    JSON.stringify(app.siteData)
+  )})
+`;
+  if (app.env.isDev) {
+    content += HMR_CODE3;
+  }
+  await app.writeTemp("internal/siteData.js", content);
+};
+
+// src/app/appInit.ts
+import { debug as debug3 } from "@vuepress/utils";
+
+// src/app/resolveAppMarkdown.ts
+import { createMarkdown } from "@vuepress/markdown";
+var resolveAppMarkdown = async (app) => {
+  await app.pluginApi.hooks.extendsMarkdownOptions.process(
+    app.options.markdown,
+    app
+  );
+  const markdown = createMarkdown(app.options.markdown);
+  await app.pluginApi.hooks.extendsMarkdown.process(markdown, app);
+  return markdown;
+};
+
 // src/app/resolveAppPages.ts
+import { debug as debug2, globby } from "@vuepress/utils";
 var log2 = debug2("vuepress:core/app");
 var resolveAppPages = async (app) => {
   log2("resolveAppPages start");
@@ -542,13 +555,18 @@ var resolveAppPages = async (app) => {
     absolute: true,
     cwd: app.dir.source()
   });
+  let hasNotFoundPage = false;
   const pages = await Promise.all(
-    pageFilePaths.map((filePath) => createPage(app, { filePath }))
+    pageFilePaths.map(async (filePath) => {
+      const page = await createPage(app, { filePath });
+      if (page.path === "/404.html") {
+        page.frontmatter.layout ??= "NotFound";
+        hasNotFoundPage = true;
+      }
+      return page;
+    })
   );
-  const notFoundPage = pages.find((page) => page.path === "/404.html");
-  if (notFoundPage) {
-    notFoundPage.frontmatter.layout ??= "NotFound";
-  } else {
+  if (!hasNotFoundPage) {
     pages.push(
       await createPage(app, {
         path: "/404.html",
@@ -733,6 +751,7 @@ var createPluginApiRegisterHooks = (plugins, hooks) => () => {
         if (hooks[key] && commonHooks[key]) {
           hooks[key].add({
             pluginName,
+            // @ts-expect-error: the type could not be narrowed correctly
             hook: commonHooks[key]
           });
         }
@@ -754,12 +773,10 @@ var createPluginApi = () => {
 };
 
 // src/app/resolveAppDir.ts
-import { createRequire } from "module";
+import { createRequire } from "node:module";
 import { path as path7 } from "@vuepress/utils";
 var require2 = createRequire(import.meta.url);
-var createAppDirFunction = (baseDir) => {
-  return (...args) => path7.resolve(baseDir, ...args);
-};
+var createAppDirFunction = (baseDir) => (...args) => path7.resolve(baseDir, ...args);
 var resolveAppDir = (options) => {
   const cache = createAppDirFunction(options.cache);
   const temp = createAppDirFunction(options.temp);
@@ -780,14 +797,14 @@ var resolveAppDir = (options) => {
 };
 
 // src/app/resolveAppEnv.ts
-var resolveAppEnv = (options, isBuild) => ({
-  isBuild,
-  isDev: !isBuild,
+var resolveAppEnv = (options) => ({
+  isBuild: false,
+  isDev: false,
   isDebug: options.debug
 });
 
 // src/app/resolveAppOptions.ts
-import { createRequire as createRequire2 } from "module";
+import { createRequire as createRequire2 } from "node:module";
 import { path as path8, templateRenderer } from "@vuepress/utils";
 var require3 = createRequire2(import.meta.url);
 var resolveAppOptions = ({
@@ -817,6 +834,7 @@ var resolveAppOptions = ({
   templateBuild = path8.normalize(
     require3.resolve("@vuepress/client/templates/build.html")
   ),
+  templateBuildRenderer = templateRenderer,
   // common config
   bundler,
   debug: debug7 = false,
@@ -844,7 +862,7 @@ var resolveAppOptions = ({
   shouldPreload,
   shouldPrefetch,
   templateBuild,
-  templateBuildRenderer: templateRenderer,
+  templateBuildRenderer,
   bundler,
   debug: debug7,
   markdown,
@@ -865,7 +883,7 @@ var resolveAppSiteData = (options) => ({
 });
 
 // src/app/resolveAppVersion.ts
-import { createRequire as createRequire3 } from "module";
+import { createRequire as createRequire3 } from "node:module";
 import { fs as fs3 } from "@vuepress/utils";
 var require4 = createRequire3(import.meta.url);
 var resolveAppVersion = () => {
@@ -917,10 +935,10 @@ var setupAppThemeAndPlugins = (app, config) => {
 };
 
 // src/app/createBaseApp.ts
-var createBaseApp = (config, isBuild = false) => {
+var createBaseApp = (config) => {
   const options = resolveAppOptions(config);
   const dir = resolveAppDir(options);
-  const env = resolveAppEnv(options, isBuild);
+  const env = resolveAppEnv(options);
   const pluginApi = createPluginApi();
   const siteData = resolveAppSiteData(options);
   const version = resolveAppVersion();
@@ -936,8 +954,8 @@ var createBaseApp = (config, isBuild = false) => {
     writeTemp,
     // methods
     use: (plugin) => appUse(app, plugin),
-    init: () => appInit(app),
-    prepare: () => appPrepare(app)
+    init: async () => appInit(app),
+    prepare: async () => appPrepare(app)
   };
   setupAppThemeAndPlugins(app, config);
   return app;
@@ -945,15 +963,17 @@ var createBaseApp = (config, isBuild = false) => {
 
 // src/app/createBuildApp.ts
 var createBuildApp = (config) => {
-  const app = createBaseApp(config, true);
-  app.build = () => app.options.bundler.build(app);
+  const app = createBaseApp(config);
+  app.env.isBuild = true;
+  app.build = async () => app.options.bundler.build(app);
   return app;
 };
 
 // src/app/createDevApp.ts
 var createDevApp = (config) => {
-  const app = createBaseApp(config, false);
-  app.dev = () => app.options.bundler.dev(app);
+  const app = createBaseApp(config);
+  app.env.isDev = true;
+  app.dev = async () => app.options.bundler.dev(app);
   return app;
 };
 export {
@@ -972,12 +992,13 @@ export {
   inferPagePath,
   normalizeAliasDefineHook,
   normalizeClientConfigFileHook,
+  parsePageContent,
   prepareClientConfigs,
   preparePageChunk,
   preparePageComponent,
   prepareRoutes,
   prepareSiteData,
-  renderPageContent,
+  renderPageSfcBlocksToVue,
   resolveAppDir,
   resolveAppEnv,
   resolveAppOptions,
@@ -987,8 +1008,8 @@ export {
   resolveAppWriteTemp,
   resolvePageChunkInfo,
   resolvePageComponentInfo,
+  resolvePageContent,
   resolvePageDate,
-  resolvePageFileContent,
   resolvePageFilePath,
   resolvePageHtmlInfo,
   resolvePageLang,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-rc.14",
+  "version": "2.0.0-rc.16",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,11 +27,11 @@
     "dist"
   ],
   "dependencies": {
-    "vue": "^3.4.29",
-    "@vuepress/client": "2.0.0-rc.14",
-    "@vuepress/markdown": "2.0.0-rc.14",
-    "@vuepress/utils": "2.0.0-rc.14",
-    "@vuepress/shared": "2.0.0-rc.14"
+    "vue": "^3.5.10",
+    "@vuepress/shared": "2.0.0-rc.16",
+    "@vuepress/utils": "2.0.0-rc.16",
+    "@vuepress/client": "2.0.0-rc.16",
+    "@vuepress/markdown": "2.0.0-rc.16"
   },
   "publishConfig": {
     "access": "public"