@vuepress/core 2.0.0-beta.50 → 2.0.0-beta.52

package/dist/index.d.ts

@@ -299,10 +299,6 @@ interface ThemeObject extends Omit<PluginObject, 'multiple'> {
      * Extended parent theme
      */
     extends?: Theme;
-    /**
-     * Specify the layouts directory or components map
-     */
-    layouts?: string | Record<string, string>;
     /**
      * Allow using plugins in theme
      */
@@ -320,10 +316,6 @@ interface ThemeObject extends Omit<PluginObject, 'multiple'> {
  * Resolved theme info
  */
 interface ThemeInfo {
-    /**
-     * Layout components
-     */
-    layouts: Record<string, string>;
     /**
      * Plugins, including theme itself and plugins used by theme
      */
@@ -504,12 +496,6 @@ interface App {
      * Should be called after `app.init()`.
      */
     prepare: () => Promise<void>;
-    /**
-     * Layout components.
-     *
-     * Only available after initialization
-     */
-    layouts: Record<string, string>;
     /**
      * Markdown-it instance.
      *
@@ -551,11 +537,6 @@ interface BuildApp extends App {
  */
 declare const prepareClientConfigs: (app: App) => Promise<void>;
 
-/**
- * Generate layout components temp file
- */
-declare const prepareLayoutComponents: (app: App) => Promise<void>;
-
 /**
  * Generate page component temp file of a single page
  */
@@ -654,7 +635,7 @@ declare const resolveAppSiteData: (options: AppOptions) => SiteData;
 /**
  * Resolve version of vuepress app
  */
-declare const resolveAppVersion: () => Promise<string>;
+declare const resolveAppVersion: () => string;
 
 /**
  * Resolve write temp file util for vuepress app
@@ -671,11 +652,6 @@ declare const resolvePluginObject: <T extends PluginObject = PluginObject>(app:
  */
 declare const resolveThemeInfo: (app: App, theme: Theme) => ThemeInfo;
 
-/**
- * Resolve layouts from `layouts` option
- */
-declare const resolveThemeLayouts: (layouts?: ThemeObject['layouts']) => Record<string, string>;
-
 declare const createPage: (app: App, options: PageOptions) => Promise<Page>;
 
 /**
@@ -847,4 +823,4 @@ declare const normalizeAliasDefineHook: (hook: AliasDefineHook['exposed']) => Al
  */
 declare const normalizeClientConfigFileHook: (hook: ClientConfigFileHook['exposed']) => ClientConfigFileHook['normalized'];
 
-export { AliasDefineHook, App, AppConfig, AppConfigBuild, AppConfigCommon, AppConfigDev, AppDir, AppDirFunction, AppEnv, AppOptions, AppWriteTemp, BuildApp, Bundler, ClientConfigFileHook, DevApp, ExtendsHook, Hook, HookItem, HookQueue, Hooks, HooksExposed, HooksName, HooksNormalized, HooksResult, LifeCycleHook, Page, PageOptions, Plugin, PluginApi, PluginConfig, PluginFunction, PluginObject, Theme, ThemeFunction, ThemeInfo, ThemeObject, appInit, appPrepare, appUse, createAppDirFunction, createBaseApp, createBuildApp, createDevApp, createHookQueue, createPage, createPluginApi, createPluginApiHooks, createPluginApiRegisterHooks, inferPagePath, normalizeAliasDefineHook, normalizeClientConfigFileHook, prepareClientConfigs, prepareLayoutComponents, 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, resolveThemeLayouts };
+export { AliasDefineHook, App, AppConfig, AppConfigBuild, AppConfigCommon, AppConfigDev, AppDir, AppDirFunction, AppEnv, AppOptions, AppWriteTemp, BuildApp, Bundler, ClientConfigFileHook, DevApp, ExtendsHook, Hook, HookItem, HookQueue, Hooks, HooksExposed, HooksName, HooksNormalized, HooksResult, LifeCycleHook, Page, PageOptions, Plugin, PluginApi, PluginConfig, PluginFunction, PluginObject, Theme, ThemeFunction, ThemeInfo, 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 };

package/dist/index.js

@@ -12,19 +12,6 @@ ${clientConfigFiles.map((_, index) => `  clientConfig${index},`).join("\n")}
   await app.writeTemp("internal/clientConfigs.js", content);
 };
 
-// src/app/prepare/prepareLayoutComponents.ts
-var prepareLayoutComponents = async (app) => {
-  const content = `import { defineAsyncComponent } from 'vue'
-
-export const layoutComponents = {${Object.entries(app.layouts).map(
-    ([name, path10]) => `
-  ${JSON.stringify(name)}: defineAsyncComponent(() => import(${app.env.isDebug ? `/* webpackChunkName: "layout-${name}" */` : ""}${JSON.stringify(path10)})),`
-  ).join("")}
-}
-`;
-  await app.writeTemp("internal/layoutComponents.js", content);
-};
-
 // src/app/prepare/preparePageComponent.ts
 var preparePageComponent = async (app, page) => {
   await app.writeTemp(
@@ -71,8 +58,8 @@ var preparePagesComponents = async (app) => {
   const content = `import { defineAsyncComponent } from 'vue'
 
 export const pagesComponents = {${app.pages.map(
-    ({ key, path: path10, componentFilePath, componentFileChunkName }) => `
-  // path: ${path10}
+    ({ key, path: path9, componentFilePath, componentFileChunkName }) => `
+  // path: ${path9}
   ${JSON.stringify(key)}: defineAsyncComponent(() => import(${componentFileChunkName ? `/* webpackChunkName: "${componentFileChunkName}" */` : ""}${JSON.stringify(componentFilePath)})),`
   ).join("")}
 }
@@ -83,8 +70,8 @@ export const pagesComponents = {${app.pages.map(
 // src/app/prepare/preparePagesData.ts
 var preparePagesData = async (app) => {
   const content = `export const pagesData = {${app.pages.map(
-    ({ key, path: path10, dataFilePath, dataFileChunkName }) => `
-  // path: ${path10}
+    ({ key, path: path9, dataFilePath, dataFileChunkName }) => `
+  // path: ${path9}
   ${JSON.stringify(key)}: () => import(${dataFileChunkName ? `/* webpackChunkName: "${dataFileChunkName}" */` : ""}${JSON.stringify(dataFilePath)}).then(({ data }) => data),`
   ).join("")}
 }
@@ -96,17 +83,17 @@ var preparePagesData = async (app) => {
 import { ensureLeadingSlash } from "@vuepress/shared";
 var resolvePageRouteItem = ({
   key,
-  path: path10,
+  path: path9,
   pathInferred,
   filePathRelative,
   routeMeta
 }) => {
   const redirectsSet = /* @__PURE__ */ new Set();
-  redirectsSet.add(decodeURI(path10));
-  if (path10.endsWith("/")) {
-    redirectsSet.add(path10 + "index.html");
+  redirectsSet.add(decodeURI(path9));
+  if (path9.endsWith("/")) {
+    redirectsSet.add(path9 + "index.html");
   } else {
-    redirectsSet.add(path10.replace(/.html$/, ""));
+    redirectsSet.add(path9.replace(/.html$/, ""));
   }
   if (pathInferred !== null) {
     redirectsSet.add(pathInferred);
@@ -117,8 +104,8 @@ var resolvePageRouteItem = ({
     redirectsSet.add(filenamePath);
     redirectsSet.add(encodeURI(filenamePath));
   }
-  redirectsSet.delete(path10);
-  return [key, path10, routeMeta, [...redirectsSet]];
+  redirectsSet.delete(path9);
+  return [key, path9, routeMeta, [...redirectsSet]];
 };
 var preparePagesRoutes = async (app) => {
   const routeItems = app.pages.map(resolvePageRouteItem);
@@ -218,6 +205,7 @@ var renderPageContent = async ({
       template: null,
       script: null,
       scriptSetup: null,
+      scripts: [],
       styles: [],
       customBlocks: []
     },
@@ -380,7 +368,7 @@ var resolvePageHtmlInfo = ({
 
 // src/page/resolvePageKey.ts
 import { hash } from "@vuepress/utils";
-var resolvePageKey = ({ path: path10 }) => `v-${hash(path10)}`;
+var resolvePageKey = ({ path: path9 }) => `v-${hash(path9)}`;
 
 // src/page/resolvePageLang.ts
 import { isString as isString2 } from "@vuepress/shared";
@@ -509,11 +497,11 @@ var createPage = async (app, options) => {
     pathInferred,
     pathLocale
   });
-  const path10 = resolvePagePath({ permalink, pathInferred, options });
-  const key = resolvePageKey({ path: path10 });
+  const path9 = resolvePagePath({ permalink, pathInferred, options });
+  const key = resolvePageKey({ path: path9 });
   const { htmlFilePath, htmlFilePathRelative } = resolvePageHtmlInfo({
     app,
-    path: path10
+    path: path9
   });
   const {
     componentFilePath,
@@ -528,7 +516,7 @@ var createPage = async (app, options) => {
   const page = {
     data: {
       key,
-      path: path10,
+      path: path9,
       title,
       lang,
       frontmatter,
@@ -536,7 +524,7 @@ var createPage = async (app, options) => {
       headers
     },
     key,
-    path: path10,
+    path: path9,
     title,
     lang,
     frontmatter,
@@ -584,7 +572,7 @@ var resolveAppPages = async (app) => {
       await createPage(app, {
         path: "/404.html",
         frontmatter: {
-          layout: "404"
+          layout: "NotFound"
         }
       })
     );
@@ -618,7 +606,6 @@ var appPrepare = async (app) => {
   }
   await preparePagesData(app);
   await preparePagesRoutes(app);
-  await prepareLayoutComponents(app);
   await prepareSiteData(app);
   await prepareClientConfigs(app);
   await app.pluginApi.hooks.onPrepared.process(app);
@@ -736,6 +723,7 @@ var createPluginApiRegisterHooks = (plugins, hooks) => () => {
   plugins.forEach(
     ({
       name: pluginName,
+      multiple,
       alias,
       define,
       clientConfigFile,
@@ -759,11 +747,11 @@ var createPluginApiRegisterHooks = (plugins, hooks) => () => {
           hook: normalizeClientConfigFileHook(clientConfigFile)
         });
       }
-      Object.entries(commonHooks).forEach(([key, hook]) => {
-        if (hooks[key] && hook) {
+      Object.keys(commonHooks).forEach((key) => {
+        if (hooks[key] && commonHooks[key]) {
           hooks[key].add({
             pluginName,
-            hook
+            hook: commonHooks[key]
           });
         }
       });
@@ -892,8 +880,8 @@ var resolveAppSiteData = (options) => ({
 import { createRequire as createRequire3 } from "module";
 import { fs as fs3 } from "@vuepress/utils";
 var require4 = createRequire3(import.meta.url);
-var resolveAppVersion = async () => {
-  const pkgJson = await fs3.readJSON(
+var resolveAppVersion = () => {
+  const pkgJson = fs3.readJsonSync(
     require4.resolve("@vuepress/core/package.json")
   );
   return pkgJson.version;
@@ -915,28 +903,10 @@ var resolveAppWriteTemp = (dir) => {
   return writeTemp;
 };
 
-// src/app/resolveThemeLayouts.ts
-import { isPlainObject } from "@vuepress/shared";
-import { chalk as chalk3, fs as fs5, logger as logger5, path as path9 } from "@vuepress/utils";
-var resolveThemeLayouts = (layouts = {}) => {
-  if (isPlainObject(layouts)) {
-    return layouts;
-  }
-  if (!fs5.pathExistsSync(layouts)) {
-    throw logger5.createError(
-      `layouts directory does not exist: ${chalk3.magenta(layouts)}`
-    );
-  }
-  return Object.fromEntries(
-    fs5.readdirSync(layouts).filter((file) => /\.(vue|ts|js)$/.test(file)).map((file) => [path9.trimExt(file), path9.resolve(layouts, file)])
-  );
-};
-
 // src/app/resolveThemeInfo.ts
 var resolveThemeInfo = (app, theme) => {
   const themeObject = resolvePluginObject(app, theme);
   const themeInfo = {
-    layouts: resolveThemeLayouts(themeObject.layouts),
     plugins: [...themeObject.plugins ?? [], themeObject],
     templateBuild: themeObject.templateBuild,
     templateDev: themeObject.templateDev
@@ -946,7 +916,6 @@ var resolveThemeInfo = (app, theme) => {
   }
   const parentThemeInfo = resolveThemeInfo(app, themeObject.extends);
   return {
-    layouts: { ...parentThemeInfo.layouts, ...themeInfo.layouts },
     plugins: [...parentThemeInfo.plugins, ...themeInfo.plugins],
     templateBuild: themeObject.templateBuild ?? parentThemeInfo.templateBuild,
     templateDev: themeObject.templateDev ?? parentThemeInfo.templateDev
@@ -956,7 +925,6 @@ var resolveThemeInfo = (app, theme) => {
 // src/app/setupAppThemeAndPlugins.ts
 var setupAppThemeAndPlugins = (app, config) => {
   const themeInfo = resolveThemeInfo(app, app.options.theme);
-  app.layouts = themeInfo.layouts;
   app.options.templateDev = config.templateDev ?? themeInfo.templateDev ?? app.options.templateDev;
   app.options.templateBuild = config.templateBuild ?? themeInfo.templateBuild ?? app.options.templateBuild;
   [...themeInfo.plugins, ...app.options.plugins].flat().forEach((plugin) => app.use(plugin));
@@ -1017,7 +985,6 @@ export {
   normalizeAliasDefineHook,
   normalizeClientConfigFileHook,
   prepareClientConfigs,
-  prepareLayoutComponents,
   preparePageComponent,
   preparePageData,
   preparePagesComponents,
@@ -1045,6 +1012,5 @@ export {
   resolvePageRouteMeta,
   resolvePageSlug,
   resolvePluginObject,
-  resolveThemeInfo,
-  resolveThemeLayouts
+  resolveThemeInfo
 };

package/package.json

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