@vuepress/core 2.0.0-beta.18 → 2.0.0-beta.22

package/lib/app/createAppPages.js

@@ -14,13 +14,7 @@ const createAppPages = async (app) => {
         cwd: app.dir.source(),
     });
     // create pages from files
-    const pages = await Promise.all(pagePaths.map(async (filePath) => {
-        const pageOptions = { filePath };
-        // plugin hook: extendsPageOptions
-        const extendsPageOptions = await app.pluginApi.hooks.extendsPageOptions.process(filePath, app);
-        extendsPageOptions.forEach((item) => Object.assign(pageOptions, item));
-        return page_1.createPage(app, pageOptions);
-    }));
+    const pages = await Promise.all(pagePaths.map((filePath) => page_1.createPage(app, { filePath })));
     // if there is no 404 page, add one
     if (!pages.some((page) => page.path === '/404.html')) {
         pages.push(await page_1.createPage(app, {

package/lib/app/prepare/preparePageComponent.js

@@ -5,6 +5,11 @@ exports.preparePageComponent = void 0;
  * Generate page component temp file of a single page
  */
 const preparePageComponent = async (app, page) => {
-    await app.writeTemp(page.componentFilePathRelative, page.componentFileContent);
+    await app.writeTemp(page.componentFilePathRelative, [
+        // take the rendered markdown content as <template>
+        `<template>${page.contentRendered}</template>\n`,
+        // hoist `<script>`, `<style>` and other custom blocks
+        ...page.hoistedTags,
+    ].join('\n'));
 };
 exports.preparePageComponent = preparePageComponent;

package/lib/page/createPage.d.ts

@@ -1,2 +1,2 @@
 import type { App, Page, PageOptions } from '../types';
-export declare const createPage: (app: App, options: PageOptions) => Promise<Page>;
+export declare const createPage: (app: App, optionsRaw: PageOptions) => Promise<Page>;

package/lib/page/createPage.js

@@ -14,10 +14,13 @@ const resolvePageFrontmatter_1 = require("./resolvePageFrontmatter");
 const resolvePageHtmlInfo_1 = require("./resolvePageHtmlInfo");
 const resolvePageKey_1 = require("./resolvePageKey");
 const resolvePageLang_1 = require("./resolvePageLang");
+const resolvePageOptions_1 = require("./resolvePageOptions");
 const resolvePagePath_1 = require("./resolvePagePath");
 const resolvePagePermalink_1 = require("./resolvePagePermalink");
 const resolvePageSlug_1 = require("./resolvePageSlug");
-const createPage = async (app, options) => {
+const createPage = async (app, optionsRaw) => {
+    // resolve page options from raw options
+    const options = await resolvePageOptions_1.resolvePageOptions({ app, optionsRaw });
     // resolve page file absolute path and relative path
     const { filePath, filePathRelative } = resolvePageFilePath_1.resolvePageFilePath({
         app,
@@ -40,7 +43,7 @@ const createPage = async (app, options) => {
         frontmatter,
     });
     // render page content and extract information
-    const { renderedContent, deps, headers, hoistedTags, links, title, } = await renderPageContent_1.renderPageContent({
+    const { contentRendered, deps, headers, hoistedTags, links, title, } = await renderPageContent_1.renderPageContent({
         app,
         content,
         filePath,
@@ -73,9 +76,8 @@ const createPage = async (app, options) => {
         path,
     });
     // resolve page component and extract headers & links
-    const { componentFilePath, componentFilePathRelative, componentFileContent, componentFileChunkName, } = await resolvePageComponentInfo_1.resolvePageComponentInfo({
+    const { componentFilePath, componentFilePathRelative, componentFileChunkName, } = await resolvePageComponentInfo_1.resolvePageComponentInfo({
         app,
-        renderedContent,
         hoistedTags,
         htmlFilePathRelative,
         key,
@@ -91,19 +93,21 @@ const createPage = async (app, options) => {
         excerpt,
         headers,
         // extra data
-        pathInferred,
-        pathLocale,
         content,
-        slug,
+        contentRendered,
         date,
         deps,
+        hoistedTags,
         links,
+        pathInferred,
+        pathLocale,
+        permalink,
+        slug,
         // file info
         filePath,
         filePathRelative,
         componentFilePath,
         componentFilePathRelative,
-        componentFileContent,
         componentFileChunkName,
         dataFilePath,
         dataFilePathRelative,

package/lib/page/index.d.ts

@@ -12,6 +12,7 @@ export * from './resolvePageFrontmatter';
 export * from './resolvePageHtmlInfo';
 export * from './resolvePageKey';
 export * from './resolvePageLang';
+export * from './resolvePageOptions';
 export * from './resolvePagePath';
 export * from './resolvePagePermalink';
 export * from './resolvePageSlug';

package/lib/page/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./resolvePageFrontmatter"), exports);
 __exportStar(require("./resolvePageHtmlInfo"), exports);
 __exportStar(require("./resolvePageKey"), exports);
 __exportStar(require("./resolvePageLang"), exports);
+__exportStar(require("./resolvePageOptions"), exports);
 __exportStar(require("./resolvePagePath"), exports);
 __exportStar(require("./resolvePagePermalink"), exports);
 __exportStar(require("./resolvePageSlug"), exports);

package/lib/page/renderPageContent.d.ts

@@ -10,7 +10,7 @@ export declare const renderPageContent: ({ app, content, frontmatter, filePath,
     filePath: string | null;
     filePathRelative: string | null;
 }) => Promise<{
-    renderedContent: string;
+    contentRendered: string;
     deps: string[];
     headers: MarkdownHeader[];
     hoistedTags: string[];

package/lib/page/renderPageContent.js

@@ -11,11 +11,11 @@ const renderPageContent = async ({ app, content, frontmatter, filePath, filePath
         filePathRelative,
         frontmatter,
     };
-    const renderedContent = app.markdown.render(content, markdownEnv);
+    const contentRendered = app.markdown.render(content, markdownEnv);
     /* istanbul ignore next */
     const { headers = [], hoistedTags = [], importedFiles = [], links = [], title = '', } = markdownEnv;
     return {
-        renderedContent,
+        contentRendered,
         deps: importedFiles,
         headers,
         hoistedTags,

package/lib/page/resolvePageComponentInfo.d.ts

@@ -2,15 +2,13 @@ import type { App } from '../types';
 /**
  * Resolve page component and related info
  */
-export declare const resolvePageComponentInfo: ({ app, renderedContent, hoistedTags, htmlFilePathRelative, key, }: {
+export declare const resolvePageComponentInfo: ({ app, hoistedTags, htmlFilePathRelative, key, }: {
     app: App;
-    renderedContent: string;
     hoistedTags: string[];
     htmlFilePathRelative: string;
     key: string;
 }) => Promise<{
     componentFilePath: string;
     componentFilePathRelative: string;
-    componentFileContent: string;
     componentFileChunkName: string;
 }>;

package/lib/page/resolvePageComponentInfo.js

@@ -5,14 +5,7 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve page component and related info
  */
-const resolvePageComponentInfo = async ({ app, renderedContent, hoistedTags, htmlFilePathRelative, key, }) => {
-    // resolve component file content
-    // take the rendered markdown content as <template>
-    // hoist `<script>`, `<style>` and other custom blocks
-    const componentFileContent = [
-        `<template>${renderedContent}</template>`,
-        ...hoistedTags,
-    ].join('\n\n');
+const resolvePageComponentInfo = async ({ app, hoistedTags, htmlFilePathRelative, key, }) => {
     // resolve component file path
     const componentFilePathRelative = utils_1.path.join('pages', `${htmlFilePathRelative}.vue`);
     const componentFilePath = app.dir.temp(componentFilePathRelative);
@@ -20,7 +13,6 @@ const resolvePageComponentInfo = async ({ app, renderedContent, hoistedTags, htm
     return {
         componentFilePath,
         componentFilePathRelative,
-        componentFileContent,
         componentFileChunkName,
     };
 };

package/lib/page/resolvePageOptions.d.ts

@@ -0,0 +1,8 @@
+import type { App, PageOptions } from '../types';
+/**
+ * Render page content and extract related info
+ */
+export declare const resolvePageOptions: ({ app, optionsRaw, }: {
+    app: App;
+    optionsRaw: PageOptions;
+}) => Promise<PageOptions>;

package/lib/page/resolvePageOptions.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePageOptions = void 0;
+/**
+ * Render page content and extract related info
+ */
+const resolvePageOptions = async ({ app, optionsRaw, }) => {
+    const options = { ...optionsRaw };
+    // plugin hook: extendsPageOptions
+    const extendsPageOptions = await app.pluginApi.hooks.extendsPageOptions.process(optionsRaw, app);
+    extendsPageOptions.forEach((item) => Object.assign(options, item));
+    return options;
+};
+exports.resolvePageOptions = resolvePageOptions;

package/lib/types/page.d.ts

@@ -4,6 +4,32 @@ import type { PageData, PageFrontmatter } from '@vuepress/shared';
  * Vuepress Page
  */
 export interface Page extends PageData {
+    /**
+     * Raw Content of the page
+     */
+    content: string;
+    /**
+     * Rendered content of the page
+     */
+    contentRendered: string;
+    /**
+     * Date of the page, in 'yyyy-MM-dd' format
+     *
+     * @example '2020-09-09'
+     */
+    date: string;
+    /**
+     * Dependencies of the page
+     */
+    deps: string[];
+    /**
+     * Hoisted tags of the page
+     */
+    hoistedTags: string[];
+    /**
+     * Links of the page
+     */
+    links: MarkdownLink[];
     /**
      * Path of the page that inferred from file path
      *
@@ -20,6 +46,16 @@ export interface Page extends PageData {
      * @example '/zh/getting-started.html' -> '/zh/'
      */
     pathLocale: string;
+    /**
+     * Permalink of the page
+     *
+     * If the page does not have a permalink, it would be `null`
+     */
+    permalink: string | null;
+    /**
+     * Slug of the page
+     */
+    slug: string;
     /**
      * Source file path
      *
@@ -32,14 +68,6 @@ export interface Page extends PageData {
      * If the page does not come from a file, it would be `null`
      */
     filePathRelative: string | null;
-    /**
-     * Rendered html file path
-     */
-    htmlFilePath: string;
-    /**
-     * Rendered html file path relative to dest directory
-     */
-    htmlFilePathRelative: string;
     /**
      * Component file path
      */
@@ -48,10 +76,6 @@ export interface Page extends PageData {
      * Component file path relative to temp directory
      */
     componentFilePathRelative: string;
-    /**
-     * Component file content that generated from the source file
-     */
-    componentFileContent: string;
     /**
      * Component file chunk name
      *
@@ -73,27 +97,13 @@ export interface Page extends PageData {
      */
     dataFileChunkName: string;
     /**
-     * Content of the page
-     */
-    content: string;
-    /**
-     * Slug of the page
-     */
-    slug: string;
-    /**
-     * Date of the page, in 'yyyy-MM-dd' format
-     *
-     * @example '2020-09-09'
-     */
-    date: string;
-    /**
-     * Dependencies of the page
+     * Rendered html file path
      */
-    deps: string[];
+    htmlFilePath: string;
     /**
-     * Links of the page
+     * Rendered html file path relative to dest directory
      */
-    links: MarkdownLink[];
+    htmlFilePathRelative: string;
 }
 /**
  * Options to create vuepress page

package/lib/types/pluginApi/hooks.d.ts

@@ -14,7 +14,7 @@ export declare type LifeCycleHook<T extends unknown[] = []> = Hook<(app: App, ..
 export declare type ClientFilesHook = Hook<string | string[] | ((app: App) => PromiseOrNot<string | string[]>), (app: App) => Promise<string[]>>;
 export declare type ReturnObjectHook = Hook<Record<string, any> | ((app: App) => PromiseOrNot<Record<string, any>>), (app: App) => Promise<Record<string, any>>>;
 export declare type ExtendsMarkdownHook = Hook<(md: Markdown, app: App) => PromiseOrNot<void>>;
-export declare type ExtendsPageOptionsHook = Hook<(filePath: string, app: App) => PromiseOrNot<PageOptions>>;
+export declare type ExtendsPageOptionsHook = Hook<(options: PageOptions, app: App) => PromiseOrNot<PageOptions>>;
 export declare type ExtendsPageDataHook = Hook<(page: Page, app: App) => PromiseOrNot<Record<string, any>>>;
 /**
  * List of hooks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.18",
+  "version": "2.0.0-beta.22",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,15 +26,15 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.18",
-    "@vuepress/markdown": "2.0.0-beta.18",
-    "@vuepress/shared": "2.0.0-beta.18",
-    "@vuepress/utils": "2.0.0-beta.18",
+    "@vuepress/client": "2.0.0-beta.21",
+    "@vuepress/markdown": "2.0.0-beta.22",
+    "@vuepress/shared": "2.0.0-beta.21",
+    "@vuepress/utils": "2.0.0-beta.21",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b74a98f3ebe57b5edf3443bf747834a767e67796"
+  "gitHead": "8db8d235df8914c70c864ae3f3f66f93cfd1a457"
 }