@moku-labs/web 0.5.1 → 0.5.3

package/dist/index.cjs

@@ -3339,14 +3339,15 @@ function resolveJsEntrypoints(ctx) {
 * @param runner - The bundler runner to invoke.
 * @param kind - The asset kind label (`"css"` / `"js"`) — used as the cache key.
 * @param entrypoints - Resolved entry files (skipped when empty).
-* @param outdir - The output directory.
+* @param outDir - The publish root; stored asset paths are made relative to it.
+* @param outdir - The bundler output directory (`<outDir>/assets`).
 * @param minify - Whether to minify.
 * @example
 * ```ts
 * await runOne(ctx, runner, "css", ["a.css"], "dist", true);
 * ```
 */
-async function runOne(ctx, runner, kind, entrypoints, outdir, minify) {
+async function runOne(ctx, runner, kind, entrypoints, outDir, outdir, minify) {
 	if (entrypoints.length === 0) return;
 	const result = await runner({
 		entrypoints,
@@ -3355,7 +3356,10 @@ async function runOne(ctx, runner, kind, entrypoints, outdir, minify) {
 	});
 	if (!result.success) throw new Error(`[web] build.bundle ${kind} build failed`);
 	const hashed = {};
-	for (const output of result.outputs) hashed[node_path$1.default.basename(output.path)] = output.path;
+	for (const output of result.outputs) {
+		const webPath = node_path$1.default.relative(node_path$1.default.resolve(outDir), node_path$1.default.resolve(output.path)).split(node_path$1.default.sep).join("/");
+		hashed[node_path$1.default.basename(output.path)] = webPath;
+	}
 	ctx.state.buildCache.set(kind, hashed);
 	ctx.log.debug("build:bundle", {
 		kind,
@@ -3380,8 +3384,8 @@ async function bundle(ctx, options = {}) {
 	const { minify, outDir } = ctx.config;
 	const cssEntrypoints = options.cssEntrypoints ?? resolveEntrypoints(CSS_ENTRY_CANDIDATES);
 	const jsEntrypoints = options.jsEntrypoints ?? resolveJsEntrypoints(ctx);
-	await runOne(ctx, runner, "css", cssEntrypoints, node_path$1.default.join(outDir, "assets"), minify);
-	await runOne(ctx, runner, "js", jsEntrypoints, node_path$1.default.join(outDir, "assets"), minify);
+	await runOne(ctx, runner, "css", cssEntrypoints, outDir, node_path$1.default.join(outDir, "assets"), minify);
+	await runOne(ctx, runner, "js", jsEntrypoints, outDir, node_path$1.default.join(outDir, "assets"), minify);
 }
 //#endregion
 //#region src/plugins/build/phases/content.ts

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import { ComponentChildren, VNode } from "preact";
 import { EmitFn } from "@moku-labs/core";
+import { BundledTheme, ThemeRegistrationAny } from "shiki";
 import { Pluggable, Processor } from "unified";
 
 //#region \0rolldown/runtime.js
@@ -1680,8 +1681,15 @@ type Config$1 = {
    */
   trustedContent: boolean; /** Additional remark plugins, concatenated AFTER framework defaults. Defaults to []. */
   extraRemarkPlugins?: readonly Pluggable[]; /** Additional rehype plugins, concatenated after custom transforms, before Shiki + sanitize. Defaults to []. */
-  extraRehypePlugins?: readonly Pluggable[]; /** Shiki theme name for syntax highlighting. Defaults to "github-dark". */
-  shikiTheme?: string; /** Author applied to articles whose frontmatter omits author. Defaults to undefined. */
+  extraRehypePlugins?: readonly Pluggable[];
+  /**
+   * Shiki theme for syntax highlighting: a bundled theme NAME — typed as Shiki's
+   * `BundledTheme` union so editors autocomplete the ~60 built-ins (default
+   * "github-dark") — or a custom `ThemeRegistration` object. Passed straight through
+   * to `@shikijs/rehype`'s `theme`. (Like Shiki's own theme type, an arbitrary string
+   * still compiles via the object arm, so this is autocomplete, not typo-rejection.)
+   */
+  shikiTheme?: BundledTheme | ThemeRegistrationAny; /** Author applied to articles whose frontmatter omits author. Defaults to undefined. */
   defaultAuthor?: string;
 };
 /**

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { EmitFn } from "@moku-labs/core";
 import { Pluggable, Processor } from "unified";
 import { ComponentChildren, VNode } from "preact";
+import { BundledTheme, ThemeRegistrationAny } from "shiki";
 
 //#region src/plugins/log/types.d.ts
 declare namespace types_d_exports$6 {
@@ -1680,8 +1681,15 @@ type Config$1 = {
    */
   trustedContent: boolean; /** Additional remark plugins, concatenated AFTER framework defaults. Defaults to []. */
   extraRemarkPlugins?: readonly Pluggable[]; /** Additional rehype plugins, concatenated after custom transforms, before Shiki + sanitize. Defaults to []. */
-  extraRehypePlugins?: readonly Pluggable[]; /** Shiki theme name for syntax highlighting. Defaults to "github-dark". */
-  shikiTheme?: string; /** Author applied to articles whose frontmatter omits author. Defaults to undefined. */
+  extraRehypePlugins?: readonly Pluggable[];
+  /**
+   * Shiki theme for syntax highlighting: a bundled theme NAME — typed as Shiki's
+   * `BundledTheme` union so editors autocomplete the ~60 built-ins (default
+   * "github-dark") — or a custom `ThemeRegistration` object. Passed straight through
+   * to `@shikijs/rehype`'s `theme`. (Like Shiki's own theme type, an arbitrary string
+   * still compiles via the object arm, so this is autocomplete, not typo-rejection.)
+   */
+  shikiTheme?: BundledTheme | ThemeRegistrationAny; /** Author applied to articles whose frontmatter omits author. Defaults to undefined. */
   defaultAuthor?: string;
 };
 /**

package/dist/index.mjs

@@ -3326,14 +3326,15 @@ function resolveJsEntrypoints(ctx) {
 * @param runner - The bundler runner to invoke.
 * @param kind - The asset kind label (`"css"` / `"js"`) — used as the cache key.
 * @param entrypoints - Resolved entry files (skipped when empty).
-* @param outdir - The output directory.
+* @param outDir - The publish root; stored asset paths are made relative to it.
+* @param outdir - The bundler output directory (`<outDir>/assets`).
 * @param minify - Whether to minify.
 * @example
 * ```ts
 * await runOne(ctx, runner, "css", ["a.css"], "dist", true);
 * ```
 */
-async function runOne(ctx, runner, kind, entrypoints, outdir, minify) {
+async function runOne(ctx, runner, kind, entrypoints, outDir, outdir, minify) {
 	if (entrypoints.length === 0) return;
 	const result = await runner({
 		entrypoints,
@@ -3342,7 +3343,10 @@ async function runOne(ctx, runner, kind, entrypoints, outdir, minify) {
 	});
 	if (!result.success) throw new Error(`[web] build.bundle ${kind} build failed`);
 	const hashed = {};
-	for (const output of result.outputs) hashed[path.basename(output.path)] = output.path;
+	for (const output of result.outputs) {
+		const webPath = path.relative(path.resolve(outDir), path.resolve(output.path)).split(path.sep).join("/");
+		hashed[path.basename(output.path)] = webPath;
+	}
 	ctx.state.buildCache.set(kind, hashed);
 	ctx.log.debug("build:bundle", {
 		kind,
@@ -3367,8 +3371,8 @@ async function bundle(ctx, options = {}) {
 	const { minify, outDir } = ctx.config;
 	const cssEntrypoints = options.cssEntrypoints ?? resolveEntrypoints(CSS_ENTRY_CANDIDATES);
 	const jsEntrypoints = options.jsEntrypoints ?? resolveJsEntrypoints(ctx);
-	await runOne(ctx, runner, "css", cssEntrypoints, path.join(outDir, "assets"), minify);
-	await runOne(ctx, runner, "js", jsEntrypoints, path.join(outDir, "assets"), minify);
+	await runOne(ctx, runner, "css", cssEntrypoints, outDir, path.join(outDir, "assets"), minify);
+	await runOne(ctx, runner, "js", jsEntrypoints, outDir, path.join(outDir, "assets"), minify);
 }
 //#endregion
 //#region src/plugins/build/phases/content.ts

package/package.json

@@ -112,5 +112,5 @@
     "test:integration": "vitest run --project integration",
     "test:coverage": "vitest run --project unit --project integration --coverage"
   },
-  "version": "0.5.1"
+  "version": "0.5.3"
 }