@vuepress/core 2.0.0-beta.48 → 2.0.0-beta.49

package/lib/app/prepare/preparePageComponent.js

@@ -10,7 +10,7 @@ const preparePageComponent = async (app, page) => {
         // #688: wrap the content with a <div> to avoid some potential issues of fragment component
         `<template><div>${page.contentRendered}</div></template>\n`,
         // hoist `<script>`, `<style>` and other custom blocks
-        ...page.hoistedTags,
+        ...page.sfcBlocks,
     ].join('\n'));
 };
 exports.preparePageComponent = preparePageComponent;

package/lib/page/createPage.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPage = void 0;
 const inferPagePath_1 = require("./inferPagePath");
 const renderPageContent_1 = require("./renderPageContent");
-const renderPageExcerpt_1 = require("./renderPageExcerpt");
 const resolvePageComponentInfo_1 = require("./resolvePageComponentInfo");
-const resolvePageContent_1 = require("./resolvePageContent");
 const resolvePageDataInfo_1 = require("./resolvePageDataInfo");
 const resolvePageDate_1 = require("./resolvePageDate");
 const resolvePageFileContent_1 = require("./resolvePageFileContent");
 const resolvePageFilePath_1 = require("./resolvePageFilePath");
-const resolvePageFrontmatter_1 = require("./resolvePageFrontmatter");
 const resolvePageHtmlInfo_1 = require("./resolvePageHtmlInfo");
 const resolvePageKey_1 = require("./resolvePageKey");
 const resolvePageLang_1 = require("./resolvePageLang");
@@ -27,28 +24,14 @@ const createPage = async (app, options) => {
         options,
     });
     // read the raw file content according to the absolute file path
-    const contentRaw = await (0, resolvePageFileContent_1.resolvePageFileContent)({ filePath, options });
-    // resolve content & frontmatter & raw excerpt from raw content
-    const { content, frontmatterRaw, excerptRaw } = (0, resolvePageContent_1.resolvePageContent)({
-        contentRaw,
-    });
-    // resolve frontmatter from raw frontmatter and page options
-    const frontmatter = (0, resolvePageFrontmatter_1.resolvePageFrontmatter)({ frontmatterRaw, options });
-    // render excerpt
-    const excerpt = (0, renderPageExcerpt_1.renderPageExcerpt)({
-        app,
-        excerptRaw,
-        filePath,
-        filePathRelative,
-        frontmatter,
-    });
+    const content = await (0, resolvePageFileContent_1.resolvePageFileContent)({ filePath, options });
     // render page content and extract information
