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

package/lib/app/prepare/preparePageComponent.js

@@ -7,7 +7,8 @@ exports.preparePageComponent = void 0;
 const preparePageComponent = async (app, page) => {
     await app.writeTemp(page.componentFilePathRelative, [
         // take the rendered markdown content as <template>
-        `<template>${page.contentRendered}</template>\n`,
+        // #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,
     ].join('\n'));

package/lib/app/prepare/preparePageData.js

@@ -20,7 +20,8 @@ if (import.meta.hot) {
  */
 const preparePageData = async (app, page) => {
     // page data file content
-    let content = `export const data = ${JSON.stringify(page.data, null, 2)}\n`;
+    let content = `export const data = JSON.parse(${JSON.stringify(JSON.stringify(page.data))})
+`;
     // inject HMR code
     if (app.env.isDev) {
         content += HMR_CODE;

package/lib/app/prepare/preparePagesRoutes.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePagesRoutes = void 0;
 const shared_1 = require("@vuepress/shared");
 /**
- * Transform a page object to a route item
+ * Resolve page route item
  */
-const transformPageToRouteItem = ({ key, path, pathInferred, filePathRelative, routeMeta, }) => {
+const resolvePageRouteItem = ({ key, path, pathInferred, filePathRelative, routeMeta, }) => {
     // paths that should redirect to this page, use set to dedupe
     const redirectsSet = new Set();
     // redirect from decoded path
@@ -37,38 +37,11 @@ const transformPageToRouteItem = ({ key, path, pathInferred, filePathRelative, r
  * Generate routes temp file
  */
 const preparePagesRoutes = async (app) => {
-    const routeItems = app.pages.map(transformPageToRouteItem);
+    const routeItems = app.pages.map(resolvePageRouteItem);
     const content = `\
-import { Vuepress } from '@vuepress/client'
-
-const routeItems = [\
+export const pagesRoutes = [\
 ${routeItems.map((routeItem) => `\n  ${JSON.stringify(routeItem)},`).join('')}
 ]
-
-export const pagesRoutes = routeItems.reduce(
-  (result, [name, path, meta, redirects]) => {
-    result.push(
-      {
-        name,
-        path,
-        component: Vuepress,
-        meta,
-      },
-      ...redirects.map((item) => ({
-        path: item,
-        redirect: path,
-      }))
-    )
-    return result
-  },
-  [
-    {
-      name: '404',
-      path: '/:catchAll(.*)',
-      component: Vuepress,
-    }
-  ]
-)
 `;
     await app.writeTemp('internal/pagesRoutes.js', content);
 };

package/lib/app/prepare/prepareSiteData.js

@@ -20,7 +20,7 @@ if (import.meta.hot) {
  */
 const prepareSiteData = async (app) => {
     let content = `\
-export const siteData = ${JSON.stringify(app.siteData, null, 2)}
+export const siteData = JSON.parse(${JSON.stringify(JSON.stringify(app.siteData))})
 `;
     // inject HMR code
     if (app.env.isDev) {

package/lib/app/resolveAppOptions.d.ts

@@ -2,4 +2,4 @@ import type { AppConfig, AppOptions } from '../types';
 /**
  * Create app options with default values
  */
-export 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, plugins, theme, }: AppConfig) => AppOptions;
+export 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;

package/lib/app/resolveAppOptions.js

@@ -15,7 +15,7 @@ host = '0.0.0.0', port = 8080, open = false, templateDev = utils_1.path.normaliz
 // build config
 shouldPreload = true, shouldPrefetch = true, templateBuild = utils_1.path.normalize(require.resolve('@vuepress/client/templates/build.html')), 
 // common config
-bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], plugins = [], theme, }) => ({
+bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], permalinkPattern = null, plugins = [], theme, }) => ({
     base,
     lang,
     title,
@@ -38,6 +38,7 @@ bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress',
     debug,
     markdown,
     pagePatterns,
+    permalinkPattern,
     plugins,
     theme,
 });

package/lib/page/createPage.js

@@ -62,6 +62,7 @@ const createPage = async (app, options) => {
     const lang = (0, resolvePageLang_1.resolvePageLang)({ app, frontmatter, pathLocale });
     // resolve page permalink
     const permalink = (0, resolvePagePermalink_1.resolvePagePermalink)({
+        app,
         frontmatter,
         slug,
         date,

package/lib/page/resolvePagePermalink.d.ts

@@ -1,8 +1,9 @@
-import type { PageFrontmatter } from '../types';
+import type { App, PageFrontmatter } from '../types';
 /**
  * Resolve page permalink from frontmatter / options / pattern
  */
-export declare const resolvePagePermalink: ({ frontmatter, slug, date, pathInferred, pathLocale, }: {
+export declare const resolvePagePermalink: ({ app, frontmatter, slug, date, pathInferred, pathLocale, }: {
+    app: App;
     frontmatter: PageFrontmatter;
     slug: string;
     date: string;

package/lib/page/resolvePagePermalink.js

@@ -6,21 +6,19 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve page permalink from frontmatter / options / pattern
  */
-const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocale, }) => {
+const resolvePagePermalink = ({ app, frontmatter, slug, date, pathInferred, pathLocale, }) => {
     // use permalink in frontmatter directly
     if ((0, shared_1.isString)(frontmatter.permalink)) {
         return frontmatter.permalink;
     }
-    // get permalink pattern from frontmatter or options
-    const pattern = (0, shared_1.isString)(frontmatter.permalinkPattern)
-        ? frontmatter.permalinkPattern
-        : null;
-    if (!pattern) {
+    // get permalink pattern
+    const permalinkPattern = getPermalinkPattern({ app, frontmatter });
+    if (permalinkPattern === null) {
         return null;
     }
     // resolve permalink according to the pattern
     const [year, month, day] = date.split('-');
-    const link = utils_1.path.join(pathLocale, pattern
+    const link = utils_1.path.join(pathLocale, permalinkPattern
         .replace(/:year/, year)
         .replace(/:month/, month)
         .replace(/:day/, day)
@@ -29,3 +27,15 @@ const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocal
     return (0, shared_1.ensureLeadingSlash)(link);
 };
 exports.resolvePagePermalink = resolvePagePermalink;
+/**
+ * Get permalink pattern from frontmatter or app options
+ */
+const getPermalinkPattern = ({ app, frontmatter, }) => {
+    if (frontmatter.permalinkPattern === null) {
+        return null;
+    }
+    if ((0, shared_1.isString)(frontmatter.permalinkPattern)) {
+        return frontmatter.permalinkPattern;
+    }
+    return app.options.permalinkPattern;
+};

package/lib/types/app/options.d.ts

@@ -15,6 +15,7 @@ export interface AppConfigCommon extends Partial<SiteData> {
     debug?: boolean;
     markdown?: MarkdownOptions;
     pagePatterns?: string[];
+    permalinkPattern?: string | null;
     bundler: Bundler;
     theme: Theme;
     plugins?: PluginConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.45",
+  "version": "2.0.0-beta.48",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -22,13 +22,13 @@
     "lib"
   ],
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.45",
-    "@vuepress/markdown": "2.0.0-beta.45",
-    "@vuepress/shared": "2.0.0-beta.45",
-    "@vuepress/utils": "2.0.0-beta.45",
+    "@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.33"
+    "vue": "^3.2.36"
   },
   "publishConfig": {
     "access": "public"