fix reload behaviors; bump 0.0.6

Author: tiye

calcit.cirru

@@ -2,7 +2,7 @@
 {} (:package |cumulo-reel)
   :configs $ {} (:init-fn |cumulo-reel.app.client/main!) (:reload-fn |cumulo-reel.app.client/reload!)
     :modules $ [] |respo.calcit/ |lilac/ |recollect/ |memof/ |respo-ui.calcit/ |ws-edn.calcit/ |cumulo-util.calcit/ |respo-message.calcit/
-    :version |0.0.5
+    :version |0.0.6
   :files $ {}
     |cumulo-reel.app.updater.user $ {}
       :ns $ quote
@@ -92,7 +92,7 @@
         |refresh-reel $ quote
           defn refresh-reel (reel base updater)
             let
-                next-base $ if (&map:get reel :merged?) (:base reel) base
+                next-base $ if (&record:get reel :merged?) (:base reel) base
               -> reel (assoc :base next-base)
                 assoc :db $ play-records next-base (:records reel) updater
         |ReelState $ quote (defrecord ReelState :base :db :records :merged?)

compact.cirru

@@ -1,13 +1,14 @@
 {
-  "version": "0.0.5",
+  "version": "0.0.6",
   "dependencies": {
-    "@calcit/procs": "^0.4.0-a13"
+    "@calcit/procs": "^0.4.0-a14"
   },
   "scripts": {
-    "watch-server": "cr --emit-js --init-fn cumulo-reel.app.server/main! --reload-fn cumulo-reel.app.server/main!",
+    "watch-server": "cr --emit-js --init-fn cumulo-reel.app.server/main! --reload-fn cumulo-reel.app.server/reload!",
     "build-server": "target=node entry=./server.js yarn webpack",
+    "dev-server": "hot=true webpack --watch",
     "server": "env=dev node js-out/bundle.js",
-    "compile-server": "cr --emit-js --once --init-fn cumulo-reel.app.server/main! --reload-fn cumulo-reel.app.server/main!",
+    "compile-server": "cr --emit-js --once --init-fn cumulo-reel.app.server/main! --reload-fn cumulo-reel.app.server/reload!",
     "compile-page": "cr --emit-js --once --emit-path out-page/",
     "watch-page": "cr --emit-js --emit-path out-page/"
   },
@@ -16,7 +17,7 @@
     "randomcolor": "^0.6.2",
     "shortid": "^2.2.16",
     "vite": "^2.3.8",
-    "webpack": "^5.39.1",
+    "webpack": "^5.40.0",
     "webpack-cli": "^4.7.2",
     "ws": "^7.5.0"
   }

package.json

@@ -1,10 +1,11 @@
 
-import { main_$x_ } from "./js-out/cumulo-reel.app.server.js"
+import { main_$x_, reload_$x_ } from "./js-out/cumulo-reel.app.server.js"
 
-main_$x_()
+main_$x_();
 
-if (import.meta.hot) {
-  import.meta.hot.accept('./js-out/cumulo-reel.app.server.js', (main) => {
-    main.reload_$x_()
+if (module.hot) {
+  module.hot.accept('./js-out/cumulo-reel.app.server.js', (main) => {
+    console.log("Reload server")
+    reload_$x_();
   })
 }

server.js

@@ -1,13 +1,20 @@
 let path = require("path");
+let webpack = require('webpack');
 
-let bundleTarget = process.env.target === "node" ? "node" : "web";
+let bundleTarget = process.env.target === "web" ? "web" : "node";
 console.log("Bundle target:", bundleTarget);
 
-let entry = process.env.entry ?? '"./client.js"';
+let entry = process.env.entry ?? './server.js';
 console.log("Entry:", entry);
 
+let hot = process.env.hot === 'true' ? true : false;
+console.log("Hot:", hot)
+
 module.exports = {
-  entry: entry,
+  entry: hot ? [
+    'webpack/hot/poll?1000',
+    entry
+  ] : entry,
   target: bundleTarget,
   mode: "development",
   devtool: "hidden-source-map",
@@ -20,4 +27,7 @@ module.exports = {
     path: path.resolve(__dirname, "js-out/"),
     filename: "bundle.js",
   },
+  plugins: [
+    hot ? new webpack.HotModuleReplacementPlugin(): null
+  ].filter(x => x != null)
 };