@mochi-css/next 3.0.1 → 4.0.1

package/dist/index.js

@@ -18,9 +18,11 @@ async function writeIfChanged(filePath, content) {
 async function writeCssFiles(css, tmpDir) {
 	await fs.default.promises.mkdir(tmpDir, { recursive: true });
 	const existingCssFiles = new Set((await fs.default.promises.readdir(tmpDir)).filter((f) => f.endsWith(".css") && f !== "global.css").map((f) => path.default.resolve(tmpDir, f)));
+	const normalizedSourcemods = {};
+	for (const [source, mod] of Object.entries(css.sourcemods ?? {})) normalizedSourcemods[source.replaceAll("\\", "/")] = mod;
 	const diskManifest = {
 		files: {},
-		sourcemods: css.sourcemods
+		sourcemods: Object.keys(normalizedSourcemods).length > 0 ? normalizedSourcemods : void 0
 	};
 	const writtenCssPaths = /* @__PURE__ */ new Set();
 	if (css.global) {
@@ -32,7 +34,7 @@ async function writeCssFiles(css, tmpDir) {
 		const hash = (0, __mochi_css_builder.fileHash)(source);
 		const cssPath = path.default.resolve(tmpDir, `${hash}.css`);
 		await writeIfChanged(cssPath, fileCss);
-		diskManifest.files[source] = cssPath;
+		diskManifest.files[source.replaceAll("\\", "/")] = cssPath;
 		writtenCssPaths.add(cssPath);
 	}
 	for (const existingPath of existingCssFiles) if (!writtenCssPaths.has(existingPath)) await fs.default.promises.unlink(existingPath);
@@ -47,6 +49,7 @@ let watcherStarted = false;
 async function startCssWatcher(tmpDir) {
 	if (watcherStarted) return;
 	watcherStarted = true;
+	process["__mochiWatcherActive"] = true;
 	const cwd = process.cwd();
 	const resolved = await (0, __mochi_css_config.resolveConfig)(await (0, __mochi_css_config.loadConfig)(), void 0, {});
 	const effectiveTmpDir = resolved.tmpDir ? path.default.resolve(cwd, resolved.tmpDir) : tmpDir;
@@ -100,6 +103,39 @@ async function startCssWatcher(tmpDir) {
 		});
 	}
 }
+/**
+* Runs a single CSS build and writes the manifest to `tmpDir`.
+* Used by `withMochi()` as a webpack `beforeRun` hook in production
+* to ensure the manifest is populated before webpack processes any files.
+*/
+async function buildCssOnce(tmpDir) {
+	const cwd = process.cwd();
+	const resolved = await (0, __mochi_css_config.resolveConfig)(await (0, __mochi_css_config.loadConfig)(), void 0, {});
+	const effectiveTmpDir = resolved.tmpDir ? path.default.resolve(cwd, resolved.tmpDir) : tmpDir;
+	const absoluteRoots = resolved.roots.map((root) => typeof root === "string" ? path.default.resolve(cwd, root) : {
+		...root,
+		path: path.default.resolve(cwd, root.path)
+	});
+	if (absoluteRoots.length === 0) {
+		console.warn("[mochi-css] buildCssOnce: no roots configured — add `roots` to mochi.config.ts");
+		return;
+	}
+	const context = new __mochi_css_config.FullContext(resolved.onDiagnostic ?? (() => {}));
+	for (const plugin of resolved.plugins) plugin.onLoad?.(context);
+	await writeCssFiles(await new __mochi_css_builder.Builder({
+		roots: absoluteRoots,
+		stages: [...context.stages.getAll()],
+		bundler: new __mochi_css_builder.RolldownBundler(),
+		runner: new __mochi_css_builder.VmRunner(),
+		splitCss: resolved.splitCss,
+		filePreProcess: ({ content, filePath }) => context.filePreProcess.transform(content, { filePath }),
+		sourceTransforms: [...context.sourceTransforms.getAll()],
+		emitHooks: [...context.emitHooks.getAll()],
+		cleanup: () => {
+			context.cleanup.runAll();
+		}
+	}).collectMochiCss(), effectiveTmpDir);
+}
 
 //#endregion
 //#region src/index.ts
@@ -117,7 +153,8 @@ const MANIFEST_FILE = "manifest.json";
 */
 function withMochi(nextConfig, opts) {
 	const manifestPath = opts?.manifestPath ?? path.default.resolve(MOCHI_DIR, MANIFEST_FILE);
-	if (process.env["NODE_ENV"] !== "production") startCssWatcher(path.default.dirname(manifestPath)).catch((err) => {
+	const tmpDir = path.default.dirname(manifestPath);
+	if (process.env["NODE_ENV"] !== "production") startCssWatcher(tmpDir).catch((err) => {
 		console.error("[mochi-css] watcher error:", err instanceof Error ? err.message : err);
 	});
 	const loaderPath = require.resolve("@mochi-css/next/loader");
@@ -172,6 +209,13 @@ function withMochi(nextConfig, opts) {
 				mod.rules ??= [];
 				mod.rules.push(loaderRule);
 			} else result["module"] = { rules: [loaderRule] };
+			if (process.env["NODE_ENV"] === "production") {
+				const plugins = result["plugins"] ?? [];
+				plugins.push({ apply(compiler) {
+					compiler.hooks.beforeRun.tapPromise("mochi-css", () => buildCssOnce(tmpDir));
+				} });
+				result["plugins"] = plugins;
+			}
 			return result;
 		}
 	};

package/dist/index.mjs

@@ -18,9 +18,11 @@ async function writeIfChanged(filePath, content) {
 async function writeCssFiles(css, tmpDir) {
 	await fs.promises.mkdir(tmpDir, { recursive: true });
 	const existingCssFiles = new Set((await fs.promises.readdir(tmpDir)).filter((f) => f.endsWith(".css") && f !== "global.css").map((f) => path.resolve(tmpDir, f)));
+	const normalizedSourcemods = {};
+	for (const [source, mod] of Object.entries(css.sourcemods ?? {})) normalizedSourcemods[source.replaceAll("\\", "/")] = mod;
 	const diskManifest = {
 		files: {},
-		sourcemods: css.sourcemods
+		sourcemods: Object.keys(normalizedSourcemods).length > 0 ? normalizedSourcemods : void 0
 	};
 	const writtenCssPaths = /* @__PURE__ */ new Set();
 	if (css.global) {
@@ -32,7 +34,7 @@ async function writeCssFiles(css, tmpDir) {
 		const hash = fileHash(source);
 		const cssPath = path.resolve(tmpDir, `${hash}.css`);
 		await writeIfChanged(cssPath, fileCss);
-		diskManifest.files[source] = cssPath;
+		diskManifest.files[source.replaceAll("\\", "/")] = cssPath;
 		writtenCssPaths.add(cssPath);
 	}
 	for (const existingPath of existingCssFiles) if (!writtenCssPaths.has(existingPath)) await fs.promises.unlink(existingPath);
@@ -47,6 +49,7 @@ let watcherStarted = false;
 async function startCssWatcher(tmpDir) {
 	if (watcherStarted) return;
 	watcherStarted = true;
+	process["__mochiWatcherActive"] = true;
 	const cwd = process.cwd();
 	const resolved = await resolveConfig(await loadConfig(), void 0, {});
 	const effectiveTmpDir = resolved.tmpDir ? path.resolve(cwd, resolved.tmpDir) : tmpDir;
@@ -100,6 +103,39 @@ async function startCssWatcher(tmpDir) {
 		});
 	}
 }
+/**
+* Runs a single CSS build and writes the manifest to `tmpDir`.
+* Used by `withMochi()` as a webpack `beforeRun` hook in production
+* to ensure the manifest is populated before webpack processes any files.
+*/
+async function buildCssOnce(tmpDir) {
+	const cwd = process.cwd();
+	const resolved = await resolveConfig(await loadConfig(), void 0, {});
+	const effectiveTmpDir = resolved.tmpDir ? path.resolve(cwd, resolved.tmpDir) : tmpDir;
+	const absoluteRoots = resolved.roots.map((root) => typeof root === "string" ? path.resolve(cwd, root) : {
+		...root,
+		path: path.resolve(cwd, root.path)
+	});
+	if (absoluteRoots.length === 0) {
+		console.warn("[mochi-css] buildCssOnce: no roots configured — add `roots` to mochi.config.ts");
+		return;
+	}
+	const context = new FullContext(resolved.onDiagnostic ?? (() => {}));
+	for (const plugin of resolved.plugins) plugin.onLoad?.(context);
+	await writeCssFiles(await new Builder({
+		roots: absoluteRoots,
+		stages: [...context.stages.getAll()],
+		bundler: new RolldownBundler(),
+		runner: new VmRunner(),
+		splitCss: resolved.splitCss,
+		filePreProcess: ({ content, filePath }) => context.filePreProcess.transform(content, { filePath }),
+		sourceTransforms: [...context.sourceTransforms.getAll()],
+		emitHooks: [...context.emitHooks.getAll()],
+		cleanup: () => {
+			context.cleanup.runAll();
+		}
+	}).collectMochiCss(), effectiveTmpDir);
+}
 
 //#endregion
 //#region src/index.ts
@@ -117,7 +153,8 @@ const MANIFEST_FILE = "manifest.json";
 */
 function withMochi(nextConfig, opts) {
 	const manifestPath = opts?.manifestPath ?? path.resolve(MOCHI_DIR, MANIFEST_FILE);
-	if (process.env["NODE_ENV"] !== "production") startCssWatcher(path.dirname(manifestPath)).catch((err) => {
+	const tmpDir = path.dirname(manifestPath);
+	if (process.env["NODE_ENV"] !== "production") startCssWatcher(tmpDir).catch((err) => {
 		console.error("[mochi-css] watcher error:", err instanceof Error ? err.message : err);
 	});
 	const loaderPath = __require.resolve("@mochi-css/next/loader");
@@ -172,6 +209,13 @@ function withMochi(nextConfig, opts) {
 				mod.rules ??= [];
 				mod.rules.push(loaderRule);
 			} else result["module"] = { rules: [loaderRule] };
+			if (process.env["NODE_ENV"] === "production") {
+				const plugins = result["plugins"] ?? [];
+				plugins.push({ apply(compiler) {
+					compiler.hooks.beforeRun.tapPromise("mochi-css", () => buildCssOnce(tmpDir));
+				} });
+				result["plugins"] = plugins;
+			}
 			return result;
 		}
 	};

package/dist/loader.js

@@ -21,8 +21,6 @@ function readManifest(manifestPath) {
 	return manifest;
 }
 function injectImports(ctx, manifest, source) {
-	const cssPath = manifest.files[ctx.resourcePath];
-	if (!cssPath) return source;
 	const imports = [];
 	const sourceDir = path.default.dirname(ctx.resourcePath);
 	function toImportPath(absPath) {
@@ -30,14 +28,18 @@ function injectImports(ctx, manifest, source) {
 		if (!rel.startsWith(".")) rel = "./" + rel;
 		return rel;
 	}
-	const absoluteCssPath = path.default.resolve(cssPath);
-	imports.push(`import ${JSON.stringify(toImportPath(absoluteCssPath))};`);
-	ctx.addDependency(absoluteCssPath);
+	const cssPath = manifest.files[ctx.resourcePath.replaceAll("\\", "/")];
+	if (cssPath) {
+		const absoluteCssPath = path.default.resolve(cssPath);
+		imports.push(`import ${JSON.stringify(toImportPath(absoluteCssPath))};`);
+		ctx.addDependency(absoluteCssPath);
+	}
 	if (manifest.global) {
 		const absoluteGlobalPath = path.default.resolve(manifest.global);
 		imports.push(`import ${JSON.stringify(toImportPath(absoluteGlobalPath))};`);
 		ctx.addDependency(absoluteGlobalPath);
 	}
+	if (imports.length === 0) return source;
 	return imports.join("\n") + "\n" + source;
 }
 /**
@@ -56,7 +58,7 @@ function mochiLoader(source) {
 			callback(null, source);
 			return;
 		}
-		const sourcemod = manifest.sourcemods?.[resourcePath];
+		const sourcemod = manifest.sourcemods?.[resourcePath.replaceAll("\\", "/")];
 		const transformed = sourcemod ? (0, diff.applyPatch)(source, sourcemod) || source : source;
 		callback(null, injectImports(this, manifest, transformed));
 	} catch (err) {

package/dist/loader.mjs

@@ -17,8 +17,6 @@ function readManifest(manifestPath) {
 	return manifest;
 }
 function injectImports(ctx, manifest, source) {
-	const cssPath = manifest.files[ctx.resourcePath];
-	if (!cssPath) return source;
 	const imports = [];
 	const sourceDir = path.dirname(ctx.resourcePath);
 	function toImportPath(absPath) {
@@ -26,14 +24,18 @@ function injectImports(ctx, manifest, source) {
 		if (!rel.startsWith(".")) rel = "./" + rel;
 		return rel;
 	}
-	const absoluteCssPath = path.resolve(cssPath);
-	imports.push(`import ${JSON.stringify(toImportPath(absoluteCssPath))};`);
-	ctx.addDependency(absoluteCssPath);
+	const cssPath = manifest.files[ctx.resourcePath.replaceAll("\\", "/")];
+	if (cssPath) {
+		const absoluteCssPath = path.resolve(cssPath);
+		imports.push(`import ${JSON.stringify(toImportPath(absoluteCssPath))};`);
+		ctx.addDependency(absoluteCssPath);
+	}
 	if (manifest.global) {
 		const absoluteGlobalPath = path.resolve(manifest.global);
 		imports.push(`import ${JSON.stringify(toImportPath(absoluteGlobalPath))};`);
 		ctx.addDependency(absoluteGlobalPath);
 	}
+	if (imports.length === 0) return source;
 	return imports.join("\n") + "\n" + source;
 }
 /**
@@ -52,7 +54,7 @@ function mochiLoader(source) {
 			callback(null, source);
 			return;
 		}
-		const sourcemod = manifest.sourcemods?.[resourcePath];
+		const sourcemod = manifest.sourcemods?.[resourcePath.replaceAll("\\", "/")];
 		const transformed = sourcemod ? applyPatch(source, sourcemod) || source : source;
 		callback(null, injectImports(this, manifest, transformed));
 	} catch (err) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mochi-css/next",
     "repository": "git@github.com:Niikelion/mochi-css.git",
-    "version": "3.0.1",
+    "version": "4.0.1",
     "license": "MIT",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
@@ -38,7 +38,7 @@
     },
     "dependencies": {
         "@mochi-css/builder": "^4.0.0",
-        "@mochi-css/config": "^3.1.0",
+        "@mochi-css/config": "^4.0.0",
         "diff": "^8.0.3"
     },
     "peerDependencies": {