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

package/components/load-more/index.marko

@@ -18,6 +18,7 @@ $ const queryParams = {
         tag="section"
         ...input.pageInput
         modifiers=["load-more", `page-${pageNumber}`, ...getAsArray(input, "pageInput.modifiers")]
+        attrs=input.attrs
       >
         <!-- Fire generic `load-more-in-view` event (other services can attach to this, e.g. GTM) -->
         <marko-web-browser-component name="TriggerInViewEvent" props={ eventName: "load-more-in-view", data: { page_number: pageNumber + 1 } } />

package/components/load-more/marko.json

@@ -12,7 +12,8 @@
     "@fragment-name": "string",
     "@page-input": "object",
     "@header": "string",
-    "@trigger-input": "object"
+    "@trigger-input": "object",
+    "@attrs": "object"
   },
   "<marko-web-load-more-trigger>": {
     "template": "./trigger.marko",

package/components/page/layouts/content.marko

@@ -12,7 +12,7 @@ $ const { document } = out.global;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for="content" tag="article" id=id type=type>
+    <@page for="content" tag="article" id=id type=type attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/components/page/layouts/default.marko

@@ -13,7 +13,7 @@ $ const { document } = out.global;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for=type>
+    <@page for=type attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/components/page/layouts/dynamic-page.marko

@@ -12,7 +12,7 @@ $ const { document } = out.global;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for="dynamic-page" id=id>
+    <@page for="dynamic-page" id=id attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/components/page/layouts/magazine-issue.marko

@@ -12,7 +12,7 @@ $ const { document } = out.global;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for="magazine-issue" id=id>
+    <@page for="magazine-issue" id=id attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/components/page/layouts/magazine-publication.marko

@@ -12,7 +12,7 @@ $ const { document } = out.global;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for="magazine-publication" id=id>
+    <@page for="magazine-publication" id=id attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/components/page/layouts/marko.json

@@ -10,7 +10,8 @@
     "<below-page>": {},
     "@type": "string",
     "@title": "string",
-    "@description": "string"
+    "@description": "string",
+    "@attrs": "object"
   },
   "<marko-web-website-section-page-layout>": {
     "template": "./website-section.marko",
@@ -27,7 +28,8 @@
     "@with-rss": {
       "type": "boolean",
       "default-value": true
-    }
+    },
+    "@attrs": "object"
   },
   "<marko-web-content-page-layout>": {
     "template": "./content.marko",
@@ -39,7 +41,8 @@
     "<above-page>": {},
     "<below-page>": {},
     "@id": "number",
-    "@type": "string"
+    "@type": "string",
+    "@attrs": "object"
   },
   "<marko-web-dynamic-page-layout>": {
     "template": "./dynamic-page.marko",
@@ -51,7 +54,8 @@
     "<above-page>": {},
     "<below-page>": {},
     "@id": "string",
-    "@alias": "string"
+    "@alias": "string",
+    "@attrs": "object"
   },
   "<marko-web-magazine-issue-page-layout>": {
     "template": "./magazine-issue.marko",
@@ -62,7 +66,8 @@
     "<page>": {},
     "<above-page>": {},
     "<below-page>": {},
-    "@id": "number"
+    "@id": "number",
+    "@attrs": "object"
   },
   "<marko-web-magazine-publication-page-layout>": {
     "template": "./magazine-publication.marko",
@@ -73,6 +78,7 @@
     "<page>": {},
     "<above-page>": {},
     "<below-page>": {},
-    "@id": "number"
+    "@id": "number",
+    "@attrs": "object"
   }
 }

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

@@ -18,7 +18,7 @@ $ const withRss = input.withRss != null ? input.withRss : true;
   </@head>
   <!-- Note: camelcased vars due to nest input of dynamic document. perhaps a marko bug -->
   <@container abovePage=input.abovePage belowPage=input.belowPage>
-    <@page for="website-section" id=id>
+    <@page for="website-section" id=id attrs=input.attrs>
       <${input.page} />
     </@page>
   </@container>

package/express/error-handlers.js

@@ -1,6 +1,6 @@
 const { STATUS_CODES } = require('http');
 const createError = require('http-errors');
-const errorTemplate = require('../components/document/components/error');
+const errorTemplate = require('../components/document/components/error.marko');
 const getRedirect = require('./get-redirect');
 const findContentAlias = require('./find-content-alias');
 const applyQueryParams = require('../utils/apply-query-params');

package/express/load-document.js

@@ -1,3 +1,3 @@
-const defaultDocument = require('../components/document');
+const defaultDocument = require('../components/document/index.marko');
 
 module.exports = document => document || defaultDocument;

package/middleware/with-load-more.js

@@ -1,5 +1,5 @@
 const { asyncRoute } = require('@parameter1/base-cms-utils');
