@parameter1/base-cms-marko-web 2.46.0 → 2.60.0

package/components/node-list/body.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/node-list/body.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/body.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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_element_template = marko_loadTemplate(require.resolve("./element.marko")),
+    marko_web_node_list_element_template = require("./element.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_element_tag = marko_loadTag(marko_web_node_list_element_template);
 
@@ -44,7 +43,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/body.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/body.marko",
     tags: [
       "./element.marko"
     ]

package/components/node-list/element.marko.js

@@ -2,11 +2,10 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/element.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/element.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_element_template = marko_loadTemplate(require.resolve("../element/index.marko")),
+    marko_web_element_template = require("../element"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_element_tag = marko_loadTag(marko_web_element_template);
 
@@ -29,8 +28,8 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/element.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/element.marko",
     tags: [
-      "../element/index.marko"
+      "../element"
     ]
   };

package/components/node-list/footer.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/node-list/footer.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/footer.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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_element_template = marko_loadTemplate(require.resolve("./element.marko")),
+    marko_web_node_list_element_template = require("./element.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_element_tag = marko_loadTag(marko_web_node_list_element_template);
 
@@ -44,7 +43,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/footer.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/footer.marko",
     tags: [
       "./element.marko"
     ]

package/components/node-list/header.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/node-list/header.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/header.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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_element_template = marko_loadTemplate(require.resolve("./element.marko")),
+    marko_web_node_list_element_template = require("./element.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_element_tag = marko_loadTag(marko_web_node_list_element_template);
 
@@ -44,7 +43,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/header.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/header.marko",
     tags: [
       "./element.marko"
     ]

package/components/node-list/index.marko.js

@@ -2,23 +2,22 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/index.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
-    get = module_baseCmsObjectPath_module.get,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
+    get = module_objectPath_module.get,
     module_shouldCollapse = require("../../utils/should-collapse"),
     shouldCollapse = module_shouldCollapse.default || module_shouldCollapse,
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_header_template = marko_loadTemplate(require.resolve("./header.marko")),
+    marko_web_node_list_header_template = require("./header.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_header_tag = marko_loadTag(marko_web_node_list_header_template),
-    marko_web_node_list_body_template = marko_loadTemplate(require.resolve("./body.marko")),
+    marko_web_node_list_body_template = require("./body.marko"),
     marko_web_node_list_body_tag = marko_loadTag(marko_web_node_list_body_template),
-    marko_web_node_list_nodes_template = marko_loadTemplate(require.resolve("./nodes.marko")),
+    marko_web_node_list_nodes_template = require("./nodes.marko"),
     marko_web_node_list_nodes_tag = marko_loadTag(marko_web_node_list_nodes_template),
-    marko_web_node_list_footer_template = marko_loadTemplate(require.resolve("./footer.marko")),
+    marko_web_node_list_footer_template = require("./footer.marko"),
     marko_web_node_list_footer_tag = marko_loadTag(marko_web_node_list_footer_template),
     marko_mergeAttrs = require("marko/src/runtime/html/helpers/merge-attrs");
 
@@ -84,7 +83,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/index.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/index.marko",
     tags: [
       "./header.marko",
       "./body.marko",

package/components/node-list/node.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/node-list/node.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/node.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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_element_template = marko_loadTemplate(require.resolve("./element.marko")),
+    marko_web_node_list_element_template = require("./element.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_element_tag = marko_loadTag(marko_web_node_list_element_template);
 
@@ -43,7 +42,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/node.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/node.marko",
     tags: [
       "./element.marko"
     ]

package/components/node-list/nodes.marko.js

@@ -2,19 +2,18 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/nodes.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/node-list/nodes.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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsArray = module_objectPath_module.getAsArray,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
     marko_forOf = require("marko/src/runtime/helpers/for-of"),
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_node_list_node_template = marko_loadTemplate(require.resolve("./node.marko")),
+    marko_web_node_list_node_template = require("./node.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_node_list_node_tag = marko_loadTag(marko_web_node_list_node_template),
-    marko_web_node_list_element_template = marko_loadTemplate(require.resolve("./element.marko")),
+    marko_web_node_list_element_template = require("./element.marko"),
     marko_web_node_list_element_tag = marko_loadTag(marko_web_node_list_element_template);
 
 function render(input, out, __component, component, state) {
@@ -119,7 +118,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/node-list/nodes.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/node-list/nodes.marko",
     tags: [
       "./node.marko",
       "./element.marko"

package/components/page/container.marko.js

@@ -1,14 +1,14 @@
 // Compiled using marko@4.20.2 - DO NOT EDIT
 "use strict";
 
-var marko_template = module.exports = require("marko/dist/html").t(__filename),
+var marko_template = module.exports = require("marko/src/html").t(__filename),
     marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/page/container.marko",
-    marko_renderer = require("marko/dist/runtime/components/renderer"),
+    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,
     getAsArray = module_baseCmsObjectPath_module.getAsArray,
-    marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
-    marko_assign = require("marko/dist/runtime/helpers/assign");
+    marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
+    marko_assign = require("marko/src/runtime/helpers/assign");
 
 function render(input, out, __component, component, state) {
   var data = input;
@@ -37,8 +37,8 @@ function render(input, out, __component, component, state) {
 }
 
 marko_template._ = marko_renderer(render, {
-    d_: true,
-    e_: marko_componentType
+    ___implicit: true,
+    ___type: marko_componentType
   });
 
 marko_template.meta = {

package/components/page/description.marko.js

@@ -1,10 +1,10 @@
 // Compiled using marko@4.20.2 - DO NOT EDIT
 "use strict";
 
-var marko_template = module.exports = require("marko/dist/html").t(__filename),
+var marko_template = module.exports = require("marko/src/html").t(__filename),
     marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/page/description.marko",
-    marko_renderer = require("marko/dist/runtime/components/renderer"),
-    marko_attr = require("marko/dist/runtime/html/helpers/attr");
+    marko_renderer = require("marko/src/runtime/components/renderer"),
+    marko_attr = require("marko/src/runtime/html/helpers/attr");
 
 function render(input, out, __component, component, state) {
   var data = input;
@@ -17,8 +17,8 @@ function render(input, out, __component, component, state) {
 }
 
 marko_template._ = marko_renderer(render, {
-    d_: true,
-    e_: marko_componentType
+    ___implicit: true,
+    ___type: marko_componentType
   });
 
 marko_template.meta = {

package/components/page/image.marko.js

@@ -2,27 +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/page/image.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/image.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    module_baseCmsImage_module = require("@parameter1/base-cms-image"),
-    baseCmsImage_module = module_baseCmsImage_module.default || module_baseCmsImage_module,
-    buildImgixUrl = module_baseCmsImage_module.buildImgixUrl,
-    module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
-    baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
-    getAsObject = module_baseCmsObjectPath_module.getAsObject,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_image_display_name_template = marko_loadTemplate(require.resolve("../element/image/display-name.marko")),
+    module_image_module = require("@base-cms/image"),
+    image_module = module_image_module.default || module_image_module,
+    buildImgixUrl = module_image_module.buildImgixUrl,
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    getAsObject = module_objectPath_module.getAsObject,
+    getAsArray = module_objectPath_module.getAsArray,
+    marko_web_image_display_name_template = require("../element/image/display-name.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_image_display_name_tag = marko_loadTag(marko_web_image_display_name_template),
-    marko_web_img_template = marko_loadTemplate(require.resolve("../element/img.marko")),
+    marko_web_img_template = require("../element/img.marko"),
     marko_web_img_tag = marko_loadTag(marko_web_img_template),
     marko_classAttr = require("marko/src/runtime/html/helpers/class-attr"),
-    marko_web_image_caption_template = marko_loadTemplate(require.resolve("../element/image/caption.marko")),
+    marko_web_image_caption_template = require("../element/image/caption.marko"),
     marko_web_image_caption_tag = marko_loadTag(marko_web_image_caption_template),
-    marko_web_image_credit_template = marko_loadTemplate(require.resolve("../element/image/credit.marko")),
+    marko_web_image_credit_template = require("../element/image/credit.marko"),
     marko_web_image_credit_tag = marko_loadTag(marko_web_image_credit_template),
-    marko_web_block_template = marko_loadTemplate(require.resolve("../element/block.marko")),
+    marko_web_block_template = require("../element/block.marko"),
     marko_web_block_tag = marko_loadTag(marko_web_block_template);
 
 function render(input, out, __component, component, state) {
@@ -112,7 +111,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/image.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/image.marko",
     tags: [
       "../element/image/display-name.marko",
       "../element/img.marko",

package/components/page/layouts/content.marko

@@ -1,4 +1,4 @@
-$ const { id, type } = input;
+$ const { structuredDataQueryFragment, buildStructuredData, id, type } = input;
 $ const { document } = out.global;
 
 <${document}
@@ -7,7 +7,11 @@ $ const { document } = out.global;
   foot=input.foot
 >
   <@head>
-    <marko-web-content-page-metadata id=id />
+    <marko-web-content-page-metadata
+      id=id
+      structured-data-query-fragment=structuredDataQueryFragment
+      build-structured-data=buildStructuredData
+    />
     <${input.head} />
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->

package/components/page/layouts/content.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/page/layouts/content.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/layouts/content.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_content_page_metadata_template = marko_loadTemplate(require.resolve("../metadata/content.marko")),
+    marko_web_content_page_metadata_template = require("../metadata/content.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_content_page_metadata_tag = marko_loadTag(marko_web_content_page_metadata_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
@@ -54,7 +53,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/content.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/layouts/content.marko",
     tags: [
       "../metadata/content.marko"
     ]

package/components/page/layouts/default.marko.js

@@ -1,13 +1,13 @@
 // Compiled using marko@4.20.2 - DO NOT EDIT
 "use strict";
 
-var marko_template = module.exports = require("marko/dist/html").t(__filename),
+var marko_template = module.exports = require("marko/src/html").t(__filename),
     marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/page/layouts/default.marko",
-    marko_renderer = require("marko/dist/runtime/components/renderer"),
+    marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_web_default_page_metadata_template = require("../metadata/default.marko"),
-    marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
+    marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_default_page_metadata_tag = marko_loadTag(marko_web_default_page_metadata_template),
-    marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag");
+    marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
 
 function render(input, out, __component, component, state) {
   var data = input;
@@ -48,8 +48,8 @@ function render(input, out, __component, component, state) {
 }
 
 marko_template._ = marko_renderer(render, {
-    d_: true,
-    e_: marko_componentType
+    ___implicit: true,
+    ___type: marko_componentType
   });
 
 marko_template.meta = {

package/components/page/layouts/dynamic-page.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/page/layouts/dynamic-page.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/layouts/dynamic-page.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_dynamic_page_metadata_template = marko_loadTemplate(require.resolve("../metadata/dynamic-page.marko")),
+    marko_web_dynamic_page_metadata_template = require("../metadata/dynamic-page.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_dynamic_page_metadata_tag = marko_loadTag(marko_web_dynamic_page_metadata_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
@@ -52,7 +51,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/dynamic-page.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/layouts/dynamic-page.marko",
     tags: [
       "../metadata/dynamic-page.marko"
     ]

package/components/page/layouts/magazine-issue.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/page/layouts/magazine-issue.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/layouts/magazine-issue.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_magazine_issue_page_metadata_template = marko_loadTemplate(require.resolve("../metadata/magazine-issue.marko")),
+    marko_web_magazine_issue_page_metadata_template = require("../metadata/magazine-issue.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_magazine_issue_page_metadata_tag = marko_loadTag(marko_web_magazine_issue_page_metadata_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
@@ -52,7 +51,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/magazine-issue.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/layouts/magazine-issue.marko",
     tags: [
       "../metadata/magazine-issue.marko"
     ]

package/components/page/layouts/magazine-publication.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/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/layouts/magazine-publication.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_magazine_publication_page_metadata_template = marko_loadTemplate(require.resolve("../metadata/magazine-publication.marko")),
+    marko_web_magazine_publication_page_metadata_template = require("../metadata/magazine-publication.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_magazine_publication_page_metadata_tag = marko_loadTag(marko_web_magazine_publication_page_metadata_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
@@ -52,7 +51,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/magazine-publication.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/layouts/magazine-publication.marko",
     tags: [
       "../metadata/magazine-publication.marko"
     ]

package/components/page/layouts/marko.json

@@ -40,6 +40,8 @@
     "<page>": {},
     "<above-page>": {},
     "<below-page>": {},
+    "@structured-data-query-fragment": "string",
+    "@build-structured-data": "function",
     "@id": "number",
     "@type": "string",
     "@attrs": "object"

package/components/page/layouts/website-section.marko.js

@@ -2,17 +2,16 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/website-section.marko",
+    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/layouts/website-section.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,
-    get = module_baseCmsObjectPath_module.get,
-    getAsObject = module_baseCmsObjectPath_module.getAsObject,
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    marko_web_website_section_page_metadata_template = marko_loadTemplate(require.resolve("../metadata/website-section.marko")),
+    module_objectPath_module = require("@base-cms/object-path"),
+    objectPath_module = module_objectPath_module.default || module_objectPath_module,
+    get = module_objectPath_module.get,
+    getAsObject = module_objectPath_module.getAsObject,
+    marko_web_website_section_page_metadata_template = require("../metadata/website-section.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_website_section_page_metadata_tag = marko_loadTag(marko_web_website_section_page_metadata_template),
-    marko_web_website_section_rss_template = marko_loadTemplate(require.resolve("../../rss/website-section.marko")),
+    marko_web_website_section_rss_template = require("../../rss/website-section.marko"),
     marko_web_website_section_rss_tag = marko_loadTag(marko_web_website_section_rss_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
 
@@ -70,7 +69,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/layouts/website-section.marko",
+    id: "/@base-cms/marko-web$1.37.0/components/page/layouts/website-section.marko",
     tags: [
       "../metadata/website-section.marko",
       "../../rss/website-section.marko"

package/components/page/metadata/components/common.marko.js

@@ -1,18 +1,18 @@
 // Compiled using marko@4.20.2 - DO NOT EDIT
 "use strict";
 
-var marko_template = module.exports = require("marko/dist/html").t(__filename),
+var marko_template = module.exports = require("marko/src/html").t(__filename),
     marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/page/metadata/components/common.marko",
     marko_component = require("./common.marko"),
-    marko_renderer = require("marko/dist/runtime/components/renderer"),
+    marko_renderer = require("marko/src/runtime/components/renderer"),
     marko_web_page_title_template = require("../../title.marko"),
-    marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
+    marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_page_title_tag = marko_loadTag(marko_web_page_title_template),
     marko_web_page_description_template = require("../../description.marko"),
     marko_web_page_description_tag = marko_loadTag(marko_web_page_description_template),
     marko_web_page_rel_canonical_template = require("../../rel-canonical.marko"),
     marko_web_page_rel_canonical_tag = marko_loadTag(marko_web_page_rel_canonical_template),
-    marko_attr = require("marko/dist/runtime/html/helpers/attr");
+    marko_attr = require("marko/src/runtime/html/helpers/attr");
 
 function render(input, out, __component, component, state) {
   var data = input;
@@ -89,7 +89,7 @@ function render(input, out, __component, component, state) {
 }
 
 marko_template._ = marko_renderer(render, {
-    e_: marko_componentType
+    ___type: marko_componentType
   }, marko_component);
 
 marko_template.meta = {

package/components/page/metadata/content.marko

@@ -1,16 +1,19 @@
 import gql from "graphql-tag";
 import { get } from "@parameter1/base-cms-object-path";
-import { warn } from "@parameter1/base-cms-utils";
-import buildStructuredData from "./google-structured-data/content";
+import { warn, isFunction } from "@parameter1/base-cms-utils";
+import { extractFragmentData } from "@parameter1/base-cms-web-common/src/utils";
+import defaultBuildStructuredData from "./google-structured-data/content";
 
 <!-- @todo This data should generated and saved to the content object as flat data, so no relationships are required. -->
 
-$ const { id } = input;
+$ const { id, structuredDataQueryFragment } = input;
+$ const { spreadFragmentName, processedFragment } = extractFragmentData(structuredDataQueryFragment);
 $ const queryFragment = gql`
 fragment ContentPageMetadataFragment on Content {
   id
   type
   siteContext {
+    url
     path
     canonicalUrl
     noIndex
@@ -31,6 +34,10 @@ fragment ContentPageMetadataFragment on Content {
   ... on ContentVideo {
     embedSrc
   }
+  ... on ContentPodcast {
+    fileSrc
+    fileName
+  }
   ... on Authorable {
     authors {
       edges {
@@ -41,6 +48,26 @@ fragment ContentPageMetadataFragment on Content {
       }
     }
   }
+  ... on Addressable {
+    address1
+    address2
+    city
+    state
+    zip
+    country
+  }
+  ... on Contactable {
+    phone
+    tollfree
+    fax
+    website
+    title
+    mobile
+    publicEmail
+  }
+  ... on ContentCompany {
+    email
+  }
   images(input:{ pagination: { limit: 0 }, sort: { order: values } }) {
     edges {
       node {
@@ -49,9 +76,13 @@ fragment ContentPageMetadataFragment on Content {
       }
     }
   }
+  ${spreadFragmentName}
 }
+${processedFragment}
 `;
 
+$ const buildStructuredData = isFunction(input.buildStructuredData) ? input.buildStructuredData : defaultBuildStructuredData;
+
 <if(id)>
   <marko-web-query|{ node }| name="content" params={ id, queryFragment }>
     $ const metadata = {