@joystick.js/cli-canary 0.0.0-canary.143 → 0.0.0-canary.145

package/dist/lib/dev/index.js

@@ -19,6 +19,7 @@ import { SETTINGS_FILE_NAME_REGEX } from "../regexes.js";
 import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
 import chalk from "chalk";
+const processIds = [];
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -43,7 +44,7 @@ const getDatabaseProcessIds = () => {
     throw new Error(`[dev.getDatabaseProcessIds] ${exception.message}`);
   }
 };
-const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "") => {
+const handleSignalEvents = (processIds2 = [], nodeMajorVersion = 0, __dirname = "") => {
   try {
     const execArgv = ["--no-warnings"];
     if (nodeMajorVersion < 19) {
@@ -65,12 +66,12 @@ const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "
     process.cleanupProcess = cleanupProcess;
     process.on("SIGINT", async () => {
       const databaseProcessIds = getDatabaseProcessIds();
-      cleanupProcess.send(JSON.stringify({ processIds: [...processIds, ...databaseProcessIds] }));
+      cleanupProcess.send(JSON.stringify({ processIds: [...processIds2, ...databaseProcessIds] }));
       process.exit();
     });
     process.on("SIGTERM", async () => {
       const databaseProcessIds = getDatabaseProcessIds();
-      cleanupProcess.send(JSON.stringify({ processIds: [...processIds, ...databaseProcessIds] }));
+      cleanupProcess.send(JSON.stringify({ processIds: [...processIds2, ...databaseProcessIds] }));
       process.exit();
     });
   } catch (exception) {
@@ -257,13 +258,7 @@ const handleRestartApplicationProcess = async (options = {}) => {
         process.loader.text("Restarting app...");
       }
       process.serverProcess.kill();
-      await startApp({
-        nodeMajorVersion: options?.nodeMajorVersion,
-        port: options?.port,
-        sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
-      });
-      handleServerProcessSTDIO();
-      handleServerProcessMessages();
+      await handleStartAppServer(options);
       return Promise.resolve();
     }
     process.loader.text("Starting app...");
@@ -275,6 +270,23 @@ const handleRestartApplicationProcess = async (options = {}) => {
     throw new Error(`[dev.handleRestartApplicationProcess] ${exception.message}`);
   }
 };
+const handleStartAppServer = async (options = {}) => {
+  try {
+    const serverProcess = await startApp({
+      nodeMajorVersion: options?.nodeMajorVersion,
+      port: options?.port,
+      sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
+    });
+    if (serverProcess) {
+      processIds.push(serverProcess.pid);
+      process.serverProcess = serverProcess;
+      handleServerProcessSTDIO();
+      handleServerProcessMessages();
+    }
+  } catch (exception) {
+    throw new Error(`[actionName.handleStartAppServer] ${exception.message}`);
+  }
+};
 const handleNotifyHMRClients = async (indexHTMLChanged = false) => {
   try {
     if (process.hmrProcess) {
@@ -491,18 +503,14 @@ const dev = async (options, { resolve, reject }) => {
       settings: settings.parsed
     });
     await runInitialBuild(settings?.parsed?.config?.build);
-    await startFileWatcher(options);
-    const processIds = [];
-    const serverProcess = await startApp({
-      nodeMajorVersion,
-      port: options?.port
+    await startFileWatcher({
+      ...options,
+      nodeMajorVersion
+    });
+    await handleStartAppServer({
+      ...options,
+      nodeMajorVersion
     });
-    if (serverProcess) {
-      processIds.push(serverProcess.pid);
-      process.serverProcess = serverProcess;
-      handleServerProcessSTDIO();
-      handleServerProcessMessages();
-    }
     if (options?.environment !== "test") {
       const hmrProcess = await startHMR({
         nodeMajorVersion,
@@ -511,7 +519,10 @@ const dev = async (options, { resolve, reject }) => {
       processIds.push(hmrProcess.pid);
       process.hmrProcess = hmrProcess;
       handleHMRProcessSTDIO();
-      handleHMRProcessMessages(options);
+      handleHMRProcessMessages({
+        ...options,
+        nodeMajorVersion
+      });
     }
     handleSignalEvents(
       processIds,

package/package.json

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

package/src/lib/dev/index.js

@@ -22,6 +22,8 @@ import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
 import chalk from "chalk";
 
+const processIds = [];
+
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -313,16 +315,7 @@ const handleRestartApplicationProcess = async (options = {}) => {
 
         process.serverProcess.kill();
 
-        await startApp({
-          nodeMajorVersion: options?.nodeMajorVersion,
-          port: options?.port,
-          sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate,
-        });
-
-        // NOTE: Reattach process event handlers here because the ones down below
-        // are stale after a restart.
-        handleServerProcessSTDIO();
-        handleServerProcessMessages();
+        await handleStartAppServer(options);
 
         return Promise.resolve();
       }
@@ -339,6 +332,25 @@ const handleRestartApplicationProcess = async (options = {}) => {
   }
 };
 
+const handleStartAppServer = async (options = {}) => {
+  try {
+    const serverProcess = await startApp({
+      nodeMajorVersion: options?.nodeMajorVersion,
+      port: options?.port,
+      sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate,
+    });
+
+    if (serverProcess) {
+      processIds.push(serverProcess.pid);
+      process.serverProcess = serverProcess;
+      handleServerProcessSTDIO();
+      handleServerProcessMessages();
+    }
+  } catch (exception) {
+    throw new Error(`[actionName.handleStartAppServer] ${exception.message}`);
+  }
+};
+
 const handleNotifyHMRClients = async (indexHTMLChanged = false) => {
   try {
     if (process.hmrProcess) {
@@ -590,21 +602,15 @@ const dev = async (options, { resolve, reject }) => {
     });
 
     await runInitialBuild(settings?.parsed?.config?.build);
-    await startFileWatcher(options);
-
-    const processIds = [];
-
-    const serverProcess = await startApp({
+    await startFileWatcher({
+      ...options,
       nodeMajorVersion,
-      port: options?.port,
     });
 
-    if (serverProcess) {
-      processIds.push(serverProcess.pid);
-      process.serverProcess = serverProcess;
-      handleServerProcessSTDIO();
-      handleServerProcessMessages();
-    }
+    await handleStartAppServer({
+      ...options,
+      nodeMajorVersion,
+    });
 
     if (options?.environment !== 'test') {
       const hmrProcess = await startHMR({
@@ -616,7 +622,10 @@ const dev = async (options, { resolve, reject }) => {
       process.hmrProcess = hmrProcess;
 
       handleHMRProcessSTDIO();
-      handleHMRProcessMessages(options);
+      handleHMRProcessMessages({
+        ...options,
+        nodeMajorVersion,
+      });
     }