@vuepress/core 2.0.0-beta.43 → 2.0.0-beta.46

package/lib/app/appPrepare.js

@@ -30,12 +30,8 @@ const appPrepare = async (app) => {
     await (0, prepare_1.prepareLayoutComponents)(app);
     // generate site data file
     await (0, prepare_1.prepareSiteData)(app);
-    // generate client app enhances file
-    await (0, prepare_1.prepareClientAppEnhances)(app);
-    // generate client app root components file
-    await (0, prepare_1.prepareClientAppRootComponents)(app);
-    // generate client app setups file
-    await (0, prepare_1.prepareClientAppSetups)(app);
+    // generate client configs file
+    await (0, prepare_1.prepareClientConfigs)(app);
     // plugin hook: onPrepared
     await app.pluginApi.hooks.onPrepared.process(app);
     log('prepare finish');

package/lib/app/prepare/index.d.ts

@@ -1,6 +1,4 @@
-export * from './prepareClientAppEnhances';
-export * from './prepareClientAppRootComponents';
-export * from './prepareClientAppSetups';
+export * from './prepareClientConfigs';
 export * from './prepareLayoutComponents';
 export * from './preparePageComponent';
 export * from './preparePageData';

package/lib/app/prepare/index.js

@@ -14,9 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./prepareClientAppEnhances"), exports);
-__exportStar(require("./prepareClientAppRootComponents"), exports);
-__exportStar(require("./prepareClientAppSetups"), exports);
+__exportStar(require("./prepareClientConfigs"), exports);
 __exportStar(require("./prepareLayoutComponents"), exports);
 __exportStar(require("./preparePageComponent"), exports);
 __exportStar(require("./preparePageData"), exports);

package/lib/app/prepare/prepareClientConfigs.d.ts

@@ -0,0 +1,5 @@
+import type { App } from '../../types';
+/**
+ * Generate client configs temp file
+ */
+export declare const prepareClientConfigs: (app: App) => Promise<void>;

package/lib/app/prepare/prepareClientConfigs.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareClientConfigs = void 0;
+/**
+ * Generate client configs temp file
+ */
+const prepareClientConfigs = async (app) => {
+    // plugin hook: clientConfigFile
+    const clientConfigFiles = await app.pluginApi.hooks.clientConfigFile.process(app);
+    // generate client config files entry
+    const content = `\
+${clientConfigFiles
+        .map((filePath, index) => `import clientConfig${index} from '${filePath}'`)
+        .join('\n')}
+
+export const clientConfigs = [
+${clientConfigFiles.map((_, index) => `  clientConfig${index},`).join('\n')}
+]
+`;
+    await app.writeTemp('internal/clientConfigs.js', content);
+};
+exports.prepareClientConfigs = prepareClientConfigs;

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/pluginApi/createPluginApiHooks.js

@@ -14,10 +14,8 @@ const createPluginApiHooks = () => ({
     extendsPageOptions: (0, createHookQueue_1.createHookQueue)('extendsPageOptions'),
     extendsPage: (0, createHookQueue_1.createHookQueue)('extendsPage'),
     extendsBundlerOptions: (0, createHookQueue_1.createHookQueue)('extendsBundlerOptions'),
-    // client files hooks
-    clientAppEnhanceFiles: (0, createHookQueue_1.createHookQueue)('clientAppEnhanceFiles'),
-    clientAppRootComponentFiles: (0, createHookQueue_1.createHookQueue)('clientAppRootComponentFiles'),
-    clientAppSetupFiles: (0, createHookQueue_1.createHookQueue)('clientAppSetupFiles'),
+    // client config file hooks
+    clientConfigFile: (0, createHookQueue_1.createHookQueue)('clientConfigFile'),
     // bundler hooks
     alias: (0, createHookQueue_1.createHookQueue)('alias'),
     define: (0, createHookQueue_1.createHookQueue)('define'),

package/lib/pluginApi/createPluginApiRegisterHooks.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPluginApiRegisterHooks = void 0;
-const normalizeClientFilesHook_1 = require("./normalizeClientFilesHook");
+const normalizeClientConfigFileHook_1 = require("./normalizeClientConfigFileHook");
 const normalizeReturnObjectHook_1 = require("./normalizeReturnObjectHook");
 const createPluginApiRegisterHooks = (plugins, hooks) => () => {
-    plugins.forEach(({ name: pluginName, alias, define, clientAppEnhanceFiles, clientAppRootComponentFiles, clientAppSetupFiles, ...commonHooks }) => {
+    plugins.forEach(({ name: pluginName, alias, define, clientConfigFile, ...commonHooks }) => {
         /**
          * hooks that need to be normalized
          */
@@ -20,22 +20,10 @@ const createPluginApiRegisterHooks = (plugins, hooks) => () => {
                 hook: (0, normalizeReturnObjectHook_1.normalizeReturnObjectHook)(define),
             });
         }
-        if (clientAppEnhanceFiles) {
-            hooks.clientAppEnhanceFiles.add({
+        if (clientConfigFile) {
+            hooks.clientConfigFile.add({
                 pluginName,
-                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppEnhanceFiles),
-            });
-        }
-        if (clientAppRootComponentFiles) {
-            hooks.clientAppRootComponentFiles.add({
-                pluginName,
-                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppRootComponentFiles),
-            });
-        }
-        if (clientAppSetupFiles) {
-            hooks.clientAppSetupFiles.add({
-                pluginName,
-                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppSetupFiles),
+                hook: (0, normalizeClientConfigFileHook_1.normalizeClientConfigFileHook)(clientConfigFile),
             });
         }
         /**

package/lib/pluginApi/index.d.ts

@@ -2,5 +2,5 @@ export * from './createHookQueue';
 export * from './createPluginApi';
 export * from './createPluginApiHooks';
 export * from './createPluginApiRegisterHooks';
+export * from './normalizeClientConfigFileHook';
 export * from './normalizeReturnObjectHook';
-export * from './normalizeClientFilesHook';

package/lib/pluginApi/index.js

@@ -18,5 +18,5 @@ __exportStar(require("./createHookQueue"), exports);
 __exportStar(require("./createPluginApi"), exports);
 __exportStar(require("./createPluginApiHooks"), exports);
 __exportStar(require("./createPluginApiRegisterHooks"), exports);
+__exportStar(require("./normalizeClientConfigFileHook"), exports);
 __exportStar(require("./normalizeReturnObjectHook"), exports);
-__exportStar(require("./normalizeClientFilesHook"), exports);

package/lib/pluginApi/normalizeClientConfigFileHook.d.ts

@@ -0,0 +1,5 @@
+import type { ClientConfigFileHook } from '../types';
+/**
+ * Normalize hook for client config file
+ */
+export declare const normalizeClientConfigFileHook: (hook: ClientConfigFileHook['exposed']) => ClientConfigFileHook['normalized'];

package/lib/pluginApi/normalizeClientConfigFileHook.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeClientConfigFileHook = void 0;
+const shared_1 = require("@vuepress/shared");
+const utils_1 = require("@vuepress/utils");
+/**
+ * Normalize hook for client config file
+ */
+const normalizeClientConfigFileHook = (hook) => async (app) => {
+    // resolve clientConfigFile result
+    const clientConfigFileResult = (0, shared_1.isFunction)(hook) ? await hook(app) : hook;
+    // filter files that do not exist
+    const isExisted = await utils_1.fs.pathExists(clientConfigFileResult);
+    if (!isExisted) {
+        throw utils_1.logger.createError(`client config file does not exist: ${clientConfigFileResult}`);
+    }
+    return clientConfigFileResult;
+};
+exports.normalizeClientConfigFileHook = normalizeClientConfigFileHook;

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

@@ -12,7 +12,7 @@ export declare type Hook<Exposed, Normalized = Exposed, Result = Normalized exte
 };
 export declare type LifeCycleHook<T extends unknown[] = []> = Hook<(app: App, ...args: T) => PromiseOrNot<void>>;
 export declare type ExtendsHook<T> = Hook<(extendable: T, app: App) => PromiseOrNot<void>>;
-export declare type ClientFilesHook = Hook<string | string[] | ((app: App) => PromiseOrNot<string | string[]>), (app: App) => Promise<string[]>>;
+export declare type ClientConfigFileHook = Hook<string | ((app: App) => PromiseOrNot<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>>>;
 /**
  * List of hooks
@@ -27,9 +27,7 @@ export interface Hooks {
     extendsPageOptions: ExtendsHook<PageOptions>;
     extendsPage: ExtendsHook<Page>;
     extendsBundlerOptions: ExtendsHook<any>;
-    clientAppEnhanceFiles: ClientFilesHook;
-    clientAppRootComponentFiles: ClientFilesHook;
-    clientAppSetupFiles: ClientFilesHook;
+    clientConfigFile: ClientConfigFileHook;
     alias: ReturnObjectHook;
     define: ReturnObjectHook;
 }

package/package.json

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

package/lib/app/prepare/prepareClientAppEnhances.d.ts

@@ -1,5 +0,0 @@
-import type { App } from '../../types';
-/**
- * Generate client app enhances temp file
- */
-export declare const prepareClientAppEnhances: (app: App) => Promise<void>;

package/lib/app/prepare/prepareClientAppEnhances.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareClientAppEnhances = void 0;
-/**
- * Generate client app enhances temp file
- */
-const prepareClientAppEnhances = async (app) => {
-    // plugin hook: clientAppEnhanceFiles
-    const clientAppEnhanceFiles = await app.pluginApi.hooks.clientAppEnhanceFiles.process(app);
-    // flat the hook result to get the file paths array
-    const filePaths = clientAppEnhanceFiles.flat();
-    // generate client app enhance files entry
-    const content = `\
-${filePaths
-        .map((filePath, index) => `import clientAppEnhance${index} from '${filePath}'`)
-        .join('\n')}
-
-export const clientAppEnhances = [
-${filePaths.map((_, index) => `  clientAppEnhance${index},`).join('\n')}
-]
-`;
-    await app.writeTemp('internal/clientAppEnhances.js', content);
-};
-exports.prepareClientAppEnhances = prepareClientAppEnhances;

package/lib/app/prepare/prepareClientAppRootComponents.d.ts

@@ -1,5 +0,0 @@
-import type { App } from '../../types';
-/**
- * Generate client app root components temp file
- */
-export declare const prepareClientAppRootComponents: (app: App) => Promise<void>;

package/lib/app/prepare/prepareClientAppRootComponents.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareClientAppRootComponents = void 0;
-/**
- * Generate client app root components temp file
- */
-const prepareClientAppRootComponents = async (app) => {
-    // plugin hook: clientAppRootComponentFiles
-    const clientAppRootComponentFiles = await app.pluginApi.hooks.clientAppRootComponentFiles.process(app);
-    // flat the hook result to get the file paths array
-    const filePaths = clientAppRootComponentFiles.flat();
-    // generate client app root components files entry
-    const content = `\
-${filePaths
-        .map((filePath, index) => `import clientAppRootComponent${index} from '${filePath}'`)
-        .join('\n')}
-
-export const clientAppRootComponents = [
-${filePaths.map((_, index) => `  clientAppRootComponent${index},`).join('\n')}
-]
-`;
-    await app.writeTemp('internal/clientAppRootComponents.js', content);
-};
-exports.prepareClientAppRootComponents = prepareClientAppRootComponents;

package/lib/app/prepare/prepareClientAppSetups.d.ts

@@ -1,5 +0,0 @@
-import type { App } from '../../types';
-/**
- * Generate client app setups temp file
- */
-export declare const prepareClientAppSetups: (app: App) => Promise<void>;

package/lib/app/prepare/prepareClientAppSetups.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareClientAppSetups = void 0;
-/**
- * Generate client app setups temp file
- */
-const prepareClientAppSetups = async (app) => {
-    // plugin hook: clientAppSetupFiles
-    const clientAppSetupFiles = await app.pluginApi.hooks.clientAppSetupFiles.process(app);
-    // flat the hook result to get the file paths array
-    const filePaths = clientAppSetupFiles.flat();
-    // generate client app setup files entry
-    const content = `\
-${filePaths
-        .map((filePath, index) => `import clientAppSetup${index} from '${filePath}'`)
-        .join('\n')}
-
-export const clientAppSetups = [
-${filePaths.map((_, index) => `  clientAppSetup${index},`).join('\n')}
-]
-`;
-    await app.writeTemp('internal/clientAppSetups.js', content);
-};
-exports.prepareClientAppSetups = prepareClientAppSetups;

package/lib/pluginApi/normalizeClientFilesHook.d.ts

@@ -1,5 +0,0 @@
-import type { ClientFilesHook } from '../types';
-/**
- * Normalize hook for client files
- */
-export declare const normalizeClientFilesHook: (hook: ClientFilesHook['exposed']) => ClientFilesHook['normalized'];

package/lib/pluginApi/normalizeClientFilesHook.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeClientFilesHook = void 0;
-const shared_1 = require("@vuepress/shared");
-const utils_1 = require("@vuepress/utils");
-/**
- * Normalize hook for client files
- */
-const normalizeClientFilesHook = (hook) => async (app) => {
-    // resolve clientFiles result
-    const clientFilesResult = (0, shared_1.isFunction)(hook) ? await hook(app) : hook;
-    const clientFiles = (0, shared_1.isArray)(clientFilesResult)
-        ? clientFilesResult
-        : [clientFilesResult];
-    // filter files that do not exist
-    const result = [];
-    for (const filePath of clientFiles) {
-        const isExisted = await utils_1.fs.pathExists(filePath);
-        if (isExisted) {
-            result.push(filePath);
-        }
-        else {
-            throw utils_1.logger.createError(`client file does not exist: ${filePath}`);
-        }
-    }
-    return result;
-};
-exports.normalizeClientFilesHook = normalizeClientFilesHook;