@parameter1/base-cms-marko-web 4.5.7 → 4.5.9

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

package/integration/test-website-boot.js

@@ -13,13 +13,18 @@ const origin = process.env.MARKO_WEB_INTEGRATION_TEST_URL || 'http://localhost:8
 const fetchResponse = async ({
   path = '/',
   catchErrors = false,
+  followRedirects = false,
 } = {}) => {
   const url = `${cleanPath(origin)}/${cleanPath(path)}`;
   log(`fetching ${url}`);
-  const opts = { method: 'get', redirect: 'manual' };
+  const opts = {
+    method: 'get',
+    redirect: followRedirects ? 'follow' : 'manual',
+  };
   if (!catchErrors) return fetch(url, opts);
   try {
-    return fetch(url, opts);
+    const res = await fetch(url, opts);
+    return res;
   } catch (e) {
     return null;
   }
@@ -57,15 +62,23 @@ const checkReadiness = async ({
   log('container is ready.');
 };
 
-const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {}) => {
+const testPage = async ({
+  path,
+  retryAttempts = 3,
+  serverErrorsOnly = true,
+  followRedirects = false,
+  checkInterval = 500,
+} = {}) => {
   let timesChecked = 0;
   let finished = false;
   let html;
-  const report = {
-    path,
-    error: null,
-    checks: [],
+  const report = { path, error: null, checks: [] };
+
+  const waitThenRetry = async () => {
+    log(`waiting ${checkInterval}ms to retry ${path}`);
+    await wait(checkInterval);
   };
+
   await whilst(async () => !finished, async () => {
     const check = {};
     report.checks.push(check);
@@ -74,19 +87,19 @@ const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {
       // 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;
+      return true;
     }
-    const res = await fetchResponse({ path });
+    const res = await fetchResponse({ path, followRedirects });
     check.statusCode = res.status;
     if (!res.ok) {
       if (serverErrorsOnly && res.status < 500) {
         check.message = `received a ${res.status} from path ${path} but treating as passing since it was not a server error (>= 500).`;
         finished = true;
-        return;
+        return true;
       }
       // 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;
+      return waitThenRetry();
     }
     html = await res.text();
 
@@ -96,7 +109,7 @@ const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {
     if (!found) {
       // no render, append the message and retry.
       check.message = `unable to detect a full page render for path ${path} retrying...`;
-      return;
+      return waitThenRetry();
     }
 
     // then check for in-body errors. this means an async internal block failed
@@ -109,10 +122,11 @@ const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {
     });
     if (check.inPageErrors.length) {
       // in-page errors occurred. exit and retry
-      return;
+      return waitThenRetry();
     }
     // otherwise, mark as finished.
     finished = true;
+    return true;
   });
   return { html, report };
 };
@@ -120,8 +134,12 @@ const testPage = async ({ path, retryAttempts = 3, serverErrorsOnly = true } = {
 const run = async () => {
   await checkReadiness();
 
-  // test homepage first, and get html.
-  const { html, report: initialReport } = await testPage({ path: '/', serverErrorsOnly: false });
+  // test homepage first, and get html, allowing redirects (since this page _has_ to load).
+  const { html, report: initialReport } = await testPage({
+    path: '/',
+    serverErrorsOnly: false,
+    followRedirects: true,
+  });
 
   const toTest = new Map([
     ['/search', {}],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.5.7",
+  "version": "4.5.9",
   "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": "fffa89c508485da8225e5e8f53e5649b47ac5e36"
+  "gitHead": "5c9d4f8ab2e181a2d50e4c02870cf686c0bda35e"
 }