@moku-labs/web 0.5.0 → 0.5.2

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
@@ -3607,13 +3611,14 @@ async function expandRedirects(definition, entry, defaultLocale) {
 	const parameterSets = definition._handlers.generate ? await definition._handlers.generate(defaultLocale) : [{}];
 	const jobs = [];
 	for (const raw of parameterSets) {
-		const params = raw ?? {};
-		const file = entry.toFile(params);
+		const bareParams = { ...raw ?? {} };
+		delete bareParams.lang;
+		const file = entry.toFile(bareParams);
 		const target = entry.toUrl({
-			...params,
+			...bareParams,
 			lang: defaultLocale
 		});
-		if (target !== entry.toUrl(params)) jobs.push({
+		if (target !== entry.toUrl(bareParams)) jobs.push({
 			file,
 			target
 		});
@@ -3956,7 +3961,7 @@ async function generateOgImages(ctx, options = {}) {
 		try {
 			const png = await renderPng(input);
 			await (0, node_fs_promises.mkdir)(outDir, { recursive: true });
-			await (0, node_fs_promises.writeFile)(node_path.default.join(outDir, `${key}.png`), png);
+			await (0, node_fs_promises.writeFile)(node_path.default.join(outDir, `${article.computed.slug}.png`), png);
 			cache.set(key, hash);
 			rendered += 1;
 		} finally {

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
@@ -3594,13 +3598,14 @@ async function expandRedirects(definition, entry, defaultLocale) {
 	const parameterSets = definition._handlers.generate ? await definition._handlers.generate(defaultLocale) : [{}];
 	const jobs = [];
 	for (const raw of parameterSets) {
-		const params = raw ?? {};
-		const file = entry.toFile(params);
+		const bareParams = { ...raw ?? {} };
+		delete bareParams.lang;
+		const file = entry.toFile(bareParams);
 		const target = entry.toUrl({
-			...params,
+			...bareParams,
 			lang: defaultLocale
 		});
-		if (target !== entry.toUrl(params)) jobs.push({
+		if (target !== entry.toUrl(bareParams)) jobs.push({
 			file,
 			target
 		});
@@ -3943,7 +3948,7 @@ async function generateOgImages(ctx, options = {}) {
 		try {
 			const png = await renderPng(input);
 			await mkdir(outDir, { recursive: true });
-			await writeFile(path.join(outDir, `${key}.png`), png);
+			await writeFile(path.join(outDir, `${article.computed.slug}.png`), png);
 			cache.set(key, hash);
 			rendered += 1;
 		} finally {

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.0"
+  "version": "0.5.2"
 }