@vuepress/core 2.0.0-rc.2 → 2.0.0-rc.3

package/dist/index.d.ts

@@ -73,9 +73,7 @@ type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPa
      */
     permalink: string | null;
     /**
-     * Custom data to be attached to the page route record of vue-router
-     *
-     * @see https://router.vuejs.org/api/#meta
+     * Custom data to be attached to route record
      */
     routeMeta: Record<string, unknown>;
     /**
@@ -107,25 +105,19 @@ type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPa
      */
     componentFilePathRelative: string;
     /**
-     * Component file chunk name
-     *
-     * Only take effect in webpack
+     * Chunk file path
      */
-    componentFileChunkName: string;
+    chunkFilePath: string;
     /**
-     * Page data file path
+     * Chunk file path relative to temp directory
      */
-    dataFilePath: string;
+    chunkFilePathRelative: string;
     /**
-     * Page data file path relative to temp directory
-     */
-    dataFilePathRelative: string;
-    /**
-     * Page data file chunk name
+     * Chunk name
      *
-     * Only take effect in webpack
+     * This will only take effect in webpack
      */
-    dataFileChunkName: string;
+    chunkName: string;
     /**
      * Rendered html file path
      */
@@ -557,29 +549,19 @@ interface BuildApp extends App {
 declare const prepareClientConfigs: (app: App) => Promise<void>;
 
 /**
- * Generate page component temp file of a single page
- */
-declare const preparePageComponent: (app: App, page: Page) => Promise<void>;
-
-/**
- * Generate page data temp file of a single page
+ * Generate page chunk temp file of a single page
  */
-declare const preparePageData: (app: App, page: Page) => Promise<void>;
+declare const preparePageChunk: (app: App, page: Page) => Promise<void>;
 
 /**
- * Generate page key to page component map temp file
- */
-declare const preparePagesComponents: (app: App) => Promise<void>;
-
-/**
- * Generate page path to page data map temp file
+ * Generate page component temp file of a single page
  */
-declare const preparePagesData: (app: App) => Promise<void>;
+declare const preparePageComponent: (app: App, page: Page) => Promise<void>;
 
 /**
  * Generate routes temp file
  */
-declare const preparePagesRoutes: (app: App) => Promise<void>;
+declare const prepareRoutes: (app: App) => Promise<void>;
 
 /**
  * Generate site data temp file
@@ -705,30 +687,27 @@ declare const renderPageContent: ({ app, content, filePath, filePathRelative, op
 };
 
 /**
- * Resolve page component and related info
+ * Resolve page data file path
  */
-declare const resolvePageComponentInfo: ({ app, htmlFilePathRelative, key, }: {
+declare const resolvePageChunkInfo: ({ app, htmlFilePathRelative, }: {
     app: App;
     htmlFilePathRelative: string;
-    key: string;
-}) => Promise<{
-    componentFilePath: string;
-    componentFilePathRelative: string;
-    componentFileChunkName: string;
-}>;
+}) => {
+    chunkFilePath: string;
+    chunkFilePathRelative: string;
+    chunkName: string;
+};
 
 /**
- * Resolve page data file path
+ * Resolve page component and related info
  */
-declare const resolvePageDataInfo: ({ app, htmlFilePathRelative, key, }: {
+declare const resolvePageComponentInfo: ({ app, htmlFilePathRelative, }: {
     app: App;
     htmlFilePathRelative: string;
-    key: string;
-}) => {
-    dataFilePath: string;
-    dataFilePathRelative: string;
-    dataFileChunkName: string;
-};
+}) => Promise<{
+    componentFilePath: string;
+    componentFilePathRelative: string;
+}>;
 
 /**
  * Resolve page date according to frontmatter or file path
@@ -770,13 +749,6 @@ declare const resolvePageHtmlInfo: ({ app, path: pagePath, }: {
     htmlFilePathRelative: string;
 };
 
-/**
- * Resolve page key to identify the page
- */
-declare const resolvePageKey: ({ path }: {
-    path: string;
-}) => string;
-
 /**
  * Resolve language of page
  */
@@ -842,4 +814,4 @@ declare const normalizeAliasDefineHook: (hook: AliasDefineHook['exposed']) => Al
  */
 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, preparePageComponent, preparePageData, preparePagesComponents, preparePagesData, preparePagesRoutes, prepareSiteData, renderPageContent, resolveAppDir, resolveAppEnv, resolveAppOptions, resolveAppPages, resolveAppSiteData, resolveAppVersion, resolveAppWriteTemp, resolvePageComponentInfo, resolvePageDataInfo, resolvePageDate, resolvePageFileContent, resolvePageFilePath, resolvePageHtmlInfo, resolvePageKey, 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 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 };

