@untestutils/remix 0.5.2 → 0.5.3

package/dist/index.d.mts

@@ -1,14 +1,23 @@
-import { type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
+import { type Driver, type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
 export type RemixRun = "server" | "dev";
+export type ViteConfigOverride = Record<string, unknown>;
 export interface RemixOptions extends FrameworkBaseOptions {
 	run?: RemixRun;
 	/** Server build entry relative to root (default `build/server/index.js`). */
 	serverEntry?: string;
+	/**
+	* When set, build/dev go through Vite with `--config` merge (Remix Vite apps).
+	* Same role as Nuxt `nuxtConfig`.
+	*/
+	viteConfig?: ViteConfigOverride;
 }
+export type RemixMatrixVariant = Partial<Pick<RemixOptions, "env" | "hashInputs" | "run" | "serverEntry" | "readyPath" | "readyTimeoutMs" | "workspaceDeps" | "viteConfig">>;
 /**
 * Remix (Vite) Recipe factory.
 * `run: 'server'` (default) — vite/remix build + remix-serve
 * `run: 'dev'` — remix vite:dev / vite
 */
-export declare function remix(opts: RemixOptions): Recipe;
+export declare const remix: Driver<RemixOptions>;
+/** Expand one Remix recipe base into many recipes with distinct ids. */
+export declare function matrix(base: RemixOptions, variants: Record<string, RemixMatrixVariant>): Record<string, Recipe>;
 export default remix;

package/dist/index.d.ts

@@ -1,15 +1,24 @@
-import { type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
+import { type Driver, type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
 export type RemixRun = 'server' | 'dev';
+export type ViteConfigOverride = Record<string, unknown>;
 export interface RemixOptions extends FrameworkBaseOptions {
     run?: RemixRun;
     /** Server build entry relative to root (default `build/server/index.js`). */
     serverEntry?: string;
+    /**
+     * When set, build/dev go through Vite with `--config` merge (Remix Vite apps).
+     * Same role as Nuxt `nuxtConfig`.
+     */
+    viteConfig?: ViteConfigOverride;
 }
+export type RemixMatrixVariant = Partial<Pick<RemixOptions, 'env' | 'hashInputs' | 'run' | 'serverEntry' | 'readyPath' | 'readyTimeoutMs' | 'workspaceDeps' | 'viteConfig'>>;
 /**
  * Remix (Vite) Recipe factory.
  * `run: 'server'` (default) — vite/remix build + remix-serve
  * `run: 'dev'` — remix vite:dev / vite
  */
-export declare function remix(opts: RemixOptions): Recipe;
+export declare const remix: Driver<RemixOptions>;
+/** Expand one Remix recipe base into many recipes with distinct ids. */
+export declare function matrix(base: RemixOptions, variants: Record<string, RemixMatrixVariant>): Record<string, Recipe>;
 export default remix;
 //# 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,EAIL,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC;AAExC,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IACxD,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAgCD;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAiFhD;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAUL,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC;AAExC,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzD,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IACxD,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,IAAI,CACF,YAAY,EACV,KAAK,GACL,YAAY,GACZ,KAAK,GACL,aAAa,GACb,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,YAAY,CACf,CACF,CAAC;AAoDF;;;;GAIG;AACH,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,YAAY,CA6GrC,CAAC;AAEH,wEAAwE;AACxE,wBAAgB,MAAM,CACpB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAC3C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED,eAAe,KAAK,CAAC"}

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import { join, resolve } from "pathe";
-import { cliFrameworkRecipe, frameworkRoots, resolveBin } from "@untestutils/core";
+import { cliFrameworkRecipe, configOverrideHashInput, deepMergePlain, defineDriver, frameworkRoots, matrixRecipe, resolveBin, serializeViteMergeConfigModule, writeEphemeralConfig } from "@untestutils/core";
 function resolveRemixCli(root) {
 	return resolveBin({
 		label: "remix",
@@ -28,12 +28,27 @@ function resolveViteBin(root) {
 		binRelative: ["bin/vite.js", "bin/vite.mjs"]
 	});
 }
+function hashInputsFor(opts, root, extra) {
+	const inputs = [...opts.hashInputs ?? [root], ...extra];
+	if (opts.viteConfig) inputs.push(configOverrideHashInput("viteConfig", opts.viteConfig));
+	return inputs;
+}
+async function viteConfigArgs(root, outDir, viteConfig) {
+	if (!viteConfig || !Object.keys(viteConfig).length) return [];
+	const configPath = join(outDir, "vite.untestutils.mjs");
+	await writeEphemeralConfig(configPath, serializeViteMergeConfigModule({
+		appRoot: root,
+		overrides: viteConfig
+	}));
+	return ["--config", configPath];
+}
 
-export function remix(opts) {
+export const remix = defineDriver((opts) => {
 	const root = resolve(opts.root);
 	const runMode = opts.run ?? "server";
 	const id = opts.id ?? `remix-${runMode}-${root.split("/").pop()}`;
 	const serverEntry = opts.serverEntry ?? join("build", "server", "index.js");
+	const hasViteOverrides = Boolean(opts.viteConfig && Object.keys(opts.viteConfig).length);
 	if (runMode === "dev") {
 		return cliFrameworkRecipe({
 			id,
@@ -41,11 +56,28 @@ export function remix(opts) {
 			label: "remix",
 			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 }) => {
-				
+			workspaceDeps: opts.workspaceDeps,
+			start: async ({ port, outDir }) => {
+				if (hasViteOverrides) {
+					const viteBin = resolveViteBin(root);
+					const configArgs = await viteConfigArgs(root, outDir, opts.viteConfig);
+					return {
+						command: process.execPath,
+						args: [
+							viteBin,
+							...configArgs,
+							"--port",
+							String(port),
+							"--strictPort",
+							"--host",
+							"127.0.0.1"
+						],
+						cwd: root
+					};
+				}
 				try {
 					const cli = resolveRemixCli(root);
 					return {
@@ -60,11 +92,11 @@ export function remix(opts) {
 						env: { PORT: String(port) }
 					};
 				} catch {
-					const vite = resolveViteBin(root);
+					const viteBin = resolveViteBin(root);
 					return {
 						command: process.execPath,
 						args: [
-							vite,
+							viteBin,
 							"--port",
 							String(port),
 							"--strictPort",
@@ -83,14 +115,24 @@ export function remix(opts) {
 		label: "remix",
 		share: "always",
 		env: opts.env,
-		hashInputs: opts.hashInputs ?? [
-			root,
-			"run:server",
-			serverEntry
-		],
+		hashInputs: hashInputsFor(opts, root, ["run:server", serverEntry]),
 		readyPath: opts.readyPath,
 		readyTimeoutMs: opts.readyTimeoutMs,
-		prepare: () => {
+		workspaceDeps: opts.workspaceDeps,
+		prepare: async ({ outDir }) => {
+			if (hasViteOverrides) {
+				const viteBin = resolveViteBin(root);
+				const configArgs = await viteConfigArgs(root, outDir, opts.viteConfig);
+				return {
+					command: process.execPath,
+					args: [
+						viteBin,
+						"build",
+						...configArgs
+					],
+					cwd: root
+				};
+			}
 			try {
 				const cli = resolveRemixCli(root);
 				return {
@@ -99,10 +141,10 @@ export function remix(opts) {
 					cwd: root
 				};
 			} catch {
-				const vite = resolveViteBin(root);
+				const viteBin = resolveViteBin(root);
 				return {
 					command: process.execPath,
-					args: [vite, "build"],
+					args: [viteBin, "build"],
 					cwd: root
 				};
 			}
@@ -127,5 +169,26 @@ export function remix(opts) {
 			};
 		}
 	});
+});
+
+export function matrix(base, variants) {
+	return matrixRecipe(remix, base, variants, {
+		label: "remix",
+		merge: (b, patch, id, name) => ({
+			...b,
+			...patch,
+			id,
+			env: {
+				...b.env ?? {},
+				...patch.env ?? {}
+			},
+			viteConfig: b.viteConfig || patch.viteConfig ? deepMergePlain(b.viteConfig ?? {}, patch.viteConfig ?? {}) : undefined,
+			hashInputs: [
+				...b.hashInputs ?? [b.root],
+				...patch.hashInputs ?? [],
+				`variant:${name}`
+			]
+		})
+	});
 }
 export default remix;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@untestutils/remix",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "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.3"
   },
   "devDependencies": {
     "@types/node": "^26.6.1",