-    const { contentRendered, deps, headers, hoistedTags, links, title } = await (0, renderPageContent_1.renderPageContent)({
+    const { contentRendered, deps, excerpt, frontmatter, headers, links, sfcBlocks, title, } = await (0, renderPageContent_1.renderPageContent)({
         app,
         content,
         filePath,
         filePathRelative,
-        frontmatter,
+        options,
     });
     // resolve route meta from frontmatter
     const routeMeta = (0, resolvePageRouteMeta_1.resolvePageRouteMeta)({ frontmatter });
@@ -109,12 +92,12 @@ const createPage = async (app, options) => {
         contentRendered,
         date,
         deps,
-        hoistedTags,
         links,
         pathInferred,
         pathLocale,
         permalink,
         routeMeta,
+        sfcBlocks,
         slug,
         // file info
         filePath,

package/lib/page/index.d.ts

@@ -1,14 +1,11 @@
 export * from './createPage';
 export * from './inferPagePath';
 export * from './renderPageContent';
-export * from './renderPageExcerpt';
 export * from './resolvePageComponentInfo';
-export * from './resolvePageContent';
 export * from './resolvePageDataInfo';
 export * from './resolvePageDate';
 export * from './resolvePageFileContent';
 export * from './resolvePageFilePath';
-export * from './resolvePageFrontmatter';
 export * from './resolvePageHtmlInfo';
 export * from './resolvePageKey';
 export * from './resolvePageLang';

package/lib/page/index.js

@@ -17,14 +17,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./createPage"), exports);
 __exportStar(require("./inferPagePath"), exports);
 __exportStar(require("./renderPageContent"), exports);
-__exportStar(require("./renderPageExcerpt"), exports);
 __exportStar(require("./resolvePageComponentInfo"), exports);
-__exportStar(require("./resolvePageContent"), exports);
 __exportStar(require("./resolvePageDataInfo"), exports);
 __exportStar(require("./resolvePageDate"), exports);
 __exportStar(require("./resolvePageFileContent"), exports);
 __exportStar(require("./resolvePageFilePath"), exports);
-__exportStar(require("./resolvePageFrontmatter"), exports);
 __exportStar(require("./resolvePageHtmlInfo"), exports);
 __exportStar(require("./resolvePageKey"), exports);
 __exportStar(require("./resolvePageLang"), exports);

package/lib/page/renderPageContent.d.ts

@@ -1,19 +1,21 @@
 import type { MarkdownHeader, MarkdownLink } from '@vuepress/markdown';
-import type { App, PageFrontmatter } from '../types';
+import type { App, PageFrontmatter, PageOptions } from '../types';
 /**
  * Render page content and extract related info
  */
-export declare const renderPageContent: ({ app, content, frontmatter, filePath, filePathRelative, }: {
+export declare const renderPageContent: ({ app, content, filePath, filePathRelative, options, }: {
     app: App;
     content: string;
-    frontmatter: PageFrontmatter;
     filePath: string | null;
     filePathRelative: string | null;
+    options: PageOptions;
 }) => Promise<{
     contentRendered: string;
     deps: string[];
+    excerpt: string;
+    frontmatter: PageFrontmatter;
     headers: MarkdownHeader[];
-    hoistedTags: string[];
     links: MarkdownLink[];
+    sfcBlocks: string[];
     title: string;
 }>;

package/lib/page/renderPageContent.js

@@ -4,23 +4,25 @@ exports.renderPageContent = void 0;
 /**
  * Render page content and extract related info
  */
-const renderPageContent = async ({ app, content, frontmatter, filePath, filePathRelative, }) => {
+const renderPageContent = async ({ app, content, filePath, filePathRelative, options, }) => {
     const markdownEnv = {
         base: app.options.base,
         filePath,
         filePathRelative,
-        frontmatter,
+        frontmatter: { ...options.frontmatter },
     };
     const contentRendered = app.markdown.render(content, markdownEnv);
     /* istanbul ignore next */
-    const { headers = [], hoistedTags = [], importedFiles = [], links = [], title = '', } = markdownEnv;
+    const { excerpt = '', frontmatter = {}, headers = [], importedFiles = [], links = [], sfcBlocks = [], title = '', } = markdownEnv;
     return {
         contentRendered,
         deps: importedFiles,
+        excerpt,
+        frontmatter,
         headers,
-        hoistedTags,
         links,
-        title,
+        sfcBlocks,
+        title: frontmatter.title ?? title,
     };
 };
 exports.renderPageContent = renderPageContent;

package/lib/types/page.d.ts

@@ -26,10 +26,6 @@ export declare type Page<ExtraPageData extends Record<any, any> = Record<never,
      * Dependencies of the page
      */
     deps: string[];
-    /**
-     * Hoisted tags of the page
-     */
-    hoistedTags: string[];
     /**
      * Links of the page
      */
@@ -62,6 +58,10 @@ export declare type Page<ExtraPageData extends Record<any, any> = Record<never,
      * @see https://router.vuejs.org/api/#meta
      */
     routeMeta: Record<string, unknown>;
+    /**
+     * Extracted sfc blocks of the page
+     */
+    sfcBlocks: string[];
     /**
      * Slug of the page
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.48",
+  "version": "2.0.0-beta.49",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -22,13 +22,11 @@
     "lib"
   ],
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.48",
-    "@vuepress/markdown": "2.0.0-beta.48",
-    "@vuepress/shared": "2.0.0-beta.48",
-    "@vuepress/utils": "2.0.0-beta.48",
-    "gray-matter": "^4.0.3",
-    "toml": "^3.0.0",
-    "vue": "^3.2.36"
+    "@vuepress/client": "2.0.0-beta.49",
+    "@vuepress/markdown": "2.0.0-beta.49",
+    "@vuepress/shared": "2.0.0-beta.49",
+    "@vuepress/utils": "2.0.0-beta.49",
+    "vue": "^3.2.37"
   },
   "publishConfig": {
     "access": "public"

package/lib/page/renderPageExcerpt.d.ts

@@ -1,11 +0,0 @@
-import type { App, PageFrontmatter } from '../types';
-/**
- * Render page excerpt from raw excerpt
- */
-export declare const renderPageExcerpt: ({ app, excerptRaw, frontmatter, filePath, filePathRelative, }: {
-    app: App;
-    excerptRaw: string;
-    frontmatter: PageFrontmatter;
-    filePath: string | null;
-    filePathRelative: string | null;
-}) => string;

package/lib/page/renderPageExcerpt.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderPageExcerpt = void 0;
-/**
- * Render page excerpt from raw excerpt
- */
-const renderPageExcerpt = ({ app, excerptRaw, frontmatter, filePath, filePathRelative, }) => {
-    const markdownEnv = {
-        base: app.options.base,
-        filePath,
-        filePathRelative,
-        frontmatter,
-    };
-    const renderedExcerpt = app.markdown.render(excerptRaw, markdownEnv);
-    return renderedExcerpt;
-};
-exports.renderPageExcerpt = renderPageExcerpt;

package/lib/page/resolvePageContent.d.ts

@@ -1,11 +0,0 @@
-import type { PageFrontmatter } from '../types';
-/**
- * Resolve page content and raw frontmatter & excerpt
- */
-export declare const resolvePageContent: ({ contentRaw, }: {
-    contentRaw: string;
-}) => {
-    content: string;
-    frontmatterRaw: PageFrontmatter;
-    excerptRaw: string;
-};

package/lib/page/resolvePageContent.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePageContent = void 0;
-const matter = require("gray-matter");
-const toml = require("toml");
-/**
- * Resolve page content and raw frontmatter & excerpt
- */
-const resolvePageContent = ({ contentRaw, }) => {
-    if (!contentRaw) {
-        return {
-            content: '',
-            frontmatterRaw: {},
-            excerptRaw: '',
-        };
-    }
-    /* istanbul ignore next */
-    const { data, content, excerpt = '', } = matter(contentRaw, {
-        excerpt_separator: '<!-- more -->',
-        engines: {
-            toml: toml.parse.bind(toml),
-        },
-    });
-    return {
-        content,
-        frontmatterRaw: data,
-        excerptRaw: excerpt,
-    };
-};
-exports.resolvePageContent = resolvePageContent;

package/lib/page/resolvePageFrontmatter.d.ts

@@ -1,8 +0,0 @@
-import type { PageFrontmatter, PageOptions } from '../types';
-/**
- * Resolve page frontmatter from user frontmatter and options frontmatter
- */
-export declare const resolvePageFrontmatter: ({ frontmatterRaw, options, }: {
-    frontmatterRaw: PageFrontmatter;
-    options: PageOptions;
-}) => PageFrontmatter;

package/lib/page/resolvePageFrontmatter.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePageFrontmatter = void 0;
-/**
- * Resolve page frontmatter from user frontmatter and options frontmatter
- */
-const resolvePageFrontmatter = ({ frontmatterRaw, options, }) => ({
-    // raw frontmatter take priority over options frontmatter
-    ...options.frontmatter,
-    ...frontmatterRaw,
-});
-exports.resolvePageFrontmatter = resolvePageFrontmatter;