@parameter1/base-cms-marko-web 2.98.0 → 3.2.2

package/components/element/content/photographers.marko.js

@@ -2,12 +2,11 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/photographers.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/photographers.marko",
     marko_component = require("./photographers.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_nodes_template = marko_loadTemplate(require.resolve("../obj-nodes.marko")),
+    marko_web_obj_nodes_template = require("../obj-nodes.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_nodes_tag = marko_loadTag(marko_web_obj_nodes_template);
 
@@ -36,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/photographers.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/photographers.marko",
     component: "./photographers.marko",
     tags: [
       "../obj-nodes.marko"

package/components/element/content/public-email.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/public-email.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/public-email.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -10,8 +10,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -41,7 +40,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/public-email.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/public-email.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/published.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/published.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/published.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_date_template = marko_loadTemplate(require.resolve("../obj-date.marko")),
+    marko_web_obj_date_template = require("../obj-date.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_date_tag = marko_loadTag(marko_web_obj_date_template);
 
@@ -36,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/published.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/published.marko",
     tags: [
       "../obj-date.marko"
     ]

package/components/element/content/short-name.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/short-name.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/short-name.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -35,7 +34,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/short-name.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/short-name.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/sidebars.marko.js

@@ -2,22 +2,26 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/sidebars.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/sidebars.marko",
     marko_component = require("./sidebars.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
+    module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
+    baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
+    getAsObject = module_baseCmsObjectPath_module.getAsObject,
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template),
-    marko_web_obj_array_template = marko_loadTemplate(require.resolve("../obj-array.marko")),
+    marko_web_obj_array_template = require("../obj-array.marko"),
     marko_web_obj_array_tag = marko_loadTag(marko_web_obj_array_template);
 
 function render(input, out, __component, component, state) {
   var data = input;
 
+  const { parseEmbeddedMedia, res } = out.global;
+
   marko_web_obj_array_tag({
       type: "content",
       blockName: input.blockName,
@@ -28,12 +32,16 @@ function render(input, out, __component, component, state) {
       modifiers: input.modifiers,
       attrs: input.attrs,
       renderBody: function(out, { value }) {
+        const v = value == null ? "" : `${value}`.trim();
+
+        const embedOptions = getAsObject(input, "embedOptions");
+
+        const obj = { sidebar: parseEmbeddedMedia(v, res, embedOptions) };
+
         marko_web_obj_text_tag(marko_assign({
             type: "content",
             blockName: input.blockName,
-            obj: {
-                sidebar: value
-              },
+            obj: obj,
             field: "sidebar",
             html: true
           }, extractRender(input)), out, __component, "1");
@@ -46,7 +54,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/sidebars.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/sidebars.marko",
     component: "./sidebars.marko",
     tags: [
       "../obj-text.marko",

package/components/element/content/source.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/source.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/source.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -34,7 +33,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/source.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/source.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/sponsors.marko.js

@@ -2,12 +2,11 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/sponsors.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/sponsors.marko",
     marko_component = require("./sponsors.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_nodes_template = marko_loadTemplate(require.resolve("../obj-nodes.marko")),
+    marko_web_obj_nodes_template = require("../obj-nodes.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_nodes_tag = marko_loadTag(marko_web_obj_nodes_template);
 
@@ -36,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/sponsors.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/sponsors.marko",
     component: "./sponsors.marko",
     tags: [
       "../obj-nodes.marko"

package/components/element/content/start-date.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/start-date.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/start-date.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_date_template = marko_loadTemplate(require.resolve("../obj-date.marko")),
+    marko_web_obj_date_template = require("../obj-date.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_date_tag = marko_loadTag(marko_web_obj_date_template);
 
@@ -36,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/start-date.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/start-date.marko",
     tags: [
       "../obj-date.marko"
     ]

package/components/element/content/teaser.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/teaser.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/teaser.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -35,7 +34,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/teaser.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/teaser.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/title.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/title.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -34,7 +33,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/title.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/title.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/tollfree.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/tollfree.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/tollfree.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -34,7 +33,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/tollfree.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/tollfree.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/content/website.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/website.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/website.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
@@ -10,8 +10,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -45,7 +44,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/content/website.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/content/website.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/date.marko.js

@@ -2,10 +2,9 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/date.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/date.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_core_date_template = marko_loadTemplate(require.resolve("@parameter1/base-cms-marko-core/components/elements/date.marko")),
+    marko_core_date_template = require("@parameter1/base-cms-marko-core/components/elements/date.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_core_date_tag = marko_loadTag(marko_core_date_template);
 
@@ -21,7 +20,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/date.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/date.marko",
     tags: [
       "@parameter1/base-cms-marko-core/components/elements/date.marko"
     ]

package/components/element/image/caption.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/caption.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/caption.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -35,7 +34,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/caption.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/caption.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/image/credit.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/credit.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/credit.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -35,7 +34,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/credit.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/credit.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/image/display-name.marko.js

@@ -2,13 +2,12 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/display-name.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/display-name.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_extractRender = require("../extract-render"),
     extractRender = module_extractRender.default || module_extractRender,
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_obj_text_template = marko_loadTemplate(require.resolve("../obj-text.marko")),
+    marko_web_obj_text_template = require("../obj-text.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_obj_text_tag = marko_loadTag(marko_web_obj_text_template);
 
@@ -34,7 +33,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/image/display-name.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/image/display-name.marko",
     tags: [
       "../obj-text.marko"
     ]

package/components/element/img.marko.js

@@ -2,14 +2,13 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/img.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/img.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    image_template = marko_loadTemplate(require.resolve("./components/image.marko")),
+    image_template = require("./components/image.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     image_tag = marko_loadTag(image_template),
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_web_link_template = marko_loadTemplate(require.resolve("./link.marko")),
+    marko_web_link_template = require("./link.marko"),
     marko_web_link_tag = marko_loadTag(marko_web_link_template);
 
 function render(input, out, __component, component, state) {
@@ -36,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/img.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/img.marko",
     tags: [
       "./components/image.marko",
       "./link.marko"

package/components/element/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$2.81.0/components/element/index.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/index.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -43,5 +43,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.81.0/components/element/index.marko"
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/index.marko"
   };

package/components/element/link.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/link.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/link.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
     marko_mergeAttrs = require("marko/src/runtime/html/helpers/merge-attrs");
@@ -26,11 +26,12 @@ function render(input, out, __component, component, state) {
 
   if (hasHref) {
     out.w("<a" +
-      marko_mergeAttrs(input.attrs, {
+      marko_mergeAttrs({
+        rel: rel
+      }, input.attrs, {
         href: href,
         title: input.title,
         target: target,
-        rel: rel,
         class: classNames
       }) +
       ">");
@@ -49,5 +50,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/link.marko"
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/link.marko"
   };

package/components/element/magazine-publication/cancel-url.marko

@@ -0,0 +1,22 @@
+import { isObject } from "@parameter1/base-cms-utils";
+import extractRender from "../extract-render";
+
+$ const linkInput = { field: "cancelUrl" };
+$ if (input.link === true) {
+  input.link = linkInput;
+} else if (isObject(input.link)) {
+  input.link = { ...input.link, ...linkInput };
+}
+
+<marko-web-obj-text
+  type="magazine-publication"
+  block-name=input.blockName
+  obj=input.obj
+  field="cancelUrl"
+  tag=input.tag
+  class=input.class
+  modifiers=input.modifiers
+  attrs=input.attrs
+  link=input.link
+  ...extractRender(input)
+/>

package/components/element/magazine-publication/change-address-url.marko

@@ -0,0 +1,22 @@
+import { isObject } from "@parameter1/base-cms-utils";
+import extractRender from "../extract-render";
+
+$ const linkInput = { field: "changeAddressUrl" };
+$ if (input.link === true) {
+  input.link = linkInput;
+} else if (isObject(input.link)) {
+  input.link = { ...input.link, ...linkInput };
+}
+
+<marko-web-obj-text
+  type="magazine-publication"
+  block-name=input.blockName
+  obj=input.obj
+  field="changeAddressUrl"
+  tag=input.tag
+  class=input.class
+  modifiers=input.modifiers
+  attrs=input.attrs
+  link=input.link
+  ...extractRender(input)
+/>

package/components/element/magazine-publication/marko.json

@@ -39,6 +39,26 @@
     "@attrs": "object",
     "@link": "expression"
   },
+  "<marko-web-magazine-publication-change-address-url>": {
+    "template": "./change-address-url.marko",
+    "@block-name": "string",
+    "@obj": "object",
+    "@tag": "string",
+    "@class": "string",
+    "@modifiers": "string",
+    "@attrs": "object",
+    "@link": "expression"
+  },
+  "<marko-web-magazine-publication-cancel-url>": {
+    "template": "./cancel-url.marko",
+    "@block-name": "string",
+    "@obj": "object",
+    "@tag": "string",
+    "@class": "string",
+    "@modifiers": "string",
+    "@attrs": "object",
+    "@link": "expression"
+  },
   "<marko-web-magazine-publication-reprints-url>": {
     "template": "./reprints-url.marko",
     "@block-name": "string",

package/components/element/obj-array.marko.js

@@ -2,15 +2,14 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/element/obj-array.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$3.0.0/components/element/obj-array.marko",
     marko_component = require("./obj-array.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_array_template = marko_loadTemplate(require.resolve("./array.marko")),
+    marko_web_array_template = require("./array.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_array_tag = marko_loadTag(marko_web_array_template),
-    marko_web_obj_template = marko_loadTemplate(require.resolve("./obj.marko")),
+    marko_web_obj_template = require("./obj.marko"),
     marko_web_obj_tag = marko_loadTag(marko_web_obj_template);
 
 function render(input, out, __component, component, state) {
@@ -48,7 +47,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/element/obj-array.marko",
+    id: "/@parameter1/base-cms-marko-web$3.0.0/components/element/obj-array.marko",
     component: "./obj-array.marko",
     tags: [
       "./array.marko",