@untestutils/next 0.5.2 → 0.5.4

package/dist/index.d.mts

@@ -1,13 +1,23 @@
-import { type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
+import { type Driver, type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
 export type NextRun = "server" | "dev" | "static";
+export type NextConfigOverride = Record<string, unknown>;
 export interface NextOptions extends FrameworkBaseOptions {
 	run?: NextRun;
+	/**
+	* Merged onto `next.config.*` via backup/restore (`withMergedConfigOverride`).
+	* Next has no `--config` flag — the file is restored after prepare (build)
+	* or after the process stops (`dev`). Same role as Nuxt `nuxtConfig`.
+	*/
+	nextConfig?: NextConfigOverride;
 }
+export type NextMatrixVariant = Partial<Pick<NextOptions, "env" | "hashInputs" | "run" | "readyPath" | "readyTimeoutMs" | "workspaceDeps" | "nextConfig">>;
 /**
 * Next.js Recipe factory.
 * `run: 'server'` (default) — `next build` + `next start`
 * `run: 'dev'` — `next dev` (never shared)
 * `run: 'static'` — `next build` with export + staticDir on `out/`
 */
-export declare function next(opts: NextOptions): Recipe;
+export declare const next: Driver<NextOptions>;
+/** Expand one Next recipe base into many recipes with distinct ids. */
+export declare function matrix(base: NextOptions, variants: Record<string, NextMatrixVariant>): Record<string, Recipe>;
 export default next;

package/dist/index.d.ts

@@ -1,14 +1,24 @@
-import { type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
+import { type Driver, type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
 export type NextRun = 'server' | 'dev' | 'static';
+export type NextConfigOverride = Record<string, unknown>;
 export interface NextOptions extends FrameworkBaseOptions {
     run?: NextRun;
+    /**
+     * Merged onto `next.config.*` via backup/restore (`withMergedConfigOverride`).
+     * Next has no `--config` flag — the file is restored after prepare (build)
+     * or after the process stops (`dev`). Same role as Nuxt `nuxtConfig`.
+     */
+    nextConfig?: NextConfigOverride;
 }
+export type NextMatrixVariant = Partial<Pick<NextOptions, 'env' | 'hashInputs' | 'run' | 'readyPath' | 'readyTimeoutMs' | 'workspaceDeps' | 'nextConfig'>>;
 /**
  * Next.js Recipe factory.
  * `run: 'server'` (default) — `next build` + `next start`
  * `run: 'dev'` — `next dev` (never shared)
  * `run: 'static'` — `next build` with export + staticDir on `out/`
  */
-export declare function next(opts: NextOptions): Recipe;
+export declare const next: Driver<NextOptions>;
+/** Expand one Next recipe base into many recipes with distinct ids. */
+export declare function matrix(base: NextOptions, variants: Record<string, NextMatrixVariant>): Record<string, Recipe>;
 export default next;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAC;AAElD,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAYD;;;;;GAKG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAsF9C;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAgBL,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAC;AAElD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzD,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC;AAED,MAAM,MAAM,iBAAiB,GAAG,OAAO,CACrC,IAAI,CACF,WAAW,EACX,KAAK,GAAG,YAAY,GAAG,KAAK,GAAG,WAAW,GAAG,gBAAgB,GAAG,eAAe,GAAG,YAAY,CAC/F,CACF,CAAC;AAuCF;;;;;GAKG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,WAAW,CA4HnC,CAAC;AAEH,uEAAuE;AACvE,wBAAgB,MAAM,CACpB,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC1C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED,eAAe,IAAI,CAAC"}

package/dist/index.mjs

@@ -1,6 +1,13 @@
 import { existsSync } from "node:fs";
 import { join, resolve } from "pathe";
-import { assertAppRoot, cliFrameworkRecipe, defineRecipe, frameworkRoots, resolveBin, runCommand, staticDir } from "@untestutils/core";
+import { appendWorkspaceHashInputs, assertAppRoot, cliFrameworkRecipe, configOverrideHashInput, deepMergePlain, defineDriver, defineRecipe, findFirstExistingConfig, frameworkRoots, installMergedConfigOverride, matrixRecipe, resolveBin, runCommand, staticDir, withMergedConfigOverride } from "@untestutils/core";
+const NEXT_CONFIG_NAMES = [
+	"next.config.mjs",
+	"next.config.js",
+	"next.config.cjs",
+	"next.config.ts",
+	"next.config.mts"
+];
 function resolveNextBin(root) {
 	return resolveBin({
 		label: "next",
@@ -10,35 +17,59 @@ function resolveNextBin(root) {
 		binRelative: ["dist/bin/next"]
 	});
 }
+function hashInputsFor(opts, root, extra) {
+	const inputs = [...opts.hashInputs ?? [root], ...extra];
+	if (opts.nextConfig) inputs.push(configOverrideHashInput("nextConfig", opts.nextConfig));
+	return inputs;
+}
+function resolveNextConfigPath(root) {
+	return findFirstExistingConfig(root, NEXT_CONFIG_NAMES) ?? join(root, "next.config.mjs");
+}
+async function withNextConfigOverride(root, overrides, fn) {
+	if (!overrides || !Object.keys(overrides).length) return fn();
+	return withMergedConfigOverride(resolveNextConfigPath(root), overrides, fn);
+}
 
-export function next(opts) {
+export const next = defineDriver((opts) => {
 	const root = resolve(opts.root);
 	const runMode = opts.run ?? "server";
 	const id = opts.id ?? `next-${runMode}-${root.split("/").pop()}`;
 	const bin = () => resolveNextBin(root);
+	const hasOverrides = Boolean(opts.nextConfig && Object.keys(opts.nextConfig).length);
 	if (runMode === "dev") {
+		let restore;
 		return cliFrameworkRecipe({
 			id,
 			root,
 			label: "next",
 			share: "never",
 			env: opts.env,
-			hashInputs: opts.hashInputs ?? [root, "run:dev"],
+			hashInputs: hashInputsFor(opts, root, ["run:dev"]),
 			readyPath: opts.readyPath,
 			readyTimeoutMs: opts.readyTimeoutMs,
-			start: ({ port }) => ({
-				command: process.execPath,
-				args: [
-					bin(),
-					"dev",
-					"-H",
-					"127.0.0.1",
-					"-p",
-					String(port)
-				],
-				cwd: root,
-				env: { PORT: String(port) }
-			})
+			workspaceDeps: opts.workspaceDeps,
+			start: async ({ port }) => {
+				if (hasOverrides) {
+					restore = await installMergedConfigOverride(resolveNextConfigPath(root), opts.nextConfig);
+				}
+				return {
+					command: process.execPath,
+					args: [
+						bin(),
+						"dev",
+						"-H",
+						"127.0.0.1",
+						"-p",
+						String(port)
+					],
+					cwd: root,
+					env: { PORT: String(port) }
+				};
+			},
+			afterStop: async () => {
+				await restore?.();
+				restore = undefined;
+			}
 		});
 	}
 	if (runMode === "static") {
@@ -46,26 +77,29 @@ export function next(opts) {
 		const recipe = defineRecipe({
 			id,
 			share: "always",
-			hashInputs: async () => [
-				...opts.hashInputs ?? [root],
-				"run:static",
-				...opts.env ? [`env:${JSON.stringify(opts.env)}`] : []
-			],
+			hashInputs: async () => {
+				let inputs = hashInputsFor(opts, root, ["run:static"]);
+				if (opts.env) inputs = [...inputs, `env:${JSON.stringify(opts.env)}`];
+				inputs = await appendWorkspaceHashInputs(inputs, root, opts.workspaceDeps);
+				return inputs;
+			},
 			ready: async () => {},
 			prepare: async () => {
 				ensureRoot();
 				const nextBin = bin();
-				const result = await runCommand(process.execPath, [nextBin, "build"], {
-					cwd: root,
-					env: {
-						...process.env,
-						...opts.env
-					},
-					timeoutMs: opts.readyTimeoutMs ?? 3e5
+				await withNextConfigOverride(root, opts.nextConfig, async () => {
+					const result = await runCommand(process.execPath, [nextBin, "build"], {
+						cwd: root,
+						env: {
+							...process.env,
+							...opts.env
+						},
+						timeoutMs: opts.readyTimeoutMs ?? 3e5
+					});
+					if (result.exitCode !== 0) {
+						throw new Error(`[untestutils/next] static build failed:\n${result.stderr.slice(-2e3)}`);
+					}
 				});
-				if (result.exitCode !== 0) {
-					throw new Error(`[untestutils/next] static build failed:\n${result.stderr.slice(-2e3)}`);
-				}
 				const out = join(root, "out");
 				if (!existsSync(out)) {
 					throw new Error(`[untestutils/next] expected ${out} after static export (set output: 'export' in next.config)`);
@@ -90,14 +124,33 @@ export function next(opts) {
 		label: "next",
 		share: "always",
 		env: opts.env,
-		hashInputs: opts.hashInputs ?? [root, "run:server"],
+		hashInputs: hashInputsFor(opts, root, ["run:server"]),
 		readyPath: opts.readyPath,
 		readyTimeoutMs: opts.readyTimeoutMs,
-		prepare: () => ({
-			command: process.execPath,
-			args: [bin(), "build"],
-			cwd: root
-		}),
+		workspaceDeps: opts.workspaceDeps,
+		prepare: async () => {
+			if (!hasOverrides) {
+				return {
+					command: process.execPath,
+					args: [bin(), "build"],
+					cwd: root
+				};
+			}
+			const nextBin = bin();
+			await withNextConfigOverride(root, opts.nextConfig, async () => {
+				const result = await runCommand(process.execPath, [nextBin, "build"], {
+					cwd: root,
+					env: {
+						...process.env,
+						...opts.env
+					},
+					timeoutMs: opts.readyTimeoutMs ?? 3e5
+				});
+				if (result.exitCode !== 0) {
+					throw new Error(`[untestutils/next] prepare failed (${result.exitCode}):\n${result.stderr.slice(-2e3)}\n${result.stdout.slice(-1e3)}`);
+				}
+			});
+		},
 		start: ({ port }) => ({
 			command: process.execPath,
 			args: [
@@ -112,5 +165,26 @@ export function next(opts) {
 			env: { PORT: String(port) }
 		})
 	});
+});
+
+export function matrix(base, variants) {
+	return matrixRecipe(next, base, variants, {
+		label: "next",
+		merge: (b, patch, id, name) => ({
+			...b,
+			...patch,
+			id,
+			env: {
+				...b.env ?? {},
+				...patch.env ?? {}
+			},
+			nextConfig: b.nextConfig || patch.nextConfig ? deepMergePlain(b.nextConfig ?? {}, patch.nextConfig ?? {}) : undefined,
+			hashInputs: [
+				...b.hashInputs ?? [b.root],
+				...patch.hashInputs ?? [],
+				`variant:${name}`
+			]
+		})
+	});
 }
 export default next;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@untestutils/next",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "homepage": "https://s00d.github.io/untestutils/",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "pathe": "^2.0.3",
-    "@untestutils/core": "0.5.2"
+    "@untestutils/core": "0.5.4"
   },
   "devDependencies": {
     "@types/node": "^26.6.1",