@marko/runtime-tags 6.0.111 → 6.0.113

package/README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-# [<img alt="Marko" src="https://raw.githubusercontent.com/marko-js/website-next/refs/heads/main/public/logo.svg" width="250">](https://markojs.com/)
+# [<img alt="Marko" src="https://raw.githubusercontent.com/marko-js/website/refs/heads/main/public/assets/logo.svg" width="250">](https://markojs.com/)
 
 **A declarative, HTML-based language that makes building web apps fun 🔥**
 

package/dist/debug/dom.js

@@ -511,6 +511,7 @@ function getDebugKey(index, node) {
 // src/dom/resume.ts
 var registeredValues = {};
 var branchesEnabled;
+var isInit;
 function enableBranches() {
   branchesEnabled = 1;
 }
@@ -620,7 +621,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         );
         render.w = (effects = []) => {
           try {
-            walk2();
+            isInit || walk2();
             isResuming = 1;
             for (const serialized of resumes = render.r || []) {
               if (typeof serialized === "string") {
@@ -667,7 +668,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             }
             runEffects(effects);
           } finally {
-            isResuming = visits.length = resumes.length = 0;
+            isInit = isResuming = visits.length = resumes.length = 0;
           }
         };
         return render;
@@ -677,6 +678,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (renders) {
     initRuntime(renders);
     for (const renderId in renders) {
+      isInit = 1;
       resumeRender(renderId).w();
     }
   } else {

package/dist/debug/dom.mjs

@@ -408,6 +408,7 @@ function getDebugKey(index, node) {
 // src/dom/resume.ts
 var registeredValues = {};
 var branchesEnabled;
+var isInit;
 function enableBranches() {
   branchesEnabled = 1;
 }
@@ -517,7 +518,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         );
         render.w = (effects = []) => {
           try {
-            walk2();
+            isInit || walk2();
             isResuming = 1;
             for (const serialized of resumes = render.r || []) {
               if (typeof serialized === "string") {
@@ -564,7 +565,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             }
             runEffects(effects);
           } finally {
-            isResuming = visits.length = resumes.length = 0;
+            isInit = isResuming = visits.length = resumes.length = 0;
           }
         };
         return render;
@@ -574,6 +575,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (renders) {
     initRuntime(renders);
     for (const renderId in renders) {
+      isInit = 1;
       resumeRender(renderId).w();
     }
   } else {

package/dist/debug/html.js

@@ -30,6 +30,7 @@ __export(html_exports, {
   _attr_input_checked: () => _attr_input_checked,
   _attr_input_checkedValue: () => _attr_input_checkedValue,
   _attr_input_value: () => _attr_input_value,
+  _attr_nonce: () => _attr_nonce,
   _attr_option_value: () => _attr_option_value,
   _attr_select_value: () => _attr_select_value,
   _attr_style: () => _attr_style,
@@ -2929,6 +2930,9 @@ function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
   }
   return _attr("open", open);
 }
+function _attr_nonce() {
+  return getChunk().boundary.state.nonceAttr;
+}
 function _attr(name, value) {
   return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
@@ -3620,6 +3624,7 @@ function NOOP3() {
   _attr_input_checked,
   _attr_input_checkedValue,
   _attr_input_value,
+  _attr_nonce,
   _attr_option_value,
   _attr_select_value,
   _attr_style,

package/dist/debug/html.mjs

@@ -2837,6 +2837,9 @@ function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
   }
   return _attr("open", open);
 }
+function _attr_nonce() {
+  return getChunk().boundary.state.nonceAttr;
+}
 function _attr(name, value) {
   return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
@@ -3527,6 +3530,7 @@ export {
   _attr_input_checked,
   _attr_input_checkedValue,
   _attr_input_value,
+  _attr_nonce,
   _attr_option_value,
   _attr_select_value,
   _attr_style,

package/dist/dom.js

@@ -332,7 +332,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 }
 
 // src/dom/resume.ts
-var registeredValues = {}, branchesEnabled;
+var registeredValues = {}, branchesEnabled, isInit;
 function enableBranches() {
   branchesEnabled = 1;
 }
@@ -377,7 +377,7 @@ function init(runtimeId = "M") {
         );
         return render.w = (effects = []) => {
           try {
-            walk2(), isResuming = 1;
+            isInit || walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -399,7 +399,7 @@ function init(runtimeId = "M") {
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
             runEffects(effects);
           } finally {
-            isResuming = visits.length = resumes.length = 0;
+            isInit = isResuming = visits.length = resumes.length = 0;
           }
         }, render;
       })
@@ -408,7 +408,7 @@ function init(runtimeId = "M") {
   if (renders) {
     initRuntime(renders);
     for (let renderId in renders)
-      resumeRender(renderId).w();
+      isInit = 1, resumeRender(renderId).w();
   } else
     defineRuntime({
       configurable: !0,

package/dist/dom.mjs

@@ -232,7 +232,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 }
 
 // src/dom/resume.ts
-var registeredValues = {}, branchesEnabled;
+var registeredValues = {}, branchesEnabled, isInit;
 function enableBranches() {
   branchesEnabled = 1;
 }
@@ -277,7 +277,7 @@ function init(runtimeId = "M") {
         );
         return render.w = (effects = []) => {
           try {
-            walk2(), isResuming = 1;
+            isInit || walk2(), isResuming = 1;
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -299,7 +299,7 @@ function init(runtimeId = "M") {
               }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
             runEffects(effects);
           } finally {
-            isResuming = visits.length = resumes.length = 0;
+            isInit = isResuming = visits.length = resumes.length = 0;
           }
         }, render;
       })
@@ -308,7 +308,7 @@ function init(runtimeId = "M") {
   if (renders) {
     initRuntime(renders);
     for (let renderId in renders)
-      resumeRender(renderId).w();
+      isInit = 1, resumeRender(renderId).w();
   } else
     defineRuntime({
       configurable: !0,

package/dist/html/attrs.d.ts

@@ -8,6 +8,7 @@ export declare function _attr_input_value(scopeId: number, nodeAccessor: Accesso
 export declare function _attr_input_checked(scopeId: number, nodeAccessor: Accessor, checked: unknown, checkedChange: unknown): string;
 export declare function _attr_input_checkedValue(scopeId: number, nodeAccessor: Accessor, checkedValue: unknown, checkedValueChange: unknown, value: unknown): string;
 export declare function _attr_details_or_dialog_open(scopeId: number, nodeAccessor: Accessor, open: unknown, openChange: unknown): string;
+export declare function _attr_nonce(): string;
 export declare function _attr(name: string, value: unknown): string;
 export declare function _attrs(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;
 export declare function _attrs_content(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string, serializeReason?: 1 | 0): void;

package/dist/html.d.ts

@@ -1,6 +1,6 @@
 export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
-export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
+export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
 export { compat } from "./html/compat";
 export { _escape, _escape_script, _escape_style, _escape_textarea_value, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";

package/dist/html.js

@@ -27,6 +27,7 @@ __export(html_exports, {
   _attr_input_checked: () => _attr_input_checked,
   _attr_input_checkedValue: () => _attr_input_checkedValue,
   _attr_input_value: () => _attr_input_value,
+  _attr_nonce: () => _attr_nonce,
   _attr_option_value: () => _attr_option_value,
   _attr_select_value: () => _attr_select_value,
   _attr_style: () => _attr_style,
@@ -1820,6 +1821,9 @@ function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
     openChange
   ), _attr("open", open);
 }
+function _attr_nonce() {
+  return getChunk().boundary.state.nonceAttr;
+}
 function _attr(name, value) {
   return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
@@ -2301,6 +2305,7 @@ function NOOP3() {
   _attr_input_checked,
   _attr_input_checkedValue,
   _attr_input_value,
+  _attr_nonce,
   _attr_option_value,
   _attr_select_value,
   _attr_style,

package/dist/html.mjs

@@ -1731,6 +1731,9 @@ function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
     openChange
   ), _attr("open", open);
 }
+function _attr_nonce() {
+  return getChunk().boundary.state.nonceAttr;
+}
 function _attr(name, value) {
   return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
@@ -2211,6 +2214,7 @@ export {
   _attr_input_checked,
   _attr_input_checkedValue,
   _attr_input_value,
+  _attr_nonce,
   _attr_option_value,
   _attr_select_value,
   _attr_style,

package/dist/translator/index.js

@@ -9832,8 +9832,11 @@ var html_script_default = {
         visit(tag, 32 /* Get */);
       }
       write`<script`;
-      const usedAttrs = getUsedAttrs2(tag.node);
-      const { staticAttrs, skipExpression, spreadExpression } = usedAttrs;
+      const usedAttrs = getUsedAttrs2(tag.node, isHTML);
+      const { hasNonce, staticAttrs, skipExpression, spreadExpression } = usedAttrs;
+      if (isHTML && !hasNonce && !spreadExpression) {
+        write`${callRuntime("_attr_nonce")}`;
+      }
       for (const attr of staticAttrs) {
         const { name: name2, value } = attr;
         const { confident, computed } = value.extra || {};
@@ -10022,7 +10025,7 @@ var html_script_default = {
     }
   ]
 };
-function getUsedAttrs2(tag) {
+function getUsedAttrs2(tag, injectNonce) {
   const seen = {};
   const { attributes } = tag;
   const maybeStaticAttrs = /* @__PURE__ */ new Set();
@@ -10030,6 +10033,7 @@ function getUsedAttrs2(tag) {
   let skipExpression;
   let spreadProps;
   let skipProps;
+  let hasNonce = false;
   for (let i = attributes.length; i--; ) {
     const attr = attributes[i];
     const { value } = attr;
@@ -10040,6 +10044,9 @@ function getUsedAttrs2(tag) {
       spreadProps.push(import_compiler44.types.spreadElement(value));
     } else if (!seen[attr.name]) {
       seen[attr.name] = attr;
+      if (attr.name === "nonce") {
+        hasNonce = true;
+      }
       if (spreadProps) {
         spreadProps.push(toObjectProperty(attr.name, attr.value));
       } else {
@@ -10056,9 +10063,18 @@ function getUsedAttrs2(tag) {
     if (skipProps) {
       skipExpression = import_compiler44.types.objectExpression(skipProps);
     }
+    if (injectNonce && !hasNonce) {
+      spreadProps.unshift(
+        import_compiler44.types.objectProperty(
+          import_compiler44.types.identifier("nonce"),
+          import_compiler44.types.memberExpression(callRuntime("$global"), import_compiler44.types.identifier("cspNonce"))
+        )
+      );
+    }
     spreadExpression = propsToExpression(spreadProps);
   }
   return {
+    hasNonce,
     staticAttrs,
     spreadExpression,
     skipExpression
@@ -10173,8 +10189,11 @@ var html_style_default = {
         visit(tag, 32 /* Get */);
       }
       write`<style`;
-      const usedAttrs = getUsedAttrs3(tag.node);
-      const { staticAttrs, skipExpression, spreadExpression } = usedAttrs;
+      const usedAttrs = getUsedAttrs3(tag.node, isHTML);
+      const { hasNonce, staticAttrs, skipExpression, spreadExpression } = usedAttrs;
+      if (isHTML && !hasNonce && !spreadExpression) {
+        write`${callRuntime("_attr_nonce")}`;
+      }
       for (const attr of staticAttrs) {
         const { name: name2, value } = attr;
         const { confident, computed } = value.extra || {};
@@ -10358,7 +10377,7 @@ var html_style_default = {
     }
   ]
 };
-function getUsedAttrs3(tag) {
+function getUsedAttrs3(tag, injectNonce) {
   const seen = {};
   const { attributes } = tag;
   const maybeStaticAttrs = /* @__PURE__ */ new Set();
@@ -10366,6 +10385,7 @@ function getUsedAttrs3(tag) {
   let skipExpression;
   let spreadProps;
   let skipProps;
+  let hasNonce = false;
   for (let i = attributes.length; i--; ) {
     const attr = attributes[i];
     const { value } = attr;
@@ -10376,6 +10396,9 @@ function getUsedAttrs3(tag) {
       spreadProps.push(import_compiler45.types.spreadElement(value));
     } else if (!seen[attr.name]) {
       seen[attr.name] = attr;
+      if (attr.name === "nonce") {
+        hasNonce = true;
+      }
       if (spreadProps) {
         spreadProps.push(toObjectProperty(attr.name, attr.value));
       } else {
@@ -10392,9 +10415,18 @@ function getUsedAttrs3(tag) {
     if (skipProps) {
       skipExpression = import_compiler45.types.objectExpression(skipProps);
     }
+    if (injectNonce && !hasNonce) {
+      spreadProps.unshift(
+        import_compiler45.types.objectProperty(
+          import_compiler45.types.identifier("nonce"),
+          import_compiler45.types.memberExpression(callRuntime("$global"), import_compiler45.types.identifier("cspNonce"))
+        )
+      );
+    }
     spreadExpression = propsToExpression(spreadProps);
   }
   return {
+    hasNonce,
     staticAttrs,
     spreadExpression,
     skipExpression

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.0.111",
+  "version": "6.0.113",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",