@fedify/init 2.2.0-dev.692 → 2.2.0-dev.695

package/dist/deno.js

@@ -1,4 +1,4 @@
 //#region deno.json
-var version = "2.2.0-dev.692+12c62883";
+var version = "2.2.0-dev.695+568b08cc";
 //#endregion
 export { version };

package/dist/test/server.js

@@ -1,8 +1,10 @@
 import { printErrorMessage } from "../utils.js";
 import { ensurePortReleased, killProcessOnPort } from "./port.js";
-import $ from "@david/dax";
+import process from "node:process";
 import { createWriteStream } from "node:fs";
 import { join } from "node:path";
+import { spawn } from "node:child_process";
+import { Readable } from "node:stream";
 //#region src/test/server.ts
 const STARTUP_TIMEOUT = 1e4;
 /**
@@ -23,10 +25,25 @@ async function waitForServer(url, timeout = STARTUP_TIMEOUT) {
 }
 async function serverClosure(dir, cmd, defaultPort, callback, releasePort) {
 	await releasePort?.();
-	const serverProcess = $`${cmd.split(" ")}`.cwd(dir).env("PORT", String(defaultPort)).stdin("null").stdout("piped").stderr("piped").noThrow().spawn();
-	serverProcess.catch(() => {});
-	const [stdoutForFile, stdoutForPort] = serverProcess.stdout().tee();
-	const [stderrForFile, stderrForPort] = serverProcess.stderr().tee();
+	const devCommand = cmd.split(" ");
+	const child = spawn(devCommand[0], devCommand.slice(1), {
+		cwd: dir,
+		env: {
+			...process.env,
+			PORT: String(defaultPort)
+		},
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		detached: true
+	});
+	child.on("error", () => {});
+	const stdoutWeb = Readable.toWeb(child.stdout);
+	const stderrWeb = Readable.toWeb(child.stderr);
+	const [stdoutForFile, stdoutForPort] = stdoutWeb.tee();
+	const [stderrForFile, stderrForPort] = stderrWeb.tee();
 	const cleanup = new AbortController();
 	const outFile = createWriteStream(join(dir, "out.txt"), { flags: "a" });
 	const errFile = createWriteStream(join(dir, "err.txt"), { flags: "a" });
@@ -42,7 +59,10 @@ async function serverClosure(dir, cmd, defaultPort, callback, releasePort) {
 		return await callback(port);
 	} finally {
 		try {
-			serverProcess.kill("SIGKILL");
+			if (child.pid != null) process.kill(-child.pid, "SIGKILL");
+		} catch {}
+		try {
+			child.kill("SIGKILL");
 		} catch {}
 		cleanup.abort();
 		await Promise.all([pipeOutDone, pipeErrDone]).catch(() => {});

package/dist/utils.d.ts

@@ -1,5 +1,7 @@
 import { toMerged } from "es-toolkit";
 import { message } from "@optique/core";
+import { spawn } from "node:child_process";
+
 //#region src/utils.d.ts
 /** Makes all properties of `T` required and non-nullable. */
 type RequiredNotNull<T> = { [P in keyof T]: NonNullable<T[P]> };

package/dist/utils.js

@@ -4,6 +4,7 @@ import { print, printError } from "@optique/run";
 import { flow, toMerged } from "es-toolkit";
 import { message } from "@optique/core";
 import { Chalk } from "chalk";
+import "node:child_process";
 /** Chalk instance configured based on {@link colorEnabled}. */
 const colors = new Chalk(process.stdout.isTTY && !("NO_COLOR" in process.env && process.env.NO_COLOR !== "") ? {} : { level: 0 });
 /** Type guard that checks whether a value is a `Promise`. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/init",
-  "version": "2.2.0-dev.692+12c62883",
+  "version": "2.2.0-dev.695+568b08cc",
   "description": "Project initializer for Fedify",
   "keywords": [
     "fedify",