vitepress-tuck 0.5.0 → 0.7.0

package/client-types.d.ts

@@ -1,7 +1,8 @@
 declare module 'virtual:enhance-app' {
 
+  import type { Awaitable } from '@pengzhanbo/utils'
   import type { EnhanceAppContext } from 'vitepress/client'
 
-  const enhanceApp: (ctx: EnhanceAppContext) => void
+  const enhanceApp: (ctx: EnhanceAppContext) => Awaitable<void>
   export default enhanceApp
 }

package/dist/index.js

@@ -44,8 +44,13 @@ const autoComponentsPlugin = definePlugin((options) => ({
 	})] }
 }));
 //#endregion
+//#region src/builtin-plugins/ssr-no-external-deps.ts
+const ssrNoExternalDepsPlugin = definePlugin(() => ({
+	name: "vitepress-tuck:deps",
+	vite: { ssr: { noExternal: ["vitepress-plugin-toolkit"] } }
+}));
+//#endregion
 //#region src/builtin-plugins/virtual-enhance-app.ts
-let uuid = 0;
 /**
 * Creates a Vite virtual module plugin that generates the
 * `virtual:enhance-app` module on the fly.
@@ -83,17 +88,15 @@ function virtualEnhanceApp(options) {
 		load(id) {
 			if (id === resolveId) {
 				const { imports = [], enhances } = options;
+				const importList = [...imports];
 				const enhanceCode = [];
+				let uuid = 0;
 				enhances?.forEach(({ moduleName, exportName }) => {
 					const alias = `${exportName}$${uuid++}`;
-					imports.push(`import { ${exportName} as ${alias} } from '${moduleName}/client'`);
-					enhanceCode.push(`  ${alias}(ctx)`);
+					importList.push(`import { ${exportName} as ${alias} } from '${moduleName}/client'`);
+					enhanceCode.push(`  await ${alias}(ctx)`);
 				});
-				return `${imports.join("\n")}\n
-export default function enhanceApp(ctx) {
-${enhanceCode.join("\n")}
-}
-`;
+				return `${importList.join("\n")}\n\nexport default async function enhanceApp(ctx) {\n${enhanceCode.join("\n")}\n}\n`;
 			}
 		}
 	};
@@ -131,10 +134,7 @@ function builtinPlugins(options) {
 	return [
 		virtualEnhanceAppPlugin(options.enhanceApp),
 		autoComponentsPlugin(options.components),
-		() => ({
-			name: "vitepress-tuck:deps",
-			vite: { ssr: { noExternal: ["vitepress-plugin-toolkit"] } }
-		})
+		ssrNoExternalDepsPlugin()
 	];
 }
 //#endregion
@@ -180,22 +180,32 @@ function mergePluginHooks(hooks, config) {
 	if (hooks.transformHtml.length) {
 		const transformHtml = config.transformHtml;
 		config.transformHtml = async (code, id, ctx) => {
-			for (const hook of hooks.transformHtml) code = await hook(code, id, ctx) || code;
-			return await transformHtml?.(code, id, ctx) || code;
+			for (const hook of hooks.transformHtml) code = await hook(code, id, ctx) ?? code;
+			return await transformHtml?.(code, id, ctx) ?? code;
 		};
 	}
 	if (hooks.transformPageData.length) {
 		const transformPageData = config.transformPageData;
 		config.transformPageData = async (pageData, ctx) => {
-			for (const hook of hooks.transformPageData) pageData = await hook(pageData, ctx) || pageData;
-			return await transformPageData?.(pageData, ctx) || pageData;
+			for (const hook of hooks.transformPageData) {
+				const result = await hook(pageData, ctx);
+				if (result) pageData = {
+					...pageData,
+					...result
+				};
+			}
+			const result = await transformPageData?.(pageData, ctx);
+			return result ? {
+				...pageData,
+				...result
+			} : pageData;
 		};
 	}
 	if (hooks.postRender.length) {
 		const postRender = config.postRender;
 		config.postRender = async (context) => {
-			for (const hook of hooks.postRender) context = await hook(context) || context;
-			return await postRender?.(context) || context;
+			for (const hook of hooks.postRender) context = await hook(context) ?? context;
+			return await postRender?.(context) ?? context;
 		};
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitepress-tuck",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Enhance vitepress configuration, provide plugins capability.",
   "author": "pengzhanbo <q942450674@outlook.com> (https://github.com/pengzhanbo/)",
   "license": "MIT",