marko 5.39.13 → 5.39.14

package/README.md

@@ -138,8 +138,8 @@ ul.example-list
   <th><img alt="Discord" src="https://user-images.githubusercontent.com/4985201/89313514-6edbea80-d62d-11ea-8447-ca2fd8983661.png" width="162">
   <th><img alt="Twitter" src="https://user-images.githubusercontent.com/1958812/56055707-07e74380-5d0f-11e9-8a59-d529fbb5a81e.png" width="53">
 <tbody><tr><td>
-  
-  Ask and answer [StackOverflow questions with the `#marko` tag](https://stackoverflow.com/questions/tagged/marko)<td>
+
+Ask and answer [StackOverflow questions with the `#marko` tag](https://stackoverflow.com/questions/tagged/marko)<td>
 
 Come [hang out in our Discord chat](https://discord.gg/RFGxYGs), ask questions, and discuss project direction<td>
 

package/dist/runtime/helpers/load-tag.js

@@ -3,20 +3,46 @@
 var flushHereAndAfter = require("../../core-tags/core/__flush_here_and_after__");
 var escapeScript = require("../html/helpers/escape-script-placeholder");
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
+var DEFAULT_RUNTIME_ID = "M";
 var kAssets = Symbol();
 var kBlockIndex = Symbol();
 var kDeferIndex = Symbol();
 var assetFlush;
 
-exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
+exports.withPageAssets = function withPageAssets(
+typeId,
+template,
+runtime,
+runtimeId)
+{
   assetFlush = runtime;
   var flushBeforeInput = { renderBody: flush };
   return createFacade(template, function (input, out) {
-    var hasAssets = !!out.global[kAssets];
+    var g = out.global;
+    if (runtimeId) {
+      // eslint-disable-next-line no-constant-condition
+
+
+
+
+
+
+
+
+
+
+
+
+      // The client half of the runtimeId contract is baked into the
+      // compiled browser entry, so the compiled value must win for the
+      // halves to agree.
+      g.runtimeId = runtimeId;
+    }
+    var hasAssets = !!g[kAssets];
     var key = out.ad_;
     var def = out.ac_;
     var component = def && def.s_;
-    addAsset(out.global, typeId);
+    addAsset(g, typeId);
 
     if (hasAssets) {
       if (willRerender(def)) {

package/dist/translator/index.js

@@ -281,9 +281,17 @@ const translate = exports.translate = {
       }
 
       if (file.markoOpts.output === "html" && file.markoOpts.entry === "page") {
-        const { linkAssets } = file.markoOpts;
+        const { linkAssets, runtimeId } = file.markoOpts;
         const templateId = file.metadata.marko.id;
         const relPath = (0, _babelUtils.resolveRelativePath)(file, file.opts.filename);
+        const pageAssetArgs = [
+        _compiler.types.stringLiteral(templateId),
+        _compiler.types.identifier("template"),
+        _compiler.types.identifier("flush")];
+
+        if (runtimeId) {
+          pageAssetArgs.push(_compiler.types.stringLiteral(runtimeId));
+        }
         linkAssets.onAsset("page", file.opts.filename, templateId);
         path.node.body = [
         _compiler.types.importDeclaration(
@@ -305,11 +313,7 @@ const translate = exports.translate = {
         ),
         _compiler.types.exportAllDeclaration(_compiler.types.stringLiteral(relPath)),
         _compiler.types.exportDefaultDeclaration(
-          _compiler.types.callExpression(_compiler.types.identifier("withPageAssets"), [
-          _compiler.types.stringLiteral(templateId),
-          _compiler.types.identifier("template"),
-          _compiler.types.identifier("flush")]
-          )
+          _compiler.types.callExpression(_compiler.types.identifier("withPageAssets"), pageAssetArgs)
         )];
 
         path.skip();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.39.13",
+  "version": "5.39.14",
   "private": false,
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
@@ -70,7 +70,7 @@
     "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.66",
+    "@marko/compiler": "^5.40.1",
     "@marko/runtime-tags": "^6.1.19",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
@@ -80,7 +80,7 @@
     "events-light": "^1.0.5",
     "listener-tracker": "^2.0.0",
     "magic-string": "^0.30.21",
-    "minimatch": "^9.0.5",
+    "minimatch": "^10.2.5",
     "raptor-util": "^3.2.0",
     "resolve-from": "^5.0.0",
     "self-closing-tags": "^1.0.1",

package/src/runtime/components/Component.js

@@ -146,7 +146,7 @@ function checkInputChanged(existingComponent, oldInput, newInput) {
       return true;
     }
 
-    for (var i = len; i--; ) {
+    for (var i = len; i--;) {
       var key = oldKeys[i];
       if (!(key in newInput && oldInput[key] === newInput[key])) {
         return true;

package/src/runtime/helpers/dynamic-tag.js

@@ -167,7 +167,7 @@ function addEvents(componentDef, customEvents, props) {
   var result = props || {};
   var event;
 
-  for (var i = len; i--; ) {
+  for (var i = len; i--;) {
     event = customEvents[i];
     result["on" + event[0]] = componentDef.d(
       event[0],

package/src/runtime/helpers/load-tag.js

@@ -3,20 +3,46 @@
 var flushHereAndAfter = require("../../core-tags/core/__flush_here_and_after__");
 var escapeScript = require("../html/helpers/escape-script-placeholder");
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
+var DEFAULT_RUNTIME_ID = "M";
 var kAssets = Symbol();
 var kBlockIndex = Symbol();
 var kDeferIndex = Symbol();
 var assetFlush;
 
-exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
+exports.withPageAssets = function withPageAssets(
+  typeId,
+  template,
+  runtime,
+  runtimeId,
+) {
   assetFlush = runtime;
   var flushBeforeInput = { renderBody: flush };
   return createFacade(template, function (input, out) {
-    var hasAssets = !!out.global[kAssets];
+    var g = out.global;
+    if (runtimeId) {
+      // eslint-disable-next-line no-constant-condition
+      if ("MARKO_DEBUG") {
+        if (g.runtimeId !== DEFAULT_RUNTIME_ID && g.runtimeId !== runtimeId) {
+          throw new Error(
+            '$global.runtimeId ("' +
+              g.runtimeId +
+              '") conflicts with the runtimeId this entry was compiled with ("' +
+              runtimeId +
+              '").',
+          );
+        }
+      }
+
+      // The client half of the runtimeId contract is baked into the
+      // compiled browser entry, so the compiled value must win for the
+      // halves to agree.
+      g.runtimeId = runtimeId;
+    }
+    var hasAssets = !!g[kAssets];
     var key = out.___assignedKey;
     var def = out.___assignedComponentDef;
     var component = def && def.___component;
-    addAsset(out.global, typeId);
+    addAsset(g, typeId);
 
     if (hasAssets) {
       if (willRerender(def)) {

package/src/runtime/html/helpers/_dynamic-attr.js

@@ -25,7 +25,7 @@ module.exports = function dynamicAttr(name, value) {
 // In practice however the only character that does not become an attribute name
 // is when there is a >.
 function isInvalidAttrName(name) {
-  for (let i = name.length; i--; ) {
+  for (let i = name.length; i--;) {
     if (name[i] === ">") {
       return true;
     }

package/src/translator/index.js

@@ -281,9 +281,17 @@ export const translate = {
       }
 
       if (file.markoOpts.output === "html" && file.markoOpts.entry === "page") {
-        const { linkAssets } = file.markoOpts;
+        const { linkAssets, runtimeId } = file.markoOpts;
         const templateId = file.metadata.marko.id;
         const relPath = resolveRelativePath(file, file.opts.filename);
+        const pageAssetArgs = [
+          t.stringLiteral(templateId),
+          t.identifier("template"),
+          t.identifier("flush"),
+        ];
+        if (runtimeId) {
+          pageAssetArgs.push(t.stringLiteral(runtimeId));
+        }
         linkAssets.onAsset("page", file.opts.filename, templateId);
         path.node.body = [
           t.importDeclaration(
@@ -305,11 +313,7 @@ export const translate = {
           ),
           t.exportAllDeclaration(t.stringLiteral(relPath)),
           t.exportDefaultDeclaration(
-            t.callExpression(t.identifier("withPageAssets"), [
-              t.stringLiteral(templateId),
-              t.identifier("template"),
-              t.identifier("flush"),
-            ]),
+            t.callExpression(t.identifier("withPageAssets"), pageAssetArgs),
           ),
         ];
         path.skip();

package/src/translator/tag/native-tag[html]/attributes.js

@@ -68,7 +68,7 @@ export default function (path, attrs) {
   let curString = "";
 
   // Remove duplicate attrs so last one wins.
-  for (let i = len; i--; ) {
+  for (let i = len; i--;) {
     const attr = attrs[i];
     const { name, value } = attr.node;
     if (attrValues.has(name)) continue;

package/src/translator/tag/native-tag[vdom]/attributes.js

@@ -60,7 +60,7 @@ export default function (path, attrs) {
   const props = [];
 
   // Remove duplicate attrs so last one wins.
-  for (let i = len; i--; ) {
+  for (let i = len; i--;) {
     const attr = attrs[i];
     const { name, value } = attr.node;
     if (attrValues.has(name)) continue;

package/src/translator/tag/util.js

@@ -226,7 +226,7 @@ function camelCase(string) {
 }
 
 function findLastIndex(arr, check) {
-  for (let i = arr.length; i--; ) {
+  for (let i = arr.length; i--;) {
     if (check(arr[i])) {
       return i;
     }

package/tags-html.d.ts

@@ -823,13 +823,7 @@ declare global {
          * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method
          */
         method?:
-          | AttrMissing
-          | "POST"
-          | "post"
-          | "GET"
-          | "get"
-          | "dialog"
-          | "DIALOG";
+          AttrMissing | "POST" | "post" | "GET" | "get" | "dialog" | "DIALOG";
         /**
          * The name attribute represents the form's name within the forms collection.
          * @see https://html.spec.whatwg.org/multipage/forms.html#attr-form-name
@@ -2479,11 +2473,7 @@ declare global {
        * @see https://html.spec.whatwg.org/multipage/interaction.html#attr-autocapitalize
        */
       autocapitalize?:
-        | AttrOnOff
-        | "characters"
-        | "none"
-        | "sentences"
-        | "words";
+        AttrOnOff | "characters" | "none" | "sentences" | "words";
 
       /**
        * Indicates whether the element should automatically get focus when the page loads.
@@ -3593,13 +3583,7 @@ declare global {
        * @see https://www.w3.org/TR/wai-aria-1.1/#aria-dropeffect
        * */
       "aria-dropeffect"?:
-        | AttrMissing
-        | "copy"
-        | "execute"
-        | "link"
-        | "move"
-        | "none"
-        | "popup";
+        AttrMissing | "copy" | "execute" | "link" | "move" | "none" | "popup";
       /**
        * Identifies the element that provides an error message for the object.
        * @see https://www.w3.org/TR/wai-aria-1.1/#aria-errormessage
@@ -3629,12 +3613,7 @@ declare global {
        * @see https://www.w3.org/TR/wai-aria-1.1/#aria-haspopup
        */
       "aria-haspopup"?:
-        | AttrBooleanString
-        | "dialog"
-        | "grid"
-        | "listbox"
-        | "menu"
-        | "tree";
+        AttrBooleanString | "dialog" | "grid" | "listbox" | "menu" | "tree";
       /**
        * Indicates whether the element is exposed to an accessibility API.
        * @see https://www.w3.org/TR/wai-aria-1.1/#aria-hidden
@@ -3893,22 +3872,13 @@ declare global {
 
 type AttrMissing = undefined | null | false;
 type AttrClass =
-  | AttrMissing
-  | string
-  | AttrClass[]
-  | Record<string, AttrMissing | boolean>;
+  AttrMissing | string | AttrClass[] | Record<string, AttrMissing | boolean>;
 type AttrStyle = AttrMissing | string | Marko.CSS.Properties | AttrStyle[];
 type AttrCrossOrigin = AttrBoolean | "anonymous" | "use-credentials";
 type AttrEventHandler<Event, Target> =
-  | AttrMissing
-  | ((event: Event, target: Target) => unknown);
+  AttrMissing | ((event: Event, target: Target) => unknown);
 type AttrTarget =
-  | AttrMissing
-  | "_blank"
-  | "_parent"
-  | "_self"
-  | "_top"
-  | (string & {});
+  AttrMissing | "_blank" | "_parent" | "_self" | "_top" | (string & {});
 type AttrReferrerPolicy =
   | AttrMissing
   | "no-referrer-when-downgrade"
@@ -3938,13 +3908,7 @@ type AttrHref =
  * so any URL is accepted while suggesting common prefixes in autocomplete.
  */
 type AttrSrc =
-  | AttrMissing
-  | "/"
-  | "./"
-  | "https://"
-  | "data:"
-  | "blob:"
-  | (string & {});
+  AttrMissing | "/" | "./" | "https://" | "data:" | "blob:" | (string & {});
 /**
  * MIME type for type, codetype, and enctype attributes. Use (string & {}) so
  * any MIME type is accepted while suggesting common values in autocomplete.