@parameter1/base-cms-marko-web 2.75.0 → 2.80.1

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

@@ -2,37 +2,52 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@base-cms/marko-web$1.37.0/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/page/metadata/content.marko",
     marko_component = require("./content.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
     gql = module_gql.default || module_gql,
-    module_objectPath_module = require("@base-cms/object-path"),
-    objectPath_module = module_objectPath_module.default || module_objectPath_module,
-    get = module_objectPath_module.get,
-    module_utils_module = require("@base-cms/utils"),
+    module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
+    baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
+    get = module_baseCmsObjectPath_module.get,
+    module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
+    baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
+    warn = module_baseCmsUtils_module.warn,
+    isFunction = module_baseCmsUtils_module.isFunction,
+    module_utils_module = require("@parameter1/base-cms-web-common/src/utils"),
     utils_module = module_utils_module.default || module_utils_module,
-    warn = module_utils_module.warn,
+    extractFragmentData = module_utils_module.extractFragmentData,
+    module_defaultBuildStructuredData = require("./google-structured-data/content"),
+    defaultBuildStructuredData = module_defaultBuildStructuredData.default || module_defaultBuildStructuredData,
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     common_tag = marko_loadTag(common_template),
     marko_attr = require("marko/src/runtime/html/helpers/attr"),
-    marko_web_query_template = require("@base-cms/marko-core/components/queries/index.marko"),
+    helpers_escape_xml = require("marko/src/runtime/html/helpers/escape-xml"),
+    marko_escapeXml = helpers_escape_xml.x,
+    marko_escapeScript = require("marko/src/runtime/html/helpers/escape-script-placeholder"),
+    marko_web_query_template = require("@parameter1/base-cms-marko-core/components/queries/index.marko"),
     marko_web_query_tag = marko_loadTag(marko_web_query_template);
 
 function render(input, out, __component, component, state) {
   var data = input;
 
-  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
   }
+  published
+  updated
   metadata {
     title
     description
@@ -41,12 +56,61 @@ fragment ContentPageMetadataFragment on Content {
     expiresDate
     image {
       id
-      src(input: { options: { auto: "format", w: "1200", fit: "max" } })
+      src(input: { options: { auto: "format,compress", w: "1200", fit: "max", q: 70 } })
+    }
+  }
+  ... on ContentVideo {
+    embedSrc
+  }
+  ... on ContentPodcast {
+    fileSrc
+    fileName
+  }
+  ... on Authorable {
+    authors {
+      edges {
+        node {
+          id
+          name
+        }
+      }
+    }
+  }
+  ... 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 {
+        id
+        src(input: { options: { auto: "format,compress", w: "1200", fit: "max", q: 70 } })
+      }
     }
   }
+  ${spreadFragmentName}
 }
+${processedFragment}
 `;
 
+  const buildStructuredData = isFunction(input.buildStructuredData) ? input.buildStructuredData : defaultBuildStructuredData;
+
   if (id) {
     marko_web_query_tag({
         collapsible: true,
@@ -67,6 +131,7 @@ fragment ContentPageMetadataFragment on Content {
       description: get(node, "metadata.description"),
       canonicalPath: get(node, "siteContext.path"),
       canonicalUrl: get(node, "siteContext.canonicalUrl"),
+      noIndex: get(node, "siteContext.noIndex"),
       imageSrc: get(node, "metadata.image.src"),
     };
 
@@ -107,6 +172,14 @@ fragment ContentPageMetadataFragment on Content {
                 ">");
             }
           }
+
+          const structuredData = buildStructuredData(node);
+
+          if (structuredData) {
+            out.w("<script type=\"application/ld+json\">" +
+              marko_escapeScript(("\n        " + structuredData) + "\n      ") +
+              "</script>");
+          }
         }
       }, out, __component, "0");
   } else {
@@ -119,10 +192,10 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@base-cms/marko-web$1.37.0/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/page/metadata/content.marko",
     component: "./content.marko",
     tags: [
       "./components/common.marko",
-      "@base-cms/marko-core/components/queries/index.marko"
+      "@parameter1/base-cms-marko-core/components/queries/index.marko"
     ]
   };

package/components/page/metadata/default.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.13.0/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/page/metadata/default.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
@@ -22,7 +22,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/page/metadata/default.marko",
     tags: [
       "./components/common.marko"
     ]

package/components/page/rel-canonical.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.13.0/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/page/rel-canonical.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,
@@ -38,5 +38,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/page/rel-canonical.marko"
   };

package/components/page/title.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.13.0/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/page/title.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,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/page/title.marko"
   };

package/components/page/wrapper.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.13.0/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/page/wrapper.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,
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/page/wrapper.marko",
     tags: [
       "../element"
     ]

package/components/resolve/page.marko.js

@@ -2,17 +2,17 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@base-cms/marko-web$1.37.0/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$2.75.1/components/resolve/page.marko",
     marko_component = require("./page.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
-    module_utils_module = require("@base-cms/utils"),
-    utils_module = module_utils_module.default || module_utils_module,
-    isFunction = module_utils_module.isFunction,
-    module_objectPath_module = require("@base-cms/object-path"),
-    objectPath_module = module_objectPath_module.default || module_objectPath_module,
-    getAsObject = module_objectPath_module.getAsObject,
+    module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
+    baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
+    isFunction = module_baseCmsUtils_module.isFunction,
+    module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
+    baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
+    getAsObject = module_baseCmsObjectPath_module.getAsObject,
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag"),
-    marko_web_resolve_template = require("@base-cms/marko-core/components/resolve.marko"),
+    marko_web_resolve_template = require("@parameter1/base-cms-marko-core/components/resolve.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_resolve_tag = marko_loadTag(marko_web_resolve_template);
 
@@ -41,9 +41,9 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@base-cms/marko-web$1.37.0/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$2.75.1/components/resolve/page.marko",
     component: "./page.marko",
     tags: [
-      "@base-cms/marko-core/components/resolve.marko"
+      "@parameter1/base-cms-marko-core/components/resolve.marko"
     ]
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "2.75.0",
+  "version": "2.80.1",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -22,10 +22,10 @@
     "@parameter1/base-cms-image": "^2.45.0",
     "@parameter1/base-cms-inflector": "^2.0.0",
     "@parameter1/base-cms-marko-node-require": "^2.57.0",
-    "@parameter1/base-cms-object-path": "^2.75.0",
+    "@parameter1/base-cms-object-path": "^2.75.1",
     "@parameter1/base-cms-tenant-context": "^2.0.0",
-    "@parameter1/base-cms-utils": "^2.75.0",
-    "@parameter1/base-cms-web-common": "^2.75.0",
+    "@parameter1/base-cms-utils": "^2.75.1",
+    "@parameter1/base-cms-web-common": "^2.80.0",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",
     "apollo-link": "^1.2.14",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2259033bcb79da6c9e8c990eae71b8c7a2826e61"
+  "gitHead": "23e005af644abcfcf2a96b1efc3410ca615b9b4f"
 }