marko 4.25.0 → 4.26.0

package/src/core-tags/core/await/noop-render.js

@@ -1 +1 @@
-module.exports = function() {};
+module.exports = function () {};

package/src/core-tags/core/await/renderer.js

@@ -1,6 +1,5 @@
 "use strict";
 var complain = "MARKO_DEBUG" && require("complain");
-var isClientReorderSupported = require("./client-reorder").isSupported;
 var AsyncValue = require("./AsyncValue");
 
 function safeRenderBody(renderBody, targetOut, data) {
@@ -23,7 +22,7 @@ function requestData(provider, timeout) {
       );
     }
 
-    var callback = function(err, data) {
+    var callback = function (err, data) {
       if (err) {
         asyncValue.___reject(err);
       } else {
@@ -60,7 +59,7 @@ function requestData(provider, timeout) {
     error = new Error(errorMsg);
   }
   if (timeout > 0) {
-    let timeoutId = setTimeout(function() {
+    let timeoutId = setTimeout(function () {
       timeoutId = null;
       if (!error) error = new Error(errorMsg);
       error.code = "ERR_AWAIT_TIMEDOUT";
@@ -68,7 +67,7 @@ function requestData(provider, timeout) {
       asyncValue.___reject(error);
     }, timeout);
 
-    asyncValue.___done(function() {
+    asyncValue.___done(function () {
       if (timeoutId != null) {
         clearTimeout(timeoutId);
       }
@@ -82,7 +81,9 @@ const LAST_OPTIONS = { last: true, name: "await:finish" };
 
 module.exports = function awaitTag(input, out) {
   var clientReorder =
-    isClientReorderSupported && input.clientReorder === true && !out.isVDOM;
+    typeof document === "undefined" &&
+    input.clientReorder === true &&
+    !out.isVDOM;
 
   var name = input.name || input._name;
   var timeout = input.timeout;
@@ -139,7 +140,7 @@ module.exports = function awaitTag(input, out) {
     // - await:beforeRender
     // - await:finish
     //
-    asyncOut.emit = function(event) {
+    asyncOut.emit = function (event) {
       if (event !== "finish" && event !== "error") {
         // We don't want to proxy the finish and error events since those are
         // very specific to the AsyncWriter associated with the await instance
@@ -192,7 +193,7 @@ module.exports = function awaitTag(input, out) {
       // this event until after the code to move
       // the async fragment into place has been written
       let asyncLastOut = asyncOut.beginAsync(LAST_OPTIONS);
-      asyncOut.onLast(function() {
+      asyncOut.onLast(function () {
         var oldWriter = asyncOut.writer;
         // We swap out the writer so that writing will happen to our `asyncLastOut`
         // even though we are still passing along the original `asyncOut`. We have

package/src/core-tags/core/await/reorderer-renderer.js

@@ -1,8 +1,9 @@
 "use strict";
 
-const clientReorder = require("./client-reorder");
+var escapeDoubleQuotes =
+  require("../../../runtime/html/helpers/escape-quotes").___escapeDoubleQuotes;
 
-module.exports = function(input, out) {
+module.exports = function (input, out) {
   // We cannot call beginSync() when using renderSync(). In this case we will
   // ignore the await-reorderer tag.
   if (out.isSync()) {
@@ -29,7 +30,7 @@ module.exports = function(input, out) {
     name: "await-reorderer"
   });
 
-  out.onLast(function(next) {
+  out.onLast(function (next) {
     var awaitContext = global.___clientReorderContext;
     var remaining;
 
@@ -47,19 +48,39 @@ module.exports = function(input, out) {
     function handleAwait(awaitInfo) {
       awaitInfo.out
         .on("___toString", out.emit.bind(out, "___toString"))
-        .on("finish", function(result) {
+        .on("finish", function (result) {
           if (!global._afRuntime) {
-            asyncOut.script(clientReorder.getCode());
+            // Minified version of ./client-reorder-runtime.js
+            asyncOut.script(
+              `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`
+            );
             global._afRuntime = true;
           }
 
-          asyncOut.write(
-            '<div id="af' +
-              awaitInfo.id +
-              '" style="display:none">' +
-              result.toString() +
-              "</div>"
-          );
+          if (global.cspNonce) {
+            asyncOut.write(
+              '<style nonce="' +
+                escapeDoubleQuotes(global.cspNonce) +
+                '">' +
+                "#af" +
+                awaitInfo.id +
+                "{display:none;}" +
+                "</style>" +
+                '<div id="af' +
+                awaitInfo.id +
+                '">' +
+                result.toString() +
+                "</div>"
+            );
+          } else {
+            asyncOut.write(
+              '<div id="af' +
+                awaitInfo.id +
+                '" style="display:none">' +
+                result.toString() +
+                "</div>"
+            );
+          }
 
           asyncOut.script(
             "$af(" +
@@ -81,14 +102,14 @@ module.exports = function(input, out) {
             next();
           }
         })
-        .on("error", function(err) {
+        .on("error", function (err) {
           asyncOut.error(err);
         });
     }
 
     awaitContext.instances.forEach(handleAwait);
 
-    out.on("await:clientReorder", function(awaitInfo) {
+    out.on("await:clientReorder", function (awaitInfo) {
       remaining++;
       handleAwait(awaitInfo);
     });

package/src/core-tags/core/await/transformer.js

@@ -1,4 +1,4 @@
-module.exports = function(elNode, context) {
+module.exports = function (elNode, context) {
   const builder = context.builder;
   const provider = elNode.argument;
   elNode.argument = undefined;

package/src/core-tags/core/core-transformer.js

@@ -3,7 +3,7 @@
 var coreAttrHandlers = [
   [
     "marko-preserve-whitespace",
-    function(attr, node, el) {
+    function (attr, node, el) {
       el.setPreserveWhitespace(true);
     }
   ]
@@ -24,7 +24,7 @@ class AttributeTransformer {
   }
 }
 
-coreAttrHandlers.forEach(function(attrHandler) {
+coreAttrHandlers.forEach(function (attrHandler) {
   var name = attrHandler[0];
   var func = attrHandler[1];
   AttributeTransformer.prototype[name] = func;

package/src/core-tags/migrate/all-tags/index.js

@@ -21,7 +21,7 @@ const commonMigrators = [
   require("./widget-in-attrs")
 ];
 
-module.exports = function(el, context) {
+module.exports = function (el, context) {
   if (el.detachNode) {
     return false;
   }

package/src/core-tags/migrate/all-templates/index.js

@@ -5,7 +5,7 @@ const commonMigrators = [
   require("./widget-get-template-data")
 ];
 
-module.exports = function(root, context) {
+module.exports = function (root, context) {
   commonMigrators.forEach(migrator => migrator(root, context));
   return true;
 };

package/src/core-tags/migrate/include-tag.js

@@ -41,8 +41,9 @@ module.exports = function migrator(elNode, context) {
     let finalTarget = target;
 
     if (!isMemberOrIdentifer) {
-      const complexIncludeIdentifierCount = (context._complexIncludeIdentifierCount =
-        (context._complexIncludeIdentifierCount || 0) + 1);
+      const complexIncludeIdentifierCount =
+        (context._complexIncludeIdentifierCount =
+          (context._complexIncludeIdentifierCount || 0) + 1);
       let identifierName = "includeTarget";
 
       if (complexIncludeIdentifierCount !== 1) {

package/src/core-tags/migrate/util/parseFor.js

@@ -64,7 +64,8 @@ var tokenizer = require("../../../compiler/util/tokenizer").create([
   }
 ]);
 
-var inRegExp = /^\s*([$A-Z_][0-9A-Z_$]*)(?:\s*,\s*([$A-Z_][0-9A-Z_$]*))?\s+in\s+/i;
+var inRegExp =
+  /^\s*([$A-Z_][0-9A-Z_$]*)(?:\s*,\s*([$A-Z_][0-9A-Z_$]*))?\s+in\s+/i;
 
 function throwError(message) {
   var error = new Error(message);
@@ -119,7 +120,7 @@ function createNumberExpression(str, errorMessage) {
  * <varName> from <expression> to <expression> step <expression>
  * <init>; <test>; <update>
  */
-module.exports = function(str) {
+module.exports = function (str) {
   str = removeComments(str);
 
   let depth = 0;

package/src/core-tags/migrate/util/printJS.js

@@ -1,7 +1,7 @@
 const CodeWriter = require("../../../compiler/CodeWriter");
 const CodeGenerator = require("../../../compiler/CodeGenerator");
 
-module.exports = function(node, context, options) {
+module.exports = function (node, context, options) {
   const codeGenerator = new CodeGenerator(context);
   node = codeGenerator.generateCode(node);
   const writer = new CodeWriter(

package/src/defineRenderer.js

@@ -42,7 +42,7 @@ function defineRenderer(def) {
     };
   }
 
-  renderer.render = function(input) {
+  renderer.render = function (input) {
     var out = createOut();
     renderer(input, out);
     return out.end();

package/src/express.js

@@ -30,7 +30,7 @@ module.exports = function markoAppMiddleware() {
 function patchResponse(response) {
   response.marko =
     response.marko ||
-    function(template, data) {
+    function (template, data) {
       if (typeof template === "string") {
         throw new Error(
           "res.marko does not take a template name or path like res.render.  " +

package/src/hot-reload.js

@@ -23,7 +23,7 @@ function cleaResolvePathCache() {
   }
 
   var keys = Object.keys(modulePathCache);
-  keys.forEach(function(key) {
+  keys.forEach(function (key) {
     delete modulePathCache[key];
   });
 }
@@ -42,7 +42,7 @@ function tryReloadTemplate(path) {
   }
 }
 
-exports.enable = function(options) {
+exports.enable = function (options) {
   if (runtime.__hotReloadEnabled) {
     // Marko has already been monkey-patched. Nothing to do!
     return;
@@ -108,11 +108,11 @@ exports.enable = function(options) {
     var actualRenderFunc;
 
     Object.defineProperty(originalTemplate, "_", {
-      get: function() {
+      get: function () {
         return actualRenderFunc;
       },
 
-      set: function(renderFunc) {
+      set: function (renderFunc) {
         actualRenderFunc = createHotReloadProxy(
           renderFunc,
           originalTemplate,
@@ -144,7 +144,7 @@ function normalizeExtension(extension) {
   return extension;
 }
 
-exports.handleFileModified = function(path, options) {
+exports.handleFileModified = function (path, options) {
   if (!fs.existsSync(path)) {
     console.log(
       "[marko/hot-reload] WARNING cannot resolve template path: ",

package/src/index.js

@@ -1,44 +1,4 @@
 "use strict";
 
-// the following development and legacy apis should not be included
-// when bundling the server with a tool like webpack
-if (!process.env.BUNDLE) {
-  if (process.env.MARKO_HOT_RELOAD) {
-    require("./hot-reload").enable();
-  }
-
-  // If process was launched with browser refresh then automatically
-  // enable browser-refresh
-  require("./browser-refresh").enable();
-
-  // Adds the template.getDependencies() method needed by older versions of lasso-marko
-  require("./runtime/components/legacy/dependencies/html");
-}
-
-function fixFlush() {
-  try {
-    var OutgoingMessage = require("http").OutgoingMessage;
-    if (
-      OutgoingMessage.prototype.flush &&
-      OutgoingMessage.prototype.flush.toString().indexOf("deprecated") !== -1
-    ) {
-      // Yes, we are monkey-patching http. This method should never have been added and it was introduced on
-      // the iojs fork. It was quickly deprecated and I'm 99% sure no one is actually using it.
-      // See:
-      // - https://github.com/marko-js/async-writer/issues/3
-      // - https://github.com/nodejs/node/issues/2920
-      //
-      // This method causes problems since marko looks for the flush method and calls it found.
-      // The `res.flush()` method is introduced by the [compression](https://www.npmjs.com/package/compression)
-      // middleware, but, otherwise, it should typically not exist.
-      delete require("http").OutgoingMessage.prototype.flush;
-    }
-  } catch (e) {
-    /* ignore error */
-  }
-}
-
-fixFlush();
-
 exports.createOut = require("./runtime/createOut");
-exports.load = require("./loader");
+exports.load = require("@internal/loader");

package/src/legacy-helpers/notEmpty.js

@@ -1,4 +1,4 @@
-module.exports = function(o) {
+module.exports = function (o) {
   // eslint-disable-next-line no-constant-condition
   if ("MARKO_DEBUG") {
     require("complain")("notEmpty is deprecated.");

package/src/node-require/index.js

@@ -7,6 +7,17 @@ const fs = require("fs");
 const fsReadOptions = { encoding: "utf8" };
 const MARKO_EXTENSIONS = Symbol("MARKO_EXTENSIONS");
 
+if (process.env.MARKO_HOT_RELOAD) {
+  require("../hot-reload").enable();
+}
+
+// If process was launched with browser refresh then automatically
+// enable browser-refresh
+require("../browser-refresh").enable();
+
+// Adds the template.getDependencies() method needed by older versions of lasso-marko
+require("../runtime/components/legacy/dependencies/html");
+
 function normalizeExtension(extension) {
   if (extension.charAt(0) !== ".") {
     extension = "." + extension;
@@ -140,6 +151,6 @@ install();
 
 exports.install = install;
 
-exports.getExtensions = function() {
+exports.getExtensions = function () {
   return require.extensions[MARKO_EXTENSIONS];
 };

package/src/{runtime/components/beginComponent-browser.js → node_modules/@internal/components-beginComponent/index-browser.js}

@@ -1,4 +1,4 @@
-var ComponentDef = require("./ComponentDef");
+var ComponentDef = require("../../../runtime/components/ComponentDef");
 
 module.exports = function beginComponent(
   componentsContext,

package/src/{runtime/components/beginComponent.js → node_modules/@internal/components-beginComponent/index.js}

@@ -1,10 +1,9 @@
 "use strict";
 
-const ComponentDef = require("./ComponentDef");
+const ComponentDef = require("../../../runtime/components/ComponentDef");
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
-// var FLAG_IS_LEGACY = 4;
 var FLAG_OLD_HYDRATE_NO_CREATE = 8;
 
 module.exports = function beginComponent(
@@ -36,6 +35,7 @@ module.exports = function beginComponent(
   // On the server
   if (!componentsContext.___isPreserved && ownerWillRerender) {
     componentDef.___flags |= FLAG_WILL_RERENDER_IN_BROWSER;
+    componentDef._wrr = true;
     return componentDef;
   }
 

package/src/node_modules/@internal/components-beginComponent/package.json

@@ -0,0 +1,11 @@
+{
+  "main": "./index.js",
+  "browser": "./index-browser.js",
+  "exports": {
+    ".": {
+      "worker": "./index.js",
+      "browser": "./index-browser.js",
+      "default": "./index.js"
+    }
+  }
+}

package/src/{runtime/components/legacy/defineWidget-legacy-browser.js → node_modules/@internal/components-define-widget-legacy/index-browser.js}

@@ -4,8 +4,8 @@
 var BaseState;
 var BaseComponent;
 var inherit;
-var jQuery = require("../jquery");
-var ready = require("../ready");
+var jQuery = require("../../../runtime/components/jquery");
+var ready = require("../../../runtime/components/ready");
 
 var complain = "MARKO_DEBUG" && require("complain");
 var stateToJSONDef = {
@@ -23,7 +23,7 @@ module.exports = function defineWidget(def, renderer) {
     return def;
   }
 
-  var ComponentClass = function() {};
+  var ComponentClass = function () {};
   var proto;
   var legacyInit;
 
@@ -67,7 +67,7 @@ module.exports = function defineWidget(def, renderer) {
   proto.constructor = def.constructor = Component;
 
   Object.defineProperty(proto, "state", {
-    get: function() {
+    get: function () {
       var raw = this.___state && this.___state.___raw;
 
       if (raw && !raw.toJSON) {
@@ -76,14 +76,12 @@ module.exports = function defineWidget(def, renderer) {
 
       return raw;
     },
-    set: function(newState) {
+    set: function (newState) {
       newState = newState || {};
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
         if (
-          Object.keys(newState)
-            .sort()
-            .join("") !==
+          Object.keys(newState).sort().join("") !==
           Object.keys((this.___state && this.___state.___raw) || {})
             .sort()
             .join("")
@@ -98,17 +96,17 @@ module.exports = function defineWidget(def, renderer) {
   });
 
   Object.defineProperty(proto, "__document", {
-    get: function() {
+    get: function () {
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
         complain("__document is deprecated");
       }
-      return this.___document;
+      return this.___host;
     }
   });
 
   Object.defineProperty(proto, "el", {
-    get: function() {
+    get: function () {
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
         if (
@@ -130,27 +128,27 @@ module.exports = function defineWidget(def, renderer) {
   proto.___legacyOnRender = proto.onRender;
   Object.defineProperty(proto, "onRender", {
     get: noop,
-    set: function(v) {
+    set: function (v) {
       proto.___legacyOnRender = v;
     }
   });
 
   proto.___legacyOnUpdate = proto.onUpdate;
   Object.defineProperty(proto, "onUpdate", {
-    get: function() {
+    get: function () {
       return modernMountOrUpdate;
     },
-    set: function(v) {
+    set: function (v) {
       proto.___legacyOnUpdate = v;
     }
   });
 
   proto.___legacyOnDestroy = proto.onDestroy;
   Object.defineProperty(proto, "onDestroy", {
-    get: function() {
+    get: function () {
       return modernOnDestory;
     },
-    set: function(v) {
+    set: function (v) {
       proto.___legacyOnDestroy = v;
     }
   });
@@ -165,7 +163,7 @@ module.exports = function defineWidget(def, renderer) {
 
   // convert legacy to modern
   proto.___modernUpdate = proto.update;
-  proto.update = function() {
+  proto.update = function () {
     if (this.___destroyed) {
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
@@ -213,7 +211,7 @@ module.exports = function defineWidget(def, renderer) {
         if ("MARKO_DEBUG") {
           Object.defineProperty(el, "__widget", {
             configurable: true,
-            get: function() {
+            get: function () {
               complain("__widget is deprecated");
               return self;
             }
@@ -279,14 +277,14 @@ module.exports = function defineWidget(def, renderer) {
       var createOut = renderer.createOut;
       if (typeof renderer !== "function") {
         var rendererObject = renderer;
-        renderer = function(input, out) {
+        renderer = function (input, out) {
           var rendererFunc = rendererObject.renderer || rendererObject.render;
           rendererFunc(input, out);
         };
         renderer.createOut = createOut;
       }
 
-      renderer.render = function(input) {
+      renderer.render = function (input) {
         var out = createOut();
         renderer(input, out);
         return out.end();
@@ -305,7 +303,7 @@ module.exports = function defineWidget(def, renderer) {
   // eslint-disable-next-line no-constant-condition
   if ("MARKO_DEBUG") {
     Object.defineProperty(Component, "_isWidget", {
-      get: function() {
+      get: function () {
         complain("_isWidget is deprecated");
         return true;
       }
@@ -317,6 +315,6 @@ module.exports = function defineWidget(def, renderer) {
   return Component;
 };
 
-BaseState = require("../State");
-BaseComponent = require("../Component");
+BaseState = require("../../../runtime/components/State");
+BaseComponent = require("../../../runtime/components/Component");
 inherit = require("raptor-util/inherit");

package/src/node_modules/@internal/components-define-widget-legacy/index.js

@@ -0,0 +1,18 @@
+module.exports = function defineWidget(def, renderer) {
+  if (def.___isComponent) {
+    return def;
+  }
+
+  if (renderer) {
+    return {
+      ___isComponent: true,
+      _isWidget: true,
+      renderer: renderer,
+      render: renderer.render,
+      renderSync: renderer.renderSync,
+      template: renderer.template
+    };
+  } else {
+    return { ___isComponent: true, _isWidget: true };
+  }
+};

package/src/node_modules/@internal/components-define-widget-legacy/package.json

@@ -0,0 +1,11 @@
+{
+  "main": "./index.js",
+  "browser": "./index-browser.js",
+  "exports": {
+    ".": {
+      "worker": "./index.js",
+      "browser": "./index-browser.js",
+      "default": "./index.js"
+    }
+  }
+}

package/src/{runtime/components/endComponent.js → node_modules/@internal/components-endComponent/index.js}

@@ -1,6 +1,6 @@
 "use strict";
 
-var ComponentsContext = require("./ComponentsContext");
+var ComponentsContext = require("../../../runtime/components/ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
 
 module.exports = function endComponent(out, componentDef) {

package/src/node_modules/@internal/components-endComponent/package.json

@@ -0,0 +1,11 @@
+{
+  "main": "./index.js",
+  "browser": "./index-browser.js",
+  "exports": {
+    ".": {
+      "worker": "./index.js",
+      "browser": "./index-browser.js",
+      "default": "./index.js"
+    }
+  }
+}

package/src/node_modules/@internal/components-entry/index-browser.js

@@ -0,0 +1,9 @@
+var registry = require("@internal/components-registry");
+
+exports.getComponentForEl = require("@internal/components-util").___getComponentForEl;
+exports.init = registry.___initServerRendered;
+exports.register = function (id, component) {
+  registry.r(id, function () {
+    return component;
+  });
+};