@parameter1/base-cms-marko-web 4.4.1 → 4.5.1

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/layouts/magazine-publication.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_publication_page_metadata_template = require("../metadata/magazine-publication.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/layouts/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/layouts/magazine-publication.marko",
     tags: [
       "../metadata/magazine-publication.marko"
     ]

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/layouts/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/layouts/website-section.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,
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/layouts/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/layouts/website-section.marko",
     tags: [
       "../metadata/website-section.marko",
       "../../rss/website-section.marko"

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/components/common.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/components/common.marko",
     marko_component = require("./common.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_page_title_template = require("../../title.marko"),
@@ -98,7 +98,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/components/common.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/components/common.marko",
     component: "./common.marko",
     tags: [
       "../../title.marko",

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/content.marko",
     marko_component = require("./content.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -197,7 +197,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/content.marko",
     component: "./content.marko",
     tags: [
       "./components/common.marko",

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -22,7 +22,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/default.marko",
     tags: [
       "./components/common.marko"
     ]

package/components/page/metadata/dynamic-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/dynamic-page.marko",
     marko_component = require("./dynamic-page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -75,7 +75,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/dynamic-page.marko",
     component: "./dynamic-page.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/magazine-issue.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/magazine-issue.marko",
     marko_component = require("./magazine-issue.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -74,7 +74,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/magazine-issue.marko",
     component: "./magazine-issue.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/magazine-publication.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/magazine-publication.marko",
     marko_component = require("./magazine-publication.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/magazine-publication.marko",
     component: "./magazine-publication.marko",
     tags: [
       "./components/common.marko",

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/website-section.marko",
     marko_component = require("./website-section.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/metadata/website-section.marko",
     component: "./website-section.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/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/rel-canonical.marko",
     marko_renderer = require("marko/dist/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$4.4.1/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.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/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/title.marko",
     marko_renderer = require("marko/dist/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$4.4.1/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/title.marko"
   };

package/components/page/wrapper.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/page/wrapper.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,
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/page/wrapper.marko",
     tags: [
       "../element/index.marko"
     ]

package/components/resolve/page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/resolve/page.marko",
     marko_component = require("./page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
@@ -41,7 +41,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/resolve/page.marko",
     component: "./page.marko",
     tags: [
       "@parameter1/base-cms-marko-core/components/resolve.marko"

package/components/rss/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.1/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.1/components/rss/website-section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_url_module = require("url"),
     url_module = module_url_module.default || module_url_module,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.4.1/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.1/components/rss/website-section.marko"
   };

package/integration/test-website-boot.js

@@ -1,6 +1,7 @@
 const { htmlEntities } = require('@parameter1/base-cms-html');
 const { sleep: wait, cleanPath } = require('@parameter1/base-cms-utils');
 const whilst = require('async/whilst');
+const eachLimit = require('async/eachLimit');
 const fetch = require('node-fetch');
 const cheerio = require('cheerio');
 
@@ -26,6 +27,11 @@ const fetchResponse = async ({
   }
 };
 
+const retryableMarkoErrors = new Set([
+  'Network error: Unexpected token < in JSON at position 0',
+  'Timed out after 10000ms',
+]);
+
 const checkReadiness = async ({
   path = '/_health',
   startAfter = 5000,
@@ -58,7 +64,7 @@ const checkReadiness = async ({
   log('container is ready.');
 };
 
-const testPage = async ({ path, retryAttempts = 3, allowNotFound = false } = {}) => {
+const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {}) => {
   log(`testing page path ${path}`);
 
   let timesChecked = 0;
@@ -71,12 +77,12 @@ const testPage = async ({ path, retryAttempts = 3, allowNotFound = false } = {})
     }
     const res = await fetchResponse({ path });
     if (!res.ok) {
-      if (allowNotFound && res.status === 404) {
-        log(`received a 404 not found from path ${path} but was set as allowed for this test. treating as passing.`);
+      if (serverErrorsOnly && res.status < 500) {
+        log(`received a ${res.status} from path ${path} but treating as passing since it was not a server error (>= 500).`);
         passed = true;
         return;
       }
-      throw new Error(`Received a non-ok response from path page ${path}`, res.status, res.statusText);
+      throw new Error(`Received an error response from path page ${path} with status ${res.status} ${res.statusText}`);
     }
     html = await res.text();
 
@@ -95,8 +101,8 @@ const testPage = async ({ path, retryAttempts = 3, allowNotFound = false } = {})
     });
     if (errors.length) {
       // if all the errors were timeout errors, let's try again.
-      if (errors.every((msg) => msg === 'Timed out after 10000ms')) {
-        log(`all errors for page path ${path} were timeout errors. retrying...`);
+      if (errors.every((msg) => msg === retryableMarkoErrors.has(msg))) {
+        log(`all errors for page path ${path} were flagged as retryable. retrying...`);
         return;
       }
       // otherwise error.
@@ -113,11 +119,13 @@ const run = async () => {
   await checkReadiness();
 
   // test homepage first, and get html.
-  const html = await testPage({ path: '/' });
+  const html = await testPage({ path: '/', serverErrorsOnly: false });
 
   const toTest = new Map([
-    ['/search', { allowNotFound: true }],
+    ['/search', {}],
+    ['/site-map', {}],
   ]);
+  const contentToTest = new Map();
 
   const $ = cheerio.load(html);
   const $a = $('a[href^="/"]');
@@ -125,15 +133,35 @@ const run = async () => {
   $a.each(function getHref() {
     const href = $(this).attr('href');
     if (toTest.has(href) || href === '/') return;
+    if (/\/\d{8}\//.test(href)) {
+      // content page
+      if (contentToTest.size === 5) return;
+      contentToTest.set(href, {});
+      return;
+    }
+    // non content pages
     if (toTest.size === 10) return;
-    toTest.set(href, { allowNotFound: true });
+    toTest.set(href, {});
   });
 
   // now test all extracted pages.
-  await Promise.all([...toTest].map(async ([path, opts]) => testPage({
-    ...opts,
-    path,
-  })));
+  const errors = [];
+  await eachLimit([...toTest, ...contentToTest], 2, async ([path, opts]) => {
+    // catch all errors so they can be reported on at once.
+    try {
+      await testPage({ ...opts, path });
+    } catch (e) {
+      errors.push(e);
+    }
+  });
+
+  if (errors.length) {
+    log('TEST PAGE ERRORS ENCOUNTERED');
+    errors.forEach((error) => {
+      log(error);
+    });
+    throw new Error('Page testing errors were encountered.');
+  }
 };
 
 run().catch((e) => setImmediate(() => { throw e; }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.4.1",
+  "version": "4.5.1",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b353557101703cb63d3f71c55c2383cc993a13fc"
+  "gitHead": "1aafde4996698623d857bde0dcab2c6f552d95ec"
 }