@primate/marko 0.11.2 → 0.12.0

package/lib/private/client/app.js

@@ -1,5 +1,6 @@
 import root from "#client/root";
 import request from "#request/store";
+import runtime_id from "#runtime-id";
 import client from "@primate/core/client";
 import RootView from "marko:root";
 export default class MarkoApp {
@@ -9,11 +10,13 @@ export default class MarkoApp {
             return;
         let instance;
         let current = data;
-        let initial = data.ssr;
         const key = (next) => `${next.views.join("\0")}\0${next.request.url}`;
         const render = (next, remount = false) => {
             current = next;
-            const props = root.toProps(next);
+            const props = {
+                ...root.toProps(next),
+                $global: { runtimeId: runtime_id(next.group) },
+            };
             if (!remount && instance !== undefined) {
                 instance.update?.(props);
                 return;
@@ -32,14 +35,8 @@ export default class MarkoApp {
         }
         if (data.csr) {
             const start = () => client.boot("marko", (next, update) => {
-                if (initial && key(next) === key(current)) {
-                    initial = false;
-                    current = next;
-                    update?.();
-                    return;
-                }
-                initial = false;
-                render(next, instance === undefined);
+                const remount = key(next) !== key(current);
+                render(next, remount || instance === undefined);
                 update?.();
             }, (url, query) => {
                 request.set({
@@ -48,6 +45,11 @@ export default class MarkoApp {
                     query,
                     url,
                 });
+            }, () => {
+                instance?.destroy?.();
+                instance = undefined;
+                for (const mod of mods)
+                    mod.invalidate(() => undefined);
             });
             if (document.readyState === "loading") {
                 window.addEventListener("DOMContentLoaded", start, { once: true });

package/lib/private/default.js

@@ -1,5 +1,6 @@
 import create_root from "#create-root";
 import init from "#init";
+import runtime_id from "#runtime-id";
 import { compileSync } from "@marko/compiler";
 import frontend from "@primate/core/frontend";
 const styles = new Map();
@@ -18,12 +19,13 @@ function resolveVirtualDependency(_from, dependency) {
     });
     return path;
 }
-function compile(text, file, output, root = false) {
+function compile(text, file, output, root = false, group) {
     return compileSync(text, root || file.path.startsWith("root:")
         ? root_file
         : file.path, {
         output,
         resolveVirtualDependency,
+        ...group === undefined ? {} : { runtimeId: runtime_id(group) },
     });
 }
 const plugin = {
@@ -69,16 +71,16 @@ export default frontend({
     },
     compile: {
         server: (text, file) => compile(text, file, "html").code,
-        client: (text, file, root, hydrate) => {
+        client: (text, file, root, hydrate, group) => {
             if (root && hydrate) {
-                root_dom = compile(text, file, "dom", true).code;
+                root_dom = compile(text, file, "dom", true, group).code;
                 return {
-                    js: `${compile(text, file, "hydrate", true).code}
+                    js: `${compile(text, file, "hydrate", true, group).code}
            export { default } from "./root.marko";`,
                 };
             }
             return {
-                js: compile(text, file, "dom", root).code,
+                js: compile(text, file, "dom", root, group).code,
             };
         },
     },

package/lib/private/init.js

@@ -1,11 +1,13 @@
+import runtime_id from "#runtime-id";
 const module = {
     name: "marko",
     extensions: [".marko"],
     conditions: ["marko"],
     layouts: true,
     client: true,
-    async render(component, props) {
-        return { body: (await component.render(props)).toString() };
+    async render(component, props, { group }) {
+        const $global = { runtimeId: runtime_id(group) };
+        return { body: (await component.render({ ...props, $global })).toString() };
     },
 };
 export default module;

package/lib/private/runtime-id.d.ts

@@ -0,0 +1,3 @@
+declare const runtime_id: (group: string) => string;
+export default runtime_id;
+//# sourceMappingURL=runtime-id.d.ts.map

package/lib/private/runtime-id.js

@@ -0,0 +1,5 @@
+const runtime_id = (group) => `P${[...new TextEncoder().encode(group)]
+    .map(byte => byte.toString(16).padStart(2, "0"))
+    .join("")}`;
+export default runtime_id;
+//# sourceMappingURL=runtime-id.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/marko",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Marko for Primate",
   "homepage": "https://primate.run/docs/frontend/marko",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -18,15 +18,15 @@
     "!/**/*.spec.*"
   ],
   "dependencies": {
-    "@marko/compiler": "^5.41.2",
-    "@primate/core": "^0.9.28",
+    "@marko/compiler": "^5.42.3",
+    "@primate/core": "^0.10.0",
     "@rcompat/fs": "^0.35.1",
-    "marko": "^6.3.3"
+    "marko": "^6.3.48"
   },
   "devDependencies": {
     "@rcompat/type": "^0.18.0",
     "@types/marko": "^4.6.9",
-    "esbuild": "^0.28.1"
+    "esbuild": "^0.28.2"
   },
   "imports": {
     "#tags/*": {
@@ -50,7 +50,7 @@
     }
   },
   "scripts": {
-    "build": "npm run clean && tsc",
+    "build": "pnpm run clean && tsc",
     "clean": "rm -rf ./lib",
     "lint": "eslint ."
   }