@vuepress/core 2.0.0-beta.60 → 2.0.0-beta.62

package/dist/index.d.ts

@@ -45,6 +45,10 @@ type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPa
      * Links of the page
      */
     links: MarkdownLink[];
+    /**
+     * Markdown env object of the page
+     */
+    markdownEnv: Record<string, unknown>;
     /**
      * Path of the page that inferred from file path
      *
@@ -674,15 +678,16 @@ declare const renderPageContent: ({ app, content, filePath, filePathRelative, op
     filePath: string | null;
     filePathRelative: string | null;
     options: PageOptions;
-}) => Promise<{
+}) => {
     contentRendered: string;
     deps: string[];
+    markdownEnv: Record<string, unknown>;
     frontmatter: PageFrontmatter;
     headers: MarkdownHeader[];
     links: MarkdownLink[];
     sfcBlocks: MarkdownSfcBlocks;
     title: string;
-}>;
+};
 
 /**
  * Resolve page component and related info

package/dist/index.js

@@ -17,8 +17,10 @@ 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),
@@ -181,7 +183,8 @@ var inferPagePath = ({
 };
 
 // src/page/renderPageContent.ts
-var renderPageContent = async ({
+import { omit } from "@vuepress/shared";
+var renderPageContent = ({
   app,
   content,
   filePath,
@@ -208,7 +211,8 @@ var renderPageContent = async ({
       styles: [],
       customBlocks: []
     },
-    title = ""
+    title = "",
+    ...extraMarkdownEnv
   } = markdownEnv;
   return {
     contentRendered,
@@ -216,8 +220,16 @@ var renderPageContent = async ({
     frontmatter,
     headers,
     links,
+    markdownEnv: omit(
+      extraMarkdownEnv,
+      "base",
+      "content",
+      "filePath",
+      "filePathRelative",
+      "frontmatter"
+    ),
     sfcBlocks,
-    title: frontmatter.title ?? title
+    title: frontmatter.title ? `${frontmatter.title}` : title
   };
 };
 
@@ -472,9 +484,10 @@ var createPage = async (app, options) => {
     frontmatter,
     headers,
     links,
+    markdownEnv,
     sfcBlocks,
     title
-  } = await renderPageContent({
+  } = renderPageContent({
     app,
     content,
     filePath,
@@ -511,6 +524,7 @@ var createPage = async (app, options) => {
   });
   const { dataFilePath, dataFilePathRelative, dataFileChunkName } = resolvePageDataInfo({ app, htmlFilePathRelative, key });
   const page = {
+    // page data
     data: {
       key,
       path: path9,
@@ -519,23 +533,27 @@ var createPage = async (app, options) => {
       frontmatter,
       headers
     },
+    // base fields
     key,
     path: path9,
     title,
     lang,
     frontmatter,
     headers,
+    // extra fields
     content,
     contentRendered,
     date,
     deps,
     links,
+    markdownEnv,
     pathInferred,
     pathLocale,
     permalink,
     routeMeta,
     sfcBlocks,
     slug,
+    // file info
     filePath,
     filePathRelative,
     componentFilePath,
@@ -681,16 +699,20 @@ var createHookQueue = (name) => {
 
 // src/pluginApi/createPluginApiHooks.ts
 var createPluginApiHooks = () => ({
+  // life cycle hooks
   onInitialized: createHookQueue("onInitialized"),
   onPrepared: createHookQueue("onPrepared"),
   onWatched: createHookQueue("onWatched"),
   onGenerated: createHookQueue("onGenerated"),
+  // extends hooks
   extendsMarkdownOptions: createHookQueue("extendsMarkdownOptions"),
   extendsMarkdown: createHookQueue("extendsMarkdown"),
   extendsPageOptions: createHookQueue("extendsPageOptions"),
   extendsPage: createHookQueue("extendsPage"),
   extendsBundlerOptions: createHookQueue("extendsBundlerOptions"),
+  // client config file hooks
   clientConfigFile: createHookQueue("clientConfigFile"),
+  // bundler hooks
   alias: createHookQueue("alias"),
   define: createHookQueue("define")
 });
@@ -804,28 +826,33 @@ import { createRequire as createRequire2 } from "module";
 import { path as path8 } from "@vuepress/utils";
 var require3 = createRequire2(import.meta.url);
 var resolveAppOptions = ({
+  // site config
   base = "/",
   lang = "en-US",
   title = "",
   description = "",
   head = [],
   locales = {},
+  // directory config
   source,
   dest = path8.resolve(source, ".vuepress/dist"),
   temp = path8.resolve(source, ".vuepress/.temp"),
   cache = path8.resolve(source, ".vuepress/.cache"),
   public: publicDir = path8.resolve(source, ".vuepress/public"),
+  // dev config
   host = "0.0.0.0",
   port = 8080,
   open = false,
   templateDev = path8.normalize(
     require3.resolve("@vuepress/client/templates/dev.html")
   ),
+  // build config
   shouldPreload = true,
   shouldPrefetch = true,
   templateBuild = path8.normalize(
     require3.resolve("@vuepress/client/templates/build.html")
   ),
+  // common config
   bundler,
   debug: debug7 = false,
   markdown = {},
@@ -933,10 +960,12 @@ var createBaseApp = (config, isBuild = false) => {
     options,
     siteData,
     version,
+    // utils
     dir,
     env,
     pluginApi,
     writeTemp,
+    // methods
     use: (plugin) => appUse(app, plugin),
     init: () => appInit(app),
     prepare: () => appPrepare(app)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.60",
+  "version": "2.0.0-beta.62",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,11 +27,11 @@
     "dist"
   ],
   "dependencies": {
-    "vue": "^3.2.45",
-    "@vuepress/client": "2.0.0-beta.60",
-    "@vuepress/markdown": "2.0.0-beta.60",
-    "@vuepress/utils": "2.0.0-beta.60",
-    "@vuepress/shared": "2.0.0-beta.60"
+    "vue": "^3.3.1",
+    "@vuepress/client": "2.0.0-beta.62",
+    "@vuepress/markdown": "2.0.0-beta.62",
+    "@vuepress/shared": "2.0.0-beta.62",
+    "@vuepress/utils": "2.0.0-beta.62"
   },
   "publishConfig": {
     "access": "public"