fix: HMR

packages/server/src/entry.js

@@ -31,6 +31,7 @@ import {D, Flecks} from '@flecks/core';
 
 if (module.hot) {
   module.hot.accept('@flecks/server/runtime', () => {
+    module.hot.invalidate();
     if (cluster.isWorker) {
       cluster.worker.disconnect();
       const error = new Error('Restart requested!');

packages/server/src/server.js

@@ -7,6 +7,23 @@ const {
 } = process.env;
 
 export const hooks = {
+  '@flecks/core.hmr': (path, M, flecks) => {
+    if (
+      flecks.fleckImplementation(path, '@flecks/server.up')
+      || M.hooks?.['@flecks/server.up']) {
+      if (
+        flecks.fleckImplementation(path, '@flecks/server.up')?.toString()
+        !== M.hooks?.['@flecks/server.up']?.toString()
+      ) {
+        if (cluster.isWorker) {
+          cluster.worker.disconnect();
+          const error = new Error('@flecks/server.up implementation changed!');
+          error.stack = '';
+          throw error;
+        }
+      }
+    }
+  },
   '@flecks/server.up': (flecks) => {
     if (!FLECKS_SERVER_TEST_SOCKET || 'test' !== NODE_ENV) {
       return;

packages/web/build/runtime.js

@@ -68,9 +68,16 @@ module.exports = async (config, env, argv, flecks) => {
   source.push('if (module.hot) {');
   resolvedPaths.forEach((path) => {
     source.push(`  module.hot.accept('${path}', async () => {`);
-    source.push(`    const updatedFleck = require('${path}');`);
+    source.push(`    const M = require('${path}')`);
-    source.push(`    window.flecks.refresh('${path}', updatedFleck);`);
+    source.push('    try {');
-    source.push(`    window.flecks.invoke('@flecks/core.hmr', '${path}', updatedFleck);`);
+    source.push(`      global.flecks.invokeSequential('@flecks/core.hmr', '${path}', M);`);
+    source.push(`      global.flecks.refresh('${path}', M);`);
+    source.push('    }');
+    source.push('    catch (error) {');
+    // eslint-disable-next-line no-template-curly-in-string
+    source.push('      console.error(`HMR failed for fleck: ${error.message}`);');
+    source.push('      module.hot.invalidate();');
+    source.push('    }');
     source.push('  });');
   });
   source.push('}');

packages/web/src/client.js

@@ -1,3 +1,18 @@
+export const hooks = {
+  '@flecks/core.hmr': (path, M, flecks) => {
+    if (
+      flecks.fleckImplementation(path, '@flecks/web/client.up')
+      || M.hooks?.['@flecks/web/client.up']) {
+      if (
+        flecks.fleckImplementation(path, '@flecks/web/client.up')?.toString()
+        !== M.hooks?.['@flecks/web/client.up']?.toString()
+      ) {
+        throw new Error('@flecks/web/client.up implementation changed!');
+      }
+    }
+  },
+};
+
 export const mixin = (Flecks) => class FlecksWithWebClient extends Flecks {
 
   constructor(runtime) {

packages/web/src/server/build/entry.js

@@ -68,3 +68,9 @@ const {version} = require('@flecks/web/package.json');
     console.error(error);
   }
 })();
+
+if (module.hot) {
+  module.hot.accept('@flecks/web/runtime', () => {
+    module.hot.invalidate();
+  });
+}