@joystick.js/cli-canary 0.0.0-canary.92 → 0.0.0-canary.94

package/dist/functions/start/index.js

@@ -1,4 +1,45 @@
 import dev from "../../lib/dev/index.js";
+process.hmrProcess.on("message", (message) => {
+  const processMessages = [
+    "SERVER_CLOSED",
+    "HAS_HMR_CONNECTIONS",
+    "HAS_NO_HMR_CONNECTIONS",
+    "HMR_UPDATE_COMPLETED"
+  ];
+  if (!processMessages.includes(message?.type)) {
+    process.loader.stable(message);
+  }
+  if (message?.type === "HAS_HMR_CONNECTIONS") {
+    process.hmrProcess.hasConnections = true;
+  }
+  if (message?.type === "HAS_NO_HMR_CONNECTIONS") {
+    process.hmrProcess.hasConnections = false;
+  }
+  if (message?.type === "HMR_UPDATE_COMPLETED") {
+    setTimeout(() => {
+      restartApplicationProcess(message?.sessions);
+    }, 500);
+  }
+});
+const startHMRProcess = () => {
+  const execArgv = ["--no-warnings"];
+  if (majorVersion < 19) {
+    execArgv.push("--experimental-specifier-resolution=node");
+  }
+  const hmrProcess = child_process.fork(
+    path.resolve(`${__dirname}/hmrServer.js`),
+    [],
+    {
+      execArgv,
+      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+      // communicate with the child_process.
+      silent: true
+    }
+  );
+  process.hmrProcess = hmrProcess;
+  handleHMRProcessSTDIO();
+  handleHMRProcessMessages();
+};
 var start_default = async (args = {}, options = {}) => {
   await dev({
     environment: args?.environment || "development",

package/dist/lib/dev/index.js

@@ -76,6 +76,61 @@ const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "
     throw new Error(`[dev.handleSignalEvents] ${exception.message}`);
   }
 };
+const handleHMRProcessMessages = (options = {}) => {
+  try {
+    process.hmrProcess.on("message", (message) => {
+      const processMessages = [
+        "SERVER_CLOSED",
+        "HAS_HMR_CONNECTIONS",
+        "HAS_NO_HMR_CONNECTIONS",
+        "HMR_UPDATE_COMPLETED"
+      ];
+      if (!processMessages.includes(message?.type)) {
+        process.loader.stable(message);
+      }
+      if (message?.type === "HAS_HMR_CONNECTIONS") {
+        process.hmrProcess.hasConnections = true;
+      }
+      if (message?.type === "HAS_NO_HMR_CONNECTIONS") {
+        process.hmrProcess.hasConnections = false;
+      }
+      if (message?.type === "HMR_UPDATE_COMPLETED") {
+        setTimeout(() => {
+          handleRestartApplicationProcess({
+            ...options,
+            sessionsBeforeHMRUpdate: message?.sessions
+          });
+        }, 500);
+      }
+    });
+  } catch (exception) {
+    throw new Error(`[dev.handleHMRProcessMessages] ${exception.message}`);
+  }
+};
+const handleHMRProcessSTDIO = () => {
+  try {
+    if (process.hmrProcess) {
+      process.hmrProcess.on("error", (error) => {
+        CLILog(error.toString(), {
+          level: "danger",
+          docs: "https://github.com/cheatcode/joystick"
+        });
+      });
+      process.hmrProcess.stdout.on("data", (data) => {
+        console.log(data.toString());
+      });
+      process.hmrProcess.stderr.on("data", (data) => {
+        process.loader.stop();
+        CLILog(data.toString(), {
+          level: "danger",
+          docs: "https://github.com/cheatcode/joystick"
+        });
+      });
+    }
+  } catch (exception) {
+    throw new Error(`[dev.handleHMRProcessSTDIO] ${exception.message}`);
+  }
+};
 const handleServerProcessMessages = () => {
   try {
     process.serverProcess.on("message", (message) => {
@@ -116,7 +171,7 @@ const handleServerProcessSTDIO = () => {
     throw new Error(`[dev.handleServerProcessSTDIO] ${exception.message}`);
   }
 };
-const handleAddOrChangeFile = async (context = {}, path2 = "") => {
+const handleAddOrChangeFile = async (context = {}, path2 = "", options = {}) => {
   try {
     if (context.isAddingOrChangingFile) {
       const codependencies = await getCodependenciesForFile(path2);
@@ -144,59 +199,73 @@ const handleAddOrChangeFile = async (context = {}, path2 = "") => {
         if (context.isUIUpdate) {
           handleNotifyHMRClients(context.isHTMLUpdate);
         } else {
-          handleRestartApplicationProcess();
+          handleRestartApplicationProcess(options);
         }
-        return;
       }
     }
   } catch (exception) {
     throw new Error(`[dev.handleAddOrChangeFile] ${exception.message}`);
   }
 };
-const handleAddDirectory = (context = {}, path2 = "") => {
+const handleAddDirectory = (context = {}, path2 = "", options = {}) => {
   try {
     if (context.isAddDirectory) {
       fs.mkdirSync(`./.joystick/build/${path2}`);
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
     throw new Error(`[dev.handleAddDirectory] ${exception.message}`);
   }
 };
-const handleCopyFile = (context = {}, path2 = "") => {
+const handleCopyFile = (context = {}, path2 = "", options = {}) => {
   try {
     if (context.isFileToCopy && !context.isDirectory) {
       fs.writeFileSync(`./.joystick/build/${path2}`, fs.readFileSync(path2));
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
     throw new Error(`[dev.handleCopyFile] ${exception.message}`);
   }
 };
-const handleCopyDirectory = (context = {}, path2 = "") => {
+const handleCopyDirectory = (context = {}, path2 = "", options = {}) => {
   try {
     if (context.isFileToCopy && context.isDirectory && !context.isExistingDirectoryInBuild) {
       fs.mkdirSync(`./.joystick/build/${path2}`);
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
     throw new Error(`[dev.handleCopyDirectory] ${exception.message}`);
   }
 };
-const handleRestartApplicationProcess = () => {
+const handleRestartApplicationProcess = async (options = {}) => {
   try {
+    if (process.serverProcess && process.serverProcess.pid) {
+      process.loader.text("Restarting app...");
+      process.serverProcess.kill();
+      await startApp({
+        nodeMajorVersion: options?.nodeMajorVersion,
+        port: options?.port,
+        sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
+      });
+      return Promise.resolve();
+    }
+    process.loader.text("Starting app...");
+    startApplicationProcess();
+    if (!process.hmrProcess) {
+      startHMR();
+    }
   } catch (exception) {
     throw new Error(`[dev.handleRestartApplicationProcess] ${exception.message}`);
   }
@@ -259,10 +328,10 @@ const startFileWatcher = (options = {}) => {
       checkForRequiredFiles();
       process.loader.text("Rebuilding app...");
       const watchChangeContext = getWatchChangeContext(event, path2);
-      handleCopyDirectory(watchChangeContext, path2);
-      handleCopyFile(watchChangeContext, path2);
-      handleAddDirectory(watchChangeContext, path2);
-      await handleAddOrChangeFile(watchChangeContext, path2);
+      handleCopyDirectory(watchChangeContext, path2, options);
+      handleCopyFile(watchChangeContext, path2, options);
+      handleAddDirectory(watchChangeContext, path2, options);
+      await handleAddOrChangeFile(watchChangeContext, path2, options);
       if (watchChangeContext?.isSettingsUpdate) {
         await loadSettings({
           environment: options.environment,
@@ -416,24 +485,29 @@ const dev = async (options, { resolve, reject }) => {
     });
     await runInitialBuild(settings?.parsed?.config?.build);
     await startFileWatcher(options);
+    const processIds = [];
     const serverProcess = await startApp({
       nodeMajorVersion,
       port: options?.port
     });
     if (serverProcess) {
+      processIds.push(serverProcess.pid);
       process.serverProcess = serverProcess;
       handleServerProcessSTDIO();
       handleServerProcessMessages();
     }
-    let hmrProcess;
     if (options?.environment !== "test") {
-      hmrProcess = await startHMR({
+      const hmrProcess = await startHMR({
         nodeMajorVersion,
         __dirname
       });
+      processIds.push(hmrProcess.pid);
+      process.hmrProcess = hmrProcess;
+      handleHMRProcessSTDIO();
+      handleHMRProcessMessages(options);
     }
     handleSignalEvents(
-      [serverProcess.pid, hmrProcess.pid],
+      processIds,
       nodeMajorVersion,
       __dirname
     );

package/dist/lib/dev/startApp.js

@@ -56,7 +56,7 @@ const startApp = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
     const execArgv = getExecArgs(options?.nodeMajorVersion);
-    const serverProcess = handleStartServerProcess(execArgv);
+    const serverProcess = handleStartServerProcess(execArgv, options?.sessionsBeforeHMRUpdate);
     return resolve(serverProcess);
   } catch (exception) {
     reject(`[startApp] ${exception.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/cli-canary",
-  "version": "0.0.0-canary.92",
+  "version": "0.0.0-canary.94",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",

package/src/functions/start/index.js

@@ -1,5 +1,661 @@
+/* eslint-disable consistent-return */
+
+//import child_process from "child_process";
+//import path, { dirname } from "path";
+//import { fileURLToPath } from "url";
+//import ps from "ps-node";
+//import { killPortProcess } from "kill-port-process";
+//import fs from "fs";
+//import chokidar from "chokidar";
+//import Loader from "../../lib/loader.js";
+//import getFilesToBuild from "./getFilesToBuild.js";
+//import buildFiles from "./buildFiles.js";
+//import filesToCopy from "./filesToCopy.js";
+//import checkIfPortAvailable from "./checkIfPortAvailable.js";
+//import getCodependenciesForFile from "./getCodependenciesForFile.js";
+//import isValidJSONString from "../../lib/isValidJSONString.js";
+//import startDatabaseProvider from "./databases/startProvider.js";
+//import CLILog from "../../lib/CLILog.js";
+//import removeDeletedDependenciesFromMap from "./removeDeletedDependenciesFromMap.js";
+//import validateDatabasesFromSettings from "../../lib/validateDatabasesFromSettings.js";
+//import wait from "../../lib/wait.js";
 import dev from "../../lib/dev/index.js";
 
+//const majorVersion = parseInt(
+//  process?.version?.split(".")[0]?.replace("v", ""),
+//  10
+//);
+//
+//const __filename = fileURLToPath(import.meta.url);
+//const __dirname = dirname(__filename);
+//
+//const killProcess = (pid = 0) => {
+//  return new Promise((resolve) => {
+//    ps.kill(pid, () => {
+//      resolve();
+//    });
+//  });
+//};
+//
+//const watchlist = [
+//  { path: "ui" },
+//  { path: "lib" },
+//  { path: "i18n" },
+//  { path: "api" },
+//  { path: "email" },
+//  { path: "fixtures" },
+//  { path: "routes" },
+//  { path: "index.client.js" },
+//  { path: "index.server.js" },
+//  ...filesToCopy,
+//];
+//
+//const requiredFileCheck = () => {
+//  return new Promise((resolve) => {
+//    const requiredFiles = [
+//      { path: "index.server.js", type: "file" },
+//      { path: "index.html", type: "file" },
+//      { path: "index.client.js", type: "file" },
+//      { path: "api", type: "directory" },
+//      { path: "i18n", type: "directory" },
+//      { path: "lib", type: "directory" },
+//      { path: "public", type: "directory" },
+//      { path: "ui", type: "directory" },
+//      { path: "ui/components", type: "directory" },
+//      { path: "ui/layouts", type: "directory" },
+//      { path: "ui/pages", type: "directory" },
+//    ];
+//
+//    requiredFiles.forEach((requiredFile) => {
+//      const exists = fs.existsSync(`${process.cwd()}/${requiredFile.path}`);
+//      const stats =
+//        exists && fs.statSync(`${process.cwd()}/${requiredFile.path}`);
+//      const isFile = stats && stats.isFile();
+//      const isDirectory = stats && stats.isDirectory();
+//
+//      if (requiredFile && requiredFile.type === "file") {
+//        if (!exists || (exists && !isFile)) {
+//          CLILog(
+//            `The path ${requiredFile.path} must exist in your project and must be a file (not a directory).`,
+//            {
+//              level: "danger",
+//              docs: "https://github.com/cheatcode/joystick#folder-and-file-structure",
+//            }
+//          );
+//          process.exit(0);
+//        }
+//      }
+//
+//      if (requiredFile && requiredFile.type === "directory") {
+//        if (!exists || (exists && !isDirectory)) {
+//          CLILog(
+//            `The path ${requiredFile.path} must exist in your project and must be a directory (not a file).`,
+//            {
+//              level: "danger",
+//              docs: "https://github.com/cheatcode/joystick#folder-and-file-structure",
+//            }
+//          );
+//          process.exit(0);
+//        }
+//      }
+//    });
+//
+//    resolve();
+//  });
+//};
+//
+//const handleCleanup = async (
+//  processIds = [process?.serverProcess?.pid, process?.hmrProcess?.pid]
+//) => {
+//  for (let i = 0; i < processIds?.length; i += 1) {
+//    const processId = processIds[i];
+//
+//    if (processId) {
+//      await killProcess(processId);
+//    }
+//  }
+//
+//  const databases = Object.entries(process._databases || {});
+//
+//  for (let i = 0; i < databases?.length; i += 1) {
+//    const [provider, providerConnection] = databases[i];
+//
+//    if (providerConnection?.pid) {
+//      await killProcess(providerConnection.pid);
+//    }
+//
+//    if (!providerConnection?.pid) {
+//      const providerConnections = Object.entries(providerConnection);
+//
+//      for (let pc = 0; pc < providerConnections?.length; pc += 1) {
+//        const [_connectionName, connection] = providerConnections[pc];
+//
+//        if (connection?.pid) {
+//          await killProcess(connection?.pid);
+//        }
+//      }
+//    }
+//  }
+//};
+//
+//const getDatabaseProcessIds = () => {
+//  const databaseProcessIds = [];
+//  const databases = Object.entries(process._databases || {});
+//
+//  for (let i = 0; i < databases?.length; i += 1) {
+//    const [_provider, providerConnection] = databases[i];
+//
+//    if (providerConnection?.pid) {
+//      databaseProcessIds.push(providerConnection.pid);
+//    }
+//
+//    if (!providerConnection?.pid) {
+//      const providerConnections = Object.entries(providerConnection);
+//
+//      for (let pc = 0; pc < providerConnections?.length; pc += 1) {
+//        const [_connectionName, connection] = providerConnections[pc];
+//
+//        if (connection?.pid) {
+//          databaseProcessIds.push(connection.pid);
+//        }
+//      }
+//    }
+//  }
+//
+//  return databaseProcessIds;
+//};
+//
+//const handleSignalEvents = (processIds = []) => {
+//  const execArgv = ["--no-warnings"];
+//
+//  if (majorVersion < 19) {
+//    execArgv.push("--experimental-specifier-resolution=node");
+//  }
+//
+//  const cleanupProcess = child_process.fork(
+//    path.resolve(`${__dirname}/cleanup/index.js`),
+//    [],
+//    {
+//      // NOTE: Run in detached mode so when parent process dies, the child still runs
+//      // and cleanup completes.
+//      detached: true,
+//      execArgv,
+//      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+//      // communicate with the child_process.
+//      silent: true,
+//    }
+//  );
+//
+//  process.on("SIGINT", async () => {
+//    const databaseProcessIds = getDatabaseProcessIds();
+//    cleanupProcess.send(JSON.stringify(({ processIds: [...processIds, ...databaseProcessIds] })));
+//    process.exit();
+//  });
+//
+//  process.on("SIGTERM", async () => {
+//    const databaseProcessIds = getDatabaseProcessIds();
+//    cleanupProcess.send(JSON.stringify(({ processIds: [...processIds, ...databaseProcessIds] })));
+//    process.exit();
+//  });
+//};
+//
+//const handleHMRProcessMessages = () => {
+  process.hmrProcess.on("message", (message) => {
+    const processMessages = [
+      "SERVER_CLOSED",
+      "HAS_HMR_CONNECTIONS",
+      "HAS_NO_HMR_CONNECTIONS",
+      "HMR_UPDATE_COMPLETED",
+    ];
+
+    if (!processMessages.includes(message?.type)) {
+      process.loader.stable(message);
+    }
+
+    if (message?.type === "HAS_HMR_CONNECTIONS") {
+      process.hmrProcess.hasConnections = true;
+    }
+
+    if (message?.type === "HAS_NO_HMR_CONNECTIONS") {
+      process.hmrProcess.hasConnections = false;
+    }
+
+    if (message?.type === "HMR_UPDATE_COMPLETED") {
+      // NOTE: Do a setTimeout to ensure that server is still available while the HMR update completes.
+      // Necessary because some updates are instance, but others might mount a UI that needs a server
+      // available (e.g., runs API requests).
+      setTimeout(() => {
+        restartApplicationProcess(message?.sessions);
+      }, 500);
+    }
+  });
+//};
+//
+//const handleHMRProcessSTDIO = () => {
+//  try {
+//    if (process.hmrProcess) {
+//      process.hmrProcess.on("error", (error) => {
+//        CLILog(error.toString(), {
+//          level: "danger",
+//          docs: "https://github.com/cheatcode/joystick",
+//        });
+//      });
+//
+//      process.hmrProcess.stdout.on("data", (data) => {
+//        console.log(data.toString());
+//      });
+//
+//      process.hmrProcess.stderr.on("data", (data) => {
+//        process.loader.stop();
+//        CLILog(data.toString(), {
+//          level: "danger",
+//          docs: "https://github.com/cheatcode/joystick",
+//        });
+//      });
+//    }
+//  } catch (exception) {
+//    throw new Error(`[dev.handleHMRProcessSTDIO] ${exception.message}`);
+//  }
+//};
+//
+const startHMRProcess = () => {
+  const execArgv = ["--no-warnings"];
+
+  if (majorVersion < 19) {
+    execArgv.push("--experimental-specifier-resolution=node");
+  }
+
+  const hmrProcess = child_process.fork(
+    path.resolve(`${__dirname}/hmrServer.js`),
+    [],
+    {
+      execArgv,
+      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+      // communicate with the child_process.
+      silent: true,
+    }
+  );
+
+  process.hmrProcess = hmrProcess;
+
+  handleHMRProcessSTDIO();
+  handleHMRProcessMessages();
+};
+//
+//const notifyHMRClients = (indexHTMLChanged = false) => {
+//  const settings = loadSettings(process.env.NODE_ENV);
+//  process.hmrProcess.send(
+//    JSON.stringify({
+//      type: "RESTART_SERVER",
+//      settings,
+//      indexHTMLChanged,
+//    })
+//  );
+//};
+//
+//const handleServerProcessMessages = () => {
+//  process.serverProcess.on("message", (message) => {
+//    const processMessages = ["SERVER_CLOSED"];
+//
+//    if (!processMessages.includes(message)) {
+//      process.loader.stable(message);
+//    }
+//  });
+//};
+//
+//const handleServerProcessSTDIO = () => {
+//  try {
+//    if (process.serverProcess) {
+//      process.serverProcess.on("error", (error) => {
+//        console.log(error);
+//      });
+//
+//      process.serverProcess.stdout.on("data", (data) => {
+//        const message = data.toString();
+//
+//        if (message && message.includes("App running at:")) {
+//          process.loader.stable(message);
+//        } else {
+//          if (message && !message.includes("BUILD_ERROR")) {
+//            console.log(message);
+//          }
+//        }
+//      });
+//
+//      process.serverProcess.stderr.on("data", (data) => {
+//        process.loader.stop();
+//        CLILog(data.toString(), {
+//          level: "danger",
+//          docs: "https://github.com/cheatcode/joystick",
+//        });
+//      });
+//    }
+//  } catch (exception) {
+//    throw new Error(`[dev.handleServerProcessSTDIO] ${exception.message}`);
+//  }
+//};
+//
+//const startApplicationProcess = (sessionsBeforeHMRUpdate = null) => {
+//  const execArgv = ["--no-warnings"];
+//
+//  if (majorVersion < 19) {
+//    execArgv.push("--experimental-specifier-resolution=node");
+//  }
+//
+//  if (
+//    process.env.NODE_ENV === "development" &&
+//    process.env.IS_DEBUG_MODE === "true"
+//  ) {
+//    execArgv.push("--inspect");
+//  }
+//
+//  const serverProcess = child_process.fork(
+//    path.resolve(".joystick/build/index.server.js"),
+//    [],
+//    {
+//      execArgv,
+//      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+//      // communicate with the child_process.
+//      silent: true,
+//      env: {
+//        FORCE_COLOR: "1",
+//        LOGS_PATH: process.env.LOGS_PATH,
+//        NODE_ENV: process.env.NODE_ENV,
+//        ROOT_URL: process.env.ROOT_URL,
+//        PORT: process.env.PORT,
+//        JOYSTICK_SETTINGS: process.env.JOYSTICK_SETTINGS,
+//        HMR_SESSIONS: sessionsBeforeHMRUpdate,
+//      },
+//    }
+//  );
+//
+//  process.serverProcess = serverProcess;
+//
+//  handleServerProcessSTDIO();
+//  handleServerProcessMessages();
+//
+//  return serverProcess;
+//};
+//
+//const restartApplicationProcess = async (sessionsBeforeHMRUpdate = null) => {
+//  if (process.serverProcess && process.serverProcess.pid) {
+//    process.loader.text("Restarting app...");
+//    process.serverProcess.kill();
+//    startApplicationProcess(sessionsBeforeHMRUpdate);
+//    return Promise.resolve();
+//  }
+//
+//  // NOTE: Original process was never initialized due to an error.
+//  process.loader.text("Starting app...");
+//  startApplicationProcess();
+//
+//  if (!process.hmrProcess) {
+//    startHMRProcess();
+//  }
+//};
+//
+//const initialBuild = async (buildSettings = {}) => {
+//  const buildPath = `.joystick/build`;
+//  const fileMapPath = `.joystick/build/fileMap.json`;
+//
+//  if (!fs.existsSync(buildPath)) {
+//    fs.mkdirSync(".joystick/build");
+//  }
+//
+//  if (fs.existsSync(fileMapPath)) {
+//    fs.unlinkSync(fileMapPath);
+//  }
+//
+//  process.loader.text("Building app...");
+//
+//  await requiredFileCheck();
+//
+//  const filesToBuild = getFilesToBuild(buildSettings?.excludedPaths, "start");
+//  const fileResults = await buildFiles(
+//    filesToBuild,
+//    null,
+//    process.env.NODE_ENV
+//  );
+//
+//  const hasErrors = [...fileResults]
+//    .filter((result) => !!result)
+//    .map(({ success }) => success)
+//    .includes(false);
+//
+//  if (!hasErrors) {
+//    startApplicationProcess();
+//    startHMRProcess();
+//    // If the file has errors on startup, no way to trigger a restart w/o a watcher.
+//  }
+//};
+//
+//const startWatcher = async (buildSettings = {}) => {
+//  await initialBuild(buildSettings);
+//
+//  const watcher = chokidar.watch(
+//    watchlist.map(({ path }) => path),
+//    {
+//      ignoreInitial: true,
+//    }
+//  );
+//
+//  watcher.on("all", async (event, path) => {
+//    await requiredFileCheck();
+//    process.loader.text("Rebuilding app...");
+//    const isHTMLUpdate = path === "index.html";
+//    const isUIPath = path?.includes("ui/") || path === 'index.css' || isHTMLUpdate;
+//    const isUIUpdate =
+//      (process.hmrProcess.hasConnections && isUIPath) || false;
+//
+//    if (
+//      ["addDir"].includes(event) &&
+//      fs.existsSync(path) &&
+//      fs.lstatSync(path).isDirectory() &&
+//      !fs.existsSync(`./.joystick/build/${path}`)
+//    ) {
+//      fs.mkdirSync(`./.joystick/build/${path}`);
+//
+//      if (isUIUpdate) {
+//        notifyHMRClients(isHTMLUpdate);
+//      } else {
+//        restartApplicationProcess();
+//      }
+//
+//      return;
+//    }
+//
+//    // If path is file to copy...
+//    if (!!filesToCopy.find((fileToCopy) => fileToCopy.path === path)) {
+//      const isDirectory = fs.statSync(path).isDirectory();
+//
+//      // If path to copy is a directory and doesn't exist in the build...
+//      if (isDirectory && !fs.existsSync(`./.joystick/build/${path}`)) {
+//        fs.mkdirSync(`./.joystick/build/${path}`);
+//      }
+//
+//      // If path to copy is not a directory...
+//      if (!isDirectory) {
+//        fs.writeFileSync(`./.joystick/build/${path}`, fs.readFileSync(path));
+//      }
+//
+//      // Load settings in case we copied new values over...
+//      loadSettings(process.env.NODE_ENV);
+//
+//      if (isUIUpdate) {
+//        notifyHMRClients(isHTMLUpdate);
+//      } else {
+//        restartApplicationProcess();
+//      }
+//
+//      return;
+//    }
+//
+//    if (["add", "change"].includes(event) && fs.existsSync(path)) {
+//      const codependencies = getCodependenciesForFile(path);
+//      const fileResults = await buildFiles(
+//        [path, ...(codependencies?.existing || [])],
+//        null,
+//        process.env.NODE_ENV
+//      );
+//      const fileResultsHaveErrors = fileResults
+//        .filter((result) => !!result)
+//        .map(({ success }) => success)
+//        .includes(false);
+//
+//      removeDeletedDependenciesFromMap(codependencies.deleted);
+//
+//      const hasErrors = fileResultsHaveErrors;
+//
+//      if (process.serverProcess && hasErrors) {
+//        process.serverProcess.send(
+//          JSON.stringify({
+//            error: "BUILD_ERROR",
+//            paths: fileResults
+//              .filter(({ success }) => !success)
+//              .map(({ path: pathWithError, error }) => ({
+//                path: pathWithError,
+//                error,
+//              })),
+//          })
+//        );
+//
+//        return;
+//      }
+//
+//      if (!hasErrors) {
+//        process.initialBuildComplete = true;
+//
+//        if (isUIUpdate) {
+//          notifyHMRClients(isHTMLUpdate);
+//        } else {
+//          restartApplicationProcess();
+//        }
+//
+//        return;
+//      }
+//    }
+//
+//    if (
+//      ["unlink", "unlinkDir"].includes(event) &&
+//      !fs.existsSync(`./.joystick/build/${path}`)
+//    ) {
+//      if (isUIUpdate) {
+//        notifyHMRClients(isHTMLUpdate);
+//      } else {
+//        restartApplicationProcess();
+//      }
+//
+//      return;
+//    }
+//
+//    if (
+//      ["unlink", "unlinkDir"].includes(event) &&
+//      fs.existsSync(`./.joystick/build/${path}`)
+//    ) {
+//      const pathToUnlink = `./.joystick/build/${path}`;
+//      const stats = fs.lstatSync(pathToUnlink);
+//
+//      if (stats.isDirectory()) {
+//        fs.rmdirSync(pathToUnlink, { recursive: true });
+//      }
+//
+//      if (stats.isFile()) {
+//        fs.unlinkSync(pathToUnlink);
+//      }
+//
+//      if (isUIUpdate) {
+//        notifyHMRClients(isHTMLUpdate);
+//      } else {
+//        restartApplicationProcess();
+//      }
+//
+//      return;
+//    }
+//  });
+//};
+//
+//const startDatabase = async (database = {}, databasePort = 2610, hasMultipleOfProvider = false) => {
+//  process._databases = {
+//    ...(process._databases || {}),
+//    [database.provider]: !hasMultipleOfProvider ? await startDatabaseProvider(database, databasePort) : {
+//      ...((process._databases && process._databases[database.provider]) || {}),
+//      [database?.name || `${database.provider}_${databasePort}`]: await startDatabaseProvider(database, databasePort)
+//    },
+//  };
+//
+//  return Promise.resolve(process._databases);
+//};
+//
+//const startDatabases = async (databasePortStart = 2610) => {
+//  try {
+//    const hasSettings = !!process.env.JOYSTICK_SETTINGS;
+//    const settings = hasSettings && JSON.parse(process.env.JOYSTICK_SETTINGS);
+//    const databases = settings?.config?.databases || [];
+//
+//    if (databases && Array.isArray(databases) && databases.length > 0) {
+//      validateDatabasesFromSettings(databases);
+//
+//      for (let i = 0; i < databases?.length; i += 1) {
+//        const database = databases[i];
+//        const hasMultipleOfProvider = (databases?.filter((database) => database?.provider === database?.provider))?.length > 1;
+//
+//        // NOTE: Increment each database port using index in the databases array from settings.
+//        await startDatabase(database, databasePortStart + i, hasMultipleOfProvider);
+//      }
+//
+//      return Promise.resolve();
+//    }
+//
+//    return Promise.resolve();
+//  } catch (exception) {
+//    console.warn(exception);
+//  }
+//};
+//
+//const loadSettings = () => {
+//  const environment = process.env.NODE_ENV;
+//  const settingsFilePath = `${process.cwd()}/settings.${environment}.json`;
+//  const hasSettingsFile = fs.existsSync(settingsFilePath);
+//
+//  if (!hasSettingsFile) {
+//    CLILog(
+//      `A settings file could not be found for this environment (${environment}). Create a settings.${environment}.json file at the root of your project and restart Joystick.`,
+//      {
+//        level: "danger",
+//        docs: "https://github.com/cheatcode/joystick#settings",
+//      }
+//    );
+//    process.exit(0);
+//  }
+//
+//  const rawSettingsFile = fs.readFileSync(settingsFilePath, "utf-8");
+//  const isValidJSON = isValidJSONString(rawSettingsFile);
+//
+//  if (!isValidJSON) {
+//    CLILog(
+//      `Failed to parse settings file. Double-check the syntax in your settings.${environment}.json file at the root of your project and restart Joystick.`,
+//      {
+//        level: "danger",
+//        docs: "https://github.com/cheatcode/joystick#settings",
+//        tools: [{ title: "JSON Linter", url: "https://jsonlint.com/" }],
+//      }
+//    );
+//
+//    process.exit(0);
+//  }
+//
+//  const settingsFile = isValidJSON ? rawSettingsFile : "{}";
+//
+//  // NOTE: Child process will inherit this env var from this parent process.
+//  process.env.JOYSTICK_SETTINGS = settingsFile;
+//
+//  return JSON.parse(settingsFile);
+//};
+//
+//const checkIfJoystickProject = () => {
+//  return fs.existsSync(`${process.cwd()}/.joystick`);
+//};
+
 export default async (args = {}, options = {}) => {
   await dev({
     environment: args?.environment || 'development',

package/src/lib/dev/index.js

@@ -91,6 +91,72 @@ const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = '
   }
 };
 
+const handleHMRProcessMessages = (options = {}) => {
+  try {
+    process.hmrProcess.on("message", (message) => {
+      const processMessages = [
+        "SERVER_CLOSED",
+        "HAS_HMR_CONNECTIONS",
+        "HAS_NO_HMR_CONNECTIONS",
+        "HMR_UPDATE_COMPLETED",
+        ];
+
+      if (!processMessages.includes(message?.type)) {
+        process.loader.stable(message);
+      }
+
+      if (message?.type === "HAS_HMR_CONNECTIONS") {
+        process.hmrProcess.hasConnections = true;
+      }
+
+      if (message?.type === "HAS_NO_HMR_CONNECTIONS") {
+        process.hmrProcess.hasConnections = false;
+      }
+
+      if (message?.type === "HMR_UPDATE_COMPLETED") {
+        // NOTE: Do a setTimeout to ensure that server is still available while the HMR update completes.
+        // Necessary because some updates are instance, but others might mount a UI that needs a server
+        // available (e.g., runs API requests).
+        setTimeout(() => {
+          handleRestartApplicationProcess({
+            ...options,
+            sessionsBeforeHMRUpdate: message?.sessions,
+          });
+        }, 500);
+      }
+    });
+  } catch (exception) {
+    throw new Error(`[dev.handleHMRProcessMessages] ${exception.message}`);
+  }
+};
+
+const handleHMRProcessSTDIO = () => {
+  try {
+    if (process.hmrProcess) {
+      process.hmrProcess.on("error", (error) => {
+        CLILog(error.toString(), {
+          level: "danger",
+          docs: "https://github.com/cheatcode/joystick",
+        });
+      });
+
+      process.hmrProcess.stdout.on("data", (data) => {
+        console.log(data.toString());
+      });
+
+      process.hmrProcess.stderr.on("data", (data) => {
+        process.loader.stop();
+        CLILog(data.toString(), {
+          level: "danger",
+          docs: "https://github.com/cheatcode/joystick",
+        });
+      });
+    }
+  } catch (exception) {
+    throw new Error(`[dev.handleHMRProcessSTDIO] ${exception.message}`);
+  }
+};
+
 const handleServerProcessMessages = () => {
   try {
     process.serverProcess.on("message", (message) => {
@@ -138,7 +204,7 @@ const handleServerProcessSTDIO = () => {
   }
 };
 
-const handleAddOrChangeFile = async (context = {}, path = '') => {
+const handleAddOrChangeFile = async (context = {}, path = '', options = {}) => {
   try {
     if (context.isAddingOrChangingFile) {
       const codependencies = await getCodependenciesForFile(path);
@@ -179,10 +245,8 @@ const handleAddOrChangeFile = async (context = {}, path = '') => {
         if (context.isUIUpdate) {
           handleNotifyHMRClients(context.isHTMLUpdate);
         } else {
-          handleRestartApplicationProcess();
+          handleRestartApplicationProcess(options);
         }
-
-        return;
       }
     }
   } catch (exception) {
@@ -190,7 +254,7 @@ const handleAddOrChangeFile = async (context = {}, path = '') => {
   }
 };
 
-const handleAddDirectory = (context = {}, path = '') => {
+const handleAddDirectory = (context = {}, path = '', options = {}) => {
   try {
     if (context.isAddDirectory) {
       fs.mkdirSync(`./.joystick/build/${path}`);
@@ -198,7 +262,7 @@ const handleAddDirectory = (context = {}, path = '') => {
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
@@ -206,7 +270,7 @@ const handleAddDirectory = (context = {}, path = '') => {
   }
 };
 
-const handleCopyFile = (context = {}, path = '') => {
+const handleCopyFile = (context = {}, path = '', options = {}) => {
   try {
     if (context.isFileToCopy && !context.isDirectory) {
       fs.writeFileSync(`./.joystick/build/${path}`, fs.readFileSync(path));
@@ -214,7 +278,7 @@ const handleCopyFile = (context = {}, path = '') => {
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
@@ -222,7 +286,7 @@ const handleCopyFile = (context = {}, path = '') => {
   }
 };
 
-const handleCopyDirectory = (context = {}, path = '') => {
+const handleCopyDirectory = (context = {}, path = '', options = {}) => {
   try {
     if (context.isFileToCopy && context.isDirectory && !context.isExistingDirectoryInBuild) {
       fs.mkdirSync(`./.joystick/build/${path}`);
@@ -230,7 +294,7 @@ const handleCopyDirectory = (context = {}, path = '') => {
       if (context.isUIUpdate) {
         handleNotifyHMRClients(context.isHTMLUpdate);
       } else {
-        handleRestartApplicationProcess();
+        handleRestartApplicationProcess(options);
       }
     }
   } catch (exception) {
@@ -238,9 +302,28 @@ const handleCopyDirectory = (context = {}, path = '') => {
   }
 };
 
-const handleRestartApplicationProcess = () => {
+const handleRestartApplicationProcess = async (options = {}) => {
   try {
-    // Perform a single step in your action here.
+      if (process.serverProcess && process.serverProcess.pid) {
+        process.loader.text("Restarting app...");
+        process.serverProcess.kill();
+
+        await startApp({
+          nodeMajorVersion: options?.nodeMajorVersion,
+          port: options?.port,
+          sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate,
+        });
+
+        return Promise.resolve();
+      }
+
+      // NOTE: Original process was never initialized due to an error.
+      process.loader.text("Starting app...");
+      startApplicationProcess();
+
+      if (!process.hmrProcess) {
+        startHMR();
+      }
   } catch (exception) {
     throw new Error(`[dev.handleRestartApplicationProcess] ${exception.message}`);
   }
@@ -312,10 +395,10 @@ const startFileWatcher = (options = {}) => {
 
       const watchChangeContext = getWatchChangeContext(event, path);
 
-      handleCopyDirectory(watchChangeContext, path);
-      handleCopyFile(watchChangeContext, path);
-      handleAddDirectory(watchChangeContext, path);
-      await handleAddOrChangeFile(watchChangeContext, path);
+      handleCopyDirectory(watchChangeContext, path, options);
+      handleCopyFile(watchChangeContext, path, options);
+      handleAddDirectory(watchChangeContext, path, options);
+      await handleAddOrChangeFile(watchChangeContext, path, options);
 
       if (watchChangeContext?.isSettingsUpdate) {
         await loadSettings({
@@ -497,29 +580,36 @@ const dev = async (options, { resolve, reject }) => {
     await runInitialBuild(settings?.parsed?.config?.build);
     await startFileWatcher(options);
 
+    const processIds = [];
+
     const serverProcess = await startApp({
       nodeMajorVersion,
       port: options?.port,
     });
 
     if (serverProcess) {
+      processIds.push(serverProcess.pid);
       process.serverProcess = serverProcess;
       handleServerProcessSTDIO();
       handleServerProcessMessages();
     }
 
-    // NOTE: Scope this out here so we can reference the processId below.
-    let hmrProcess;
-
     if (options?.environment !== 'test') {
-      hmrProcess = await startHMR({
+      const hmrProcess = await startHMR({
         nodeMajorVersion,
         __dirname,
       });
+
+      processIds.push(hmrProcess.pid);
+      process.hmrProcess = hmrProcess;
+
+      handleHMRProcessSTDIO();
+      handleHMRProcessMessages(options);
     }
 
+
     handleSignalEvents(
-      [serverProcess.pid, hmrProcess.pid],
+      processIds,
       nodeMajorVersion,
       __dirname
     );

package/src/lib/dev/startApp.js

@@ -65,7 +65,7 @@ const startApp = (options, { resolve, reject }) => {
     validateOptions(options);
 
     const execArgv = getExecArgs(options?.nodeMajorVersion);
-    const serverProcess = handleStartServerProcess(execArgv);
+    const serverProcess = handleStartServerProcess(execArgv, options?.sessionsBeforeHMRUpdate);
 
     return resolve(serverProcess);
   } catch (exception) {