-const LoadMore = require('../components/load-more');
+const LoadMore = require('../components/load-more/index.marko');
 
 module.exports = () => asyncRoute(async (req, res) => {
   const { method, query, body } = req;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "2.40.0",
+  "version": "2.46.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -14,17 +14,17 @@
     "test": "yarn compile && yarn lint"
   },
   "dependencies": {
-    "@godaddy/terminus": "^4.5.0",
-    "@parameter1/base-cms-apollo-ssr": "^2.39.3",
-    "@parameter1/base-cms-embedded-media": "^2.8.1",
-    "@parameter1/base-cms-express-apollo": "^2.39.3",
-    "@parameter1/base-cms-graphql-fragment-types": "^2.37.1",
-    "@parameter1/base-cms-image": "^2.8.1",
+    "@godaddy/terminus": "^4.9.0",
+    "@parameter1/base-cms-apollo-ssr": "^2.45.0",
+    "@parameter1/base-cms-embedded-media": "^2.45.0",
+    "@parameter1/base-cms-express-apollo": "^2.45.0",
+    "@parameter1/base-cms-graphql-fragment-types": "^2.45.0",
+    "@parameter1/base-cms-image": "^2.45.0",
     "@parameter1/base-cms-inflector": "^2.0.0",
-    "@parameter1/base-cms-object-path": "^2.22.2",
+    "@parameter1/base-cms-object-path": "^2.45.0",
     "@parameter1/base-cms-tenant-context": "^2.0.0",
     "@parameter1/base-cms-utils": "^2.22.2",
-    "@parameter1/base-cms-web-common": "^2.37.2",
+    "@parameter1/base-cms-web-common": "^2.46.0",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",
     "apollo-link": "^1.2.14",
@@ -33,14 +33,14 @@
     "express": "^4.17.1",
     "express-http-proxy": "^1.6.2",
     "graphql": "^14.7.0",
-    "graphql-tag": "^2.11.0",
+    "graphql-tag": "^2.12.5",
     "helmet": "^3.23.3",
     "http-errors": "^1.8.0",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
     "marko": "~4.20.0",
     "moment": "^2.29.1",
     "vue": "^2.6.14",
-    "vue-apollo": "^3.0.5",
+    "vue-apollo": "^3.0.8",
     "vue-server-renderer": "^2.6.14",
     "whatwg-fetch": "^3.6.1"
   },
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "99b805bdc63dfb5d715956206b9854eed66c1d7d"
+  "gitHead": "5252afc89283747aced3021136164c222609a843"
 }

package/utils/embedded-media/oembed.js

@@ -1,4 +1,4 @@
-const BrowserComponent = require('../../components/browser-component');
+const BrowserComponent = require('../../components/browser-component.marko');
 const facebook = require('./facebook-oembed');
 const instagram = require('./instagram-oembed');
 

package/components/load-more/index.marko.js

@@ -1,118 +0,0 @@
-// Compiled using marko@4.20.2 - DO NOT EDIT
-"use strict";
-
-var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/load-more/index.marko",
-    marko_component = require("./index.marko"),
-    marko_renderer = require("marko/dist/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,
-    getAsArray = module_baseCmsObjectPath_module.getAsArray,
-    marko_web_browser_component_template = require("../browser-component.marko"),
-    marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
-    marko_web_browser_component_tag = marko_loadTag(marko_web_browser_component_template),
-    marko_str = require("marko/dist/runtime/helpers/to-string"),
-    marko_assign = require("marko/dist/runtime/helpers/assign"),
-    marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
-    marko_web_load_more_trigger_template = require("./trigger.marko"),
-    marko_web_load_more_trigger_tag = marko_loadTag(marko_web_load_more_trigger_template),
-    marko_web_page_container_template = require("../page/container.marko"),
-    marko_web_page_container_tag = marko_loadTag(marko_web_page_container_template),
-    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 { components, fragments } = out.global;
-
-  const Component = components.get(input.componentName);
-
-  const pageNumber = input.pageNumber || 1;
-
-  const queryParams = {
-  ...getAsObject(input, "queryParams"),
-  queryName: "LoadMore",
-  queryFragment: fragments.get(input.fragmentName),
-};
-
-  if (Component) {
-    marko_web_query_tag({
-        collapsible: true,
-        name: input.queryName,
-        params: queryParams,
-        renderBody: function(out, { nodes, pageInfo }) {
-          if (nodes.length) {
-            marko_web_page_container_tag(marko_assign({
-                tag: "section"
-              }, input.pageInput, {
-                modifiers: ["load-more", `page-${pageNumber}`, ...getAsArray(input, "pageInput.modifiers")],
-                renderBody: function(out) {
-                  marko_web_browser_component_tag({
-                      name: "TriggerInViewEvent",
-                      props: {
-                          eventName: "load-more-in-view",
-                          data: {
-                              page_number: pageNumber + 1
-                            }
-                        }
-                    }, out, __component, "2");
-
-                  if ((pageNumber === 1) && input.header) {
-                    out.w("<div class=\"load-more-header\">" +
-                      marko_str(input.header) +
-                      "</div>");
-                  }
-
-                  marko_dynamicTag(out, Component, function() {
-                    return marko_assign({}, input.componentInput, {
-                        nodes: nodes,
-                        "page-info": pageInfo,
-                        "page-number": pageNumber
-                      });
-                  }, null, null, null, __component, "4");
-
-                  const { endCursor, hasNextPage } = pageInfo;
-
-                  delete queryParams.skip;
-
-                  delete queryParams.queryFragment;
-
-                  delete queryParams.renderBody;
-
-                  const provide = {
-          ...input,
-          queryParams: { ...queryParams, after: endCursor },
-        };
-
-                  marko_web_load_more_trigger_tag(marko_assign({}, input.triggerInput, {
-                      appendTo: input.appendTo,
-                      maxPages: input.maxPages,
-                      expand: input.expand,
-                      pageNumber: pageNumber,
-                      provide: provide,
-                      show: hasNextPage
-                    }), out, __component, "5");
-                }
-              }), out, __component, "1");
-          }
-        }
-      }, out, __component, "0");
-  }
-}
-
-marko_template._ = marko_renderer(render, {
-    e_: marko_componentType
-  }, marko_component);
-
-marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/load-more/index.marko",
-    component: "./",
-    tags: [
-      "../browser-component.marko",
-      "./trigger.marko",
-      "../page/container.marko",
-      "@parameter1/base-cms-marko-core/components/queries/index.marko"
-    ]
-  };