@joystick.js/cli-canary 0.0.0-canary.140 → 0.0.0-canary.142

package/dist/lib/dev/index.js

@@ -262,6 +262,8 @@ const handleRestartApplicationProcess = async (options = {}) => {
         port: options?.port,
         sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
       });
+      handleServerProcessSTDIO();
+      handleServerProcessMessages();
       return Promise.resolve();
     }
     process.loader.text("Starting app...");
@@ -273,14 +275,14 @@ const handleRestartApplicationProcess = async (options = {}) => {
     throw new Error(`[dev.handleRestartApplicationProcess] ${exception.message}`);
   }
 };
-const handleNotifyHMRClients = (indexHTMLChanged = false) => {
+const handleNotifyHMRClients = async (indexHTMLChanged = false) => {
   try {
     if (process.hmrProcess) {
-      const settings = loadSettings(process.env.NODE_ENV);
+      const settings = await loadSettings(process.env.NODE_ENV);
       process.hmrProcess.send(
         JSON.stringify({
           type: "RESTART_SERVER",
-          settings,
+          settings: settings.parsed,
           indexHTMLChanged
         })
       );

package/package.json

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

package/src/lib/dev/index.js

@@ -319,6 +319,11 @@ const handleRestartApplicationProcess = async (options = {}) => {
           sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate,
         });
 
+        // NOTE: Reattach process event handlers here because the ones down below
+        // are stale after a restart.
+        handleServerProcessSTDIO();
+        handleServerProcessMessages();
+
         return Promise.resolve();
       }
 
@@ -334,14 +339,14 @@ const handleRestartApplicationProcess = async (options = {}) => {
   }
 };
 
-const handleNotifyHMRClients = (indexHTMLChanged = false) => {
+const handleNotifyHMRClients = async (indexHTMLChanged = false) => {
   try {
     if (process.hmrProcess) {
-      const settings = loadSettings(process.env.NODE_ENV);
+      const settings = await loadSettings(process.env.NODE_ENV);
       process.hmrProcess.send(
         JSON.stringify({
           type: "RESTART_SERVER",
-          settings,
+          settings: settings.parsed,
           indexHTMLChanged,
         })
       );