@peachy/plugin-runner 0.0.9 → 0.0.11

package/dist/index.d.mts

@@ -4,21 +4,30 @@ import { Plugin } from "rolldown";
 declare function gjsRunner({
   sendMessage,
   debug,
-  setReloadHandler
+  setReloadHandler,
+  options: runnerOptions
 }: ReactGJSPluginOptions): Plugin;
+type ReloadHandler = () => Promise<void>;
 interface ReactGJSPluginOptions {
   /**
-       * Whether to print debug messages
-       */
+   * Whether to print debug messages
+   */
   debug?: boolean;
   /**
-       * Broadcast message to all connected clients
-       */
+   * Broadcast message to all connected clients
+   */
   sendMessage: (message: HMRMessage) => void;
   /**
-       * Called when a reload is needed
-       */
-  setReloadHandler: (handler: () => void) => void;
+   * Called when a reload handler is needed
+   */
+  setReloadHandler: (handler: ReloadHandler) => void;
+  /**
+   * Runner options
+   */
+  options: RunnerOptions;
+}
+interface RunnerOptions {
+  env: Record<string, string>;
 }
 interface HMRUpdate {
   type: "update";
@@ -30,4 +39,4 @@ interface HMRMessage {
   updates: HMRUpdate[];
 }
 //#endregion
-export { ReactGJSPluginOptions, gjsRunner };
+export { ReactGJSPluginOptions, ReloadHandler, RunnerOptions, gjsRunner };

package/dist/index.mjs

@@ -2,57 +2,74 @@ import { spawn } from "node:child_process";
 import { join, resolve } from "node:path";
 
 //#region src/index.ts
-let gjs = null;
-async function spawnConsole(entry, debug = false) {
-	gjs = spawn("gjs", ["-m", entry], {
-		stdio: "inherit",
-		env: {
-			...process.env,
-			G_MESSAGES_DEBUG: debug ? "all" : void 0
-		}
-	});
-	gjs.on("close", (code) => {
-		if (code !== null && code !== 0) console.error(`\n[HMR] GJS exited with error code ${code}`);
-		gjs = null;
+let gjs = null, restarting = false;
+async function spawnConsole(entry, debug = false, env) {
+	return new Promise((resolve, reject) => {
+		if (!restarting) reject();
+		gjs = spawn("gjs", ["-m", entry], {
+			stdio: "inherit",
+			env: {
+				...process.env,
+				G_MESSAGES_DEBUG: debug ? "all" : void 0,
+				...env
+			}
+		});
+		gjs.on("close", (code) => {
+			if (!restarting) return process.exit(code ?? 0);
+			if (code !== null && code !== 0) console.error(`\n[HMR] GJS exited with error code ${code}`);
+			gjs = null;
+		});
+		gjs.once("spawn", () => {
+			resolve();
+		});
 	});
 }
-function killConsole() {
-	if (!gjs || gjs.killed) return;
-	console.log("[HMR] Restarting the application");
-	if (!gjs.kill()) gjs.kill("SIGKILL");
-	gjs = null;
+async function killConsole() {
+	return new Promise((resolve) => {
+		if (!gjs || gjs.killed) return resolve();
+		gjs.once("exit", () => {
+			gjs = null;
+			resolve();
+		});
+		console.log("[HMR] Restarting the application");
+		if (!gjs.kill()) gjs.kill("SIGKILL");
+	});
 }
-function reloadConsole(...args) {
-	killConsole();
-	spawnConsole(...args);
+async function reloadConsole(...args) {
+	try {
+		restarting = true;
+		await killConsole();
+		await spawnConsole(...args);
+		restarting = false;
+	} catch {}
 }
-function gjsRunner({ sendMessage, debug, setReloadHandler }) {
-	const changedFiles = /* @__PURE__ */ new Set();
+function gjsRunner({ sendMessage, debug, setReloadHandler, options: runnerOptions }) {
+	let firstRun = true;
 	return {
 		name: "@peachy/plugin-runner",
-		watchChange(id) {
-			changedFiles.add(id);
-		},
-		writeBundle(options, bundle) {
+		async writeBundle(options, bundle) {
 			const entryName = Object.keys(bundle)[0];
 			const entry = options.file || resolve(options.dir || "dist", entryName);
 			setReloadHandler(() => {
-				reloadConsole(entry, debug);
+				return reloadConsole(entry, debug, runnerOptions.env);
 			});
-			if (!this.meta.watchMode || changedFiles.size === 0) {
-				reloadConsole(entry, debug);
+			if (!this.meta.watchMode || firstRun) {
+				reloadConsole(entry, debug, runnerOptions.env);
+				firstRun = false;
 				return;
 			}
 			const inputToOutput = getInputToOutputMap(bundle);
 			sendMessage({
 				type: "hmr",
-				updates: Array.from(changedFiles).filter((id) => inputToOutput.has(id)).map((id) => ({
+				updates: Array.from(inputToOutput.entries()).filter(([id]) => {
+					if (!id.startsWith(process.cwd()) || !id.match(/\.[tj]sx?$/) || id.includes("node_modules") || id.startsWith("gi://*") || id === join(process.cwd(), "src", "index.tsx") || this.getModuleInfo(id)?.isEntry) return false;
+					return true;
+				}).map(([id, outputPath]) => ({
 					type: "update",
 					id,
-					url: resolve(join(process.cwd(), options.dir || "."), inputToOutput.get(id))
+					url: resolve(options.dir || ".", outputPath)
 				}))
 			});
-			changedFiles.clear();
 		}
 	};
 }

package/package.json

@@ -1,22 +1,24 @@
 {
   "name": "@peachy/plugin-runner",
-  "version": "0.0.9",
-  "type": "module",
+  "version": "0.0.11",
   "description": "Run your GJS applications",
-  "main": "./dist/index.mjs",
-  "author": "",
   "license": "MIT",
+  "author": "",
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "main": "./dist/index.mjs",
   "devDependencies": {
-    "rolldown": "1.0.0-beta.60",
-    "tsdown": "0.20.0-beta.4",
-    "typescript": "^5.9.3"
+    "@types/node": "^25.2.2",
+    "rolldown": "1.0.0-rc.3",
+    "tsdown": "0.20.3",
+    "typescript": "^5.9.3",
+    "@peachy/internal-utilities": "0.0.0"
   },
   "peerDependencies": {
     "rolldown": "1.0.0-beta.58"
   },
-  "files": [
-    "dist"
-  ],
   "scripts": {
     "build": "tsdown src/index.ts --dts"
   },