package/dist/index.js

@@ -10,6 +10,32 @@ ${clientConfigFiles.map((_, index) => `  clientConfig${index},`).join("\n")}
   await app.writeTemp("internal/clientConfigs.js", content);
 };
 
+// src/app/prepare/preparePageChunk.ts
+var HMR_CODE = `
+if (import.meta.webpackHot) {
+  import.meta.webpackHot.accept()
+  if (__VUE_HMR_RUNTIME__.updatePageData) {
+    __VUE_HMR_RUNTIME__.updatePageData(data)
+  }
+}
+
+if (import.meta.hot) {
+  import.meta.hot.accept(({ data }) => {
+    __VUE_HMR_RUNTIME__.updatePageData(data)
+  })
+}
+`;
+var preparePageChunk = async (app, page) => {
+  let content = `import comp from ${JSON.stringify(page.componentFilePath)}
+const data = JSON.parse(${JSON.stringify(JSON.stringify(page.data))})
+export { comp, data }
+`;
+  if (app.env.isDev) {
+    content += HMR_CODE;
+  }
+  await app.writeTemp(page.chunkFilePathRelative, content);
+};
+
 // src/app/prepare/preparePageComponent.ts
 var preparePageComponent = async (app, page) => {
   await app.writeTemp(
@@ -27,99 +53,74 @@ var preparePageComponent = async (app, page) => {
   );
 };
 
-// src/app/prepare/preparePageData.ts
-var HMR_CODE = `
+// src/app/prepare/prepareRoutes.ts
+import { ensureLeadingSlash, normalizeRoutePath } from "@vuepress/shared";
+var HMR_CODE2 = `
 if (import.meta.webpackHot) {
   import.meta.webpackHot.accept()
-  if (__VUE_HMR_RUNTIME__.updatePageData) {
-    __VUE_HMR_RUNTIME__.updatePageData(data)
+  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(({ data }) => {
-    __VUE_HMR_RUNTIME__.updatePageData(data)
+  import.meta.hot.accept(({ routes, redirects }) => {
+    __VUE_HMR_RUNTIME__.updateRoutes(routes)
+    __VUE_HMR_RUNTIME__.updateRedirects(redirects)
   })
 }
 `;
-var preparePageData = async (app, page) => {
-  let content = `export const data = JSON.parse(${JSON.stringify(
-    JSON.stringify(page.data)
-  )})
-`;
-  if (app.env.isDev) {
-    content += HMR_CODE;
-  }
-  await app.writeTemp(page.dataFilePathRelative, content);
-};
-
-// src/app/prepare/preparePagesComponents.ts
-var preparePagesComponents = async (app) => {
-  const content = `import { defineAsyncComponent } from 'vue'
-
-export const pagesComponents = {${app.pages.map(
-    ({ key, path: path9, componentFilePath, componentFileChunkName }) => `
-  // path: ${path9}
-  ${JSON.stringify(key)}: defineAsyncComponent(() => import(${componentFileChunkName ? `/* webpackChunkName: "${componentFileChunkName}" */` : ""}${JSON.stringify(componentFilePath)})),`
-  ).join("")}
-}
-`;
-  await app.writeTemp("internal/pagesComponents.js", content);
-};
-
-// src/app/prepare/preparePagesData.ts
-var preparePagesData = async (app) => {
-  const content = `export const pagesData = {${app.pages.map(
-    ({ key, path: path9, dataFilePath, dataFileChunkName }) => `
-  // path: ${path9}
-  ${JSON.stringify(key)}: () => import(${dataFileChunkName ? `/* webpackChunkName: "${dataFileChunkName}" */` : ""}${JSON.stringify(dataFilePath)}).then(({ data }) => data),`
-  ).join("")}
-}
-`;
-  await app.writeTemp("internal/pagesData.js", content);
-};
-
-// src/app/prepare/preparePagesRoutes.ts
-import { ensureLeadingSlash } from "@vuepress/shared";
-var resolvePageRouteItem = ({
-  key,
+var resolvePageRedirects = ({
   path: path9,
   pathInferred,
-  filePathRelative,
-  routeMeta
+  filePathRelative
 }) => {
   const redirectsSet = /* @__PURE__ */ new Set();
-  redirectsSet.add(decodeURI(path9));
+  const addRedirect = (redirect) => {
+    const normalizedPath = normalizeRoutePath(redirect);
+    if (normalizedPath === path9)
+      return;
+    const encodedPath = encodeURI(normalizedPath);
+    if (encodedPath === path9)
+      return;
+    redirectsSet.add(redirect);
+  };
   if (pathInferred !== null) {
-    redirectsSet.add(pathInferred);
-    redirectsSet.add(encodeURI(pathInferred));
+    addRedirect(pathInferred);
   }
   if (filePathRelative !== null) {
-    const filenamePath = ensureLeadingSlash(filePathRelative);
-    redirectsSet.add(filenamePath);
-    redirectsSet.add(encodeURI(filenamePath));
+    addRedirect(ensureLeadingSlash(filePathRelative));
   }
-  redirectsSet.delete(path9);
-  return [
-    key,
-    path9,
-    routeMeta,
-    [...redirectsSet].map(
-      (item) => item.replace(/\.md$/, ".html") === path9 ? ":md" : item
+  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])
+        )
+      )
     )
-  ];
-};
-var preparePagesRoutes = async (app) => {
-  const routeItems = app.pages.map(resolvePageRouteItem);
-  const content = `export const pagesRoutes = [${routeItems.map((routeItem) => `
-  ${JSON.stringify(routeItem)},`).join("")}
-]
+  )})
+
+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")}
+]);
 `;
-  await app.writeTemp("internal/pagesRoutes.js", content);
+  if (app.env.isDev) {
+    content += HMR_CODE2;
+  }
+  await app.writeTemp("internal/routes.js", content);
 };
 
 // src/app/prepare/prepareSiteData.ts
-var HMR_CODE2 = `
+var HMR_CODE3 = `
 if (import.meta.webpackHot) {
   import.meta.webpackHot.accept()
   if (__VUE_HMR_RUNTIME__.updateSiteData) {
@@ -139,7 +140,7 @@ var prepareSiteData = async (app) => {
   )})
 `;
   if (app.env.isDev) {
-    content += HMR_CODE2;
+    content += HMR_CODE3;
   }
   await app.writeTemp("internal/siteData.js", content);
 };
@@ -233,40 +234,36 @@ var renderPageContent = ({
   };
 };
 
-// src/page/resolvePageComponentInfo.ts
-import { path } from "@vuepress/utils";
-var resolvePageComponentInfo = async ({
+// src/page/resolvePageChunkInfo.ts
+import { hash, path } from "@vuepress/utils";
+var resolvePageChunkInfo = ({
   app,
-  htmlFilePathRelative,
-  key
+  htmlFilePathRelative
 }) => {
-  const componentFilePathRelative = path.join(
-    "pages",
-    `${htmlFilePathRelative}.vue`
-  );
-  const componentFilePath = app.dir.temp(componentFilePathRelative);
-  const componentFileChunkName = key;
+  const chunkFilePathRelative = path.join("pages", `${htmlFilePathRelative}.js`);
+  const chunkFilePath = app.dir.temp(chunkFilePathRelative);
+  const chunkName = `v-${hash(htmlFilePathRelative)}`;
   return {
-    componentFilePath,
-    componentFilePathRelative,
-    componentFileChunkName
+    chunkFilePath,
+    chunkFilePathRelative,
+    chunkName
   };
 };
 
-// src/page/resolvePageDataInfo.ts
+// src/page/resolvePageComponentInfo.ts
 import { path as path2 } from "@vuepress/utils";
-var resolvePageDataInfo = ({
+var resolvePageComponentInfo = async ({
   app,
-  htmlFilePathRelative,
-  key
+  htmlFilePathRelative
 }) => {
-  const dataFilePathRelative = path2.join("pages", `${htmlFilePathRelative}.js`);
-  const dataFilePath = app.dir.temp(dataFilePathRelative);
-  const dataFileChunkName = key;
+  const componentFilePathRelative = path2.join(
+    "pages",
+    `${htmlFilePathRelative}.vue`
+  );
+  const componentFilePath = app.dir.temp(componentFilePathRelative);
   return {
-    dataFilePath,
-    dataFilePathRelative,
-    dataFileChunkName
+    componentFilePath,
+    componentFilePathRelative
   };
 };
 
@@ -366,8 +363,9 @@ var resolvePageHtmlInfo = ({
   app,
   path: pagePath
 }) => {
+  const path9 = decodeURI(pagePath);
   const htmlFilePathRelative = removeLeadingSlash(
-    decodeURI(pagePath.replace(/\/$/, "/index.html"))
+    path9.endsWith("/") ? path9 + "index.html" : path9.endsWith(".html") ? path9 : path9 + ".html"
   );
   const htmlFilePath = app.dir.dest(htmlFilePathRelative);
   return {
@@ -376,10 +374,6 @@ var resolvePageHtmlInfo = ({
   };
 };
 
-// src/page/resolvePageKey.ts
-import { hash } from "@vuepress/utils";
-var resolvePageKey = ({ path: path9 }) => `v-${hash(path9)}`;
-
 // src/page/resolvePageLang.ts
 import { isString as isString2 } from "@vuepress/shared";
 var resolvePageLang = ({
@@ -394,22 +388,18 @@ var resolvePageLang = ({
 };
 
 // src/page/resolvePagePath.ts
-import { ensureEndingSlash } from "@vuepress/shared";
 import { logger as logger2, sanitizeFileName } from "@vuepress/utils";
 var resolvePagePath = ({
   permalink,
   pathInferred,
   options
 }) => {
-  let pagePath = options.path || permalink || pathInferred;
+  const pagePath = options.path || permalink || pathInferred;
   if (!pagePath) {
     throw logger2.createError(
       `page path is empty, page options: ${JSON.stringify(options, null, 2)}`
     );
   }
-  if (!pagePath.endsWith(".html")) {
-    pagePath = ensureEndingSlash(pagePath);
-  }
   return encodeURI(pagePath.split("/").map(sanitizeFileName).join("/"));
 };
 
@@ -508,25 +498,18 @@ var createPage = async (app, options) => {
     pathLocale
   });
   const path9 = resolvePagePath({ permalink, pathInferred, options });
-  const key = resolvePageKey({ path: path9 });
   const { htmlFilePath, htmlFilePathRelative } = resolvePageHtmlInfo({
     app,
     path: path9
   });
-  const {
-    componentFilePath,
-    componentFilePathRelative,
-    componentFileChunkName
-  } = await resolvePageComponentInfo({
+  const { componentFilePath, componentFilePathRelative } = await resolvePageComponentInfo({
     app,
-    htmlFilePathRelative,
-    key
+    htmlFilePathRelative
   });
-  const { dataFilePath, dataFilePathRelative, dataFileChunkName } = resolvePageDataInfo({ app, htmlFilePathRelative, key });
+  const { chunkFilePath, chunkFilePathRelative, chunkName } = resolvePageChunkInfo({ app, htmlFilePathRelative });
   const page = {
     // page data
     data: {
-      key,
       path: path9,
       title,
       lang,
@@ -534,7 +517,6 @@ var createPage = async (app, options) => {
       headers
     },
     // base fields
-    key,
     path: path9,
     title,
     lang,
@@ -558,10 +540,9 @@ var createPage = async (app, options) => {
     filePathRelative,
     componentFilePath,
     componentFilePathRelative,
-    componentFileChunkName,
-    dataFilePath,
-    dataFilePathRelative,
-    dataFileChunkName,
+    chunkFilePath,
+    chunkFilePathRelative,
+    chunkName,
     htmlFilePath,
     htmlFilePathRelative
   };
@@ -580,13 +561,15 @@ var resolveAppPages = async (app) => {
   const pages = await Promise.all(
     pageFilePaths.map((filePath) => createPage(app, { filePath }))
   );
-  if (!pages.some((page) => page.path === "/404.html")) {
+  const notFoundPage = pages.find((page) => page.path === "/404.html");
+  if (notFoundPage) {
+    notFoundPage.frontmatter.layout ??= "NotFound";
+  } else {
     pages.push(
       await createPage(app, {
         path: "/404.html",
-        frontmatter: {
-          layout: "NotFound"
-        }
+        frontmatter: { layout: "NotFound" },
+        content: "404 Not Found"
       })
     );
   }
@@ -613,12 +596,10 @@ var appPrepare = async (app) => {
   for (const page of app.pages) {
     await preparePageComponent(app, page);
   }
-  await preparePagesComponents(app);
   for (const page of app.pages) {
-    await preparePageData(app, page);
+    await preparePageChunk(app, page);
   }
-  await preparePagesData(app);
-  await preparePagesRoutes(app);
+  await prepareRoutes(app);
   await prepareSiteData(app);
   await prepareClientConfigs(app);
   await app.pluginApi.hooks.onPrepared.process(app);
@@ -1008,11 +989,9 @@ export {
   normalizeAliasDefineHook,
   normalizeClientConfigFileHook,
   prepareClientConfigs,
+  preparePageChunk,
   preparePageComponent,
-  preparePageData,
-  preparePagesComponents,
-  preparePagesData,
-  preparePagesRoutes,
+  prepareRoutes,
   prepareSiteData,
   renderPageContent,
   resolveAppDir,
@@ -1022,13 +1001,12 @@ export {
   resolveAppSiteData,
   resolveAppVersion,
   resolveAppWriteTemp,
+  resolvePageChunkInfo,
   resolvePageComponentInfo,
-  resolvePageDataInfo,
   resolvePageDate,
   resolvePageFileContent,
   resolvePageFilePath,
   resolvePageHtmlInfo,
-  resolvePageKey,
   resolvePageLang,
   resolvePagePath,
   resolvePagePermalink,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -28,10 +28,10 @@
   ],
   "dependencies": {
     "vue": "^3.4.15",
-    "@vuepress/client": "2.0.0-rc.2",
-    "@vuepress/markdown": "2.0.0-rc.2",
-    "@vuepress/utils": "2.0.0-rc.2",
-    "@vuepress/shared": "2.0.0-rc.2"
+    "@vuepress/client": "2.0.0-rc.3",
+    "@vuepress/markdown": "2.0.0-rc.3",
+    "@vuepress/shared": "2.0.0-rc.3",
+    "@vuepress/utils": "2.0.0-rc.3"
   },
   "publishConfig": {
     "access": "public"