@parameter1/base-cms-marko-web 4.5.4 → 4.5.6

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.5.4/components/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/layouts/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/layouts/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/layouts/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/components/common.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/components/common.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.5.6/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.5.4/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.5.6/components/rss/website-section.marko"
   };

package/integration/test-website-boot.js

@@ -4,6 +4,7 @@ const whilst = require('async/whilst');
 const eachLimit = require('async/eachLimit');
 const fetch = require('node-fetch');
 const cheerio = require('cheerio');
+const { inspect } = require('util');
 
 const { log } = console;
 
@@ -12,26 +13,18 @@ const origin = process.env.MARKO_WEB_INTEGRATION_TEST_URL || 'http://localhost:8
 const fetchResponse = async ({
   path = '/',
   catchErrors = false,
-  returnNullWhenNotOk = false,
 } = {}) => {
   const url = `${cleanPath(origin)}/${cleanPath(path)}`;
   log(`fetching ${url}`);
-  const opts = { method: 'get' };
+  const opts = { method: 'get', redirect: 'manual' };
   if (!catchErrors) return fetch(url, opts);
   try {
-    const res = await fetch(url, opts);
-    if (returnNullWhenNotOk && !res.ok) return null;
-    return res;
+    return fetch(url, opts);
   } catch (e) {
     return null;
   }
 };
 
-const retryableMarkoErrors = new Set([
-  'Network error: Unexpected token < in JSON at position 0',
-  'Timed out after 10000ms',
-]);
-
 const checkReadiness = async ({
   path = '/_health',
   startAfter = 5000,
@@ -65,61 +58,70 @@ const checkReadiness = async ({
 };
 
 const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {}) => {
-  log(`testing page path ${path}`);
-
   let timesChecked = 0;
-  let passed = false;
+  let finished = false;
   let html;
-  await whilst(async () => !passed, async () => {
+  const report = {
+    path,
+    error: null,
+    checks: [],
+  };
+  await whilst(async () => !finished, async () => {
+    const check = {};
+    report.checks.push(check);
     timesChecked += 1;
     if (timesChecked > retryAttempts) {
-      throw new Error(`The test runner for page path ${path} has reached its maximum check limit.`);
+      // max times reach, append error to report.
+      report.error = new Error(`The test runner for page path ${path} has reached its maximum check limit.`);
+      finished = true;
+      return;
     }
     const res = await fetchResponse({ path });
+    check.statusCode = res.status;
     if (!res.ok) {
       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;
+        check.message = `received a ${res.status} from path ${path} but treating as passing since it was not a server error (>= 500).`;
+        finished = true;
         return;
       }
-      throw new Error(`Received an error response from path page ${path} with status ${res.status} ${res.statusText}`);
+      // received a 500, append the message and retry
+      check.message = `received an error response from path page ${path} with status ${res.status} ${res.statusText}`;
+      return;
     }
     html = await res.text();
 
     // first ensure the entire page rendered. if it didn't a fatal backened error occurred
     // that prevented rendering, or some kind of timeout occurred. this can be retried.
     const found = /.*<\/head>.*<\/body>.*<\/html>.*/is.test(html);
-    if (!found) return; // exit out so it can be retried.
+    if (!found) {
+      // no render, append the message and retry.
+      check.message = `unable to detect a full page render for path ${path} retrying...`;
+      return;
+    }
 
     // then check for in-body errors. this means an async internal block failed
     // but the page could fully render.
     const matches = [...html.matchAll(/data-marko-error="(.*?)"/g)];
-    const errors = [];
+    check.inPageErrors = [];
     matches.forEach((values) => {
       const value = values[1];
-      errors.push(htmlEntities.decode(value));
+      check.inPageErrors.push(htmlEntities.decode(value));
     });
-    if (errors.length) {
-      // if all the errors were timeout errors, let's try again.
-      if (errors.every((msg) => retryableMarkoErrors.has(msg))) {
-        log(`all errors for page path ${path} were flagged as retryable. retrying...`);
-        return; // exit out so it can be retried.
-      }
-      // otherwise error.
-      log({ path, errors });
-      throw new Error(`Encountered server-side Marko error(s) at page path ${path}`);
+    if (check.inPageErrors.length) {
+      // in-page errors occurred. exit and retry
+      return;
     }
-    passed = true;
+    // otherwise, mark as finished.
+    finished = true;
   });
-  log(`page path ${path} passed tests.`);
-  return html;
+  return { html, report };
 };
 
 const run = async () => {
   await checkReadiness();
 
   // test homepage first, and get html.
-  const html = await testPage({ path: '/', serverErrorsOnly: false });
+  const { html, report: initialReport } = await testPage({ path: '/', serverErrorsOnly: false });
 
   const toTest = new Map([
     ['/search', {}],
@@ -146,22 +148,33 @@ const run = async () => {
 
   // now test all extracted pages.
   const errors = [];
+  const reports = [initialReport];
   await eachLimit([...toTest, ...contentToTest], 2, async ([path, opts]) => {
     // catch all errors so they can be reported on at once.
+    // these should be internal at this point.
     try {
-      await testPage({ ...opts, path });
+      const { report } = await testPage({ ...opts, path });
+      reports.push(report);
     } catch (e) {
       errors.push(e);
     }
   });
 
   if (errors.length) {
-    log('TEST PAGE ERRORS ENCOUNTERED');
+    log('INTERNAL TESTING ERRORS ENCOUNTERED');
     errors.forEach((error) => {
       log(error);
     });
-    throw new Error('Page testing errors were encountered.');
+    throw new Error('Internal testing errors were encountered.');
+  }
+
+  const errorReports = reports.filter((report) => report.error);
+  if (errorReports.length) {
+    log('PAGE ERRORS ENCOUNTERED');
+    errorReports.forEach((report) => log(report));
+    throw new Error('Page errors were encountered.');
   }
+  log('test results', inspect(reports, { colors: true, depth: null }));
 };
 
 run().catch((e) => setImmediate(() => { throw e; }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.5.4",
+  "version": "4.5.6",
   "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": "3616b2d2464f909bff5372c7aef37977273beff0"
+  "gitHead": "38bf12b107b7c888b652eb2c63eaa915f7b39851"
 }