@parameter1/base-cms-marko-web 4.3.5 → 4.4.0

package/components/page/layouts/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.3.5/components/page/layouts/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.4.0/components/page/layouts/magazine-issue.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_issue_page_metadata_template = require("../metadata/magazine-issue.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.3.5/components/page/layouts/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.4.0/components/page/layouts/magazine-issue.marko",
     tags: [
       "../metadata/magazine-issue.marko"
     ]

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

package/integration/test-website-boot.js

@@ -1,40 +1,107 @@
-const fetch = require('node-fetch');
 const { htmlEntities } = require('@parameter1/base-cms-html');
+const { sleep: wait, cleanPath } = require('@parameter1/base-cms-utils');
+const whilst = require('async/whilst');
+const fetch = require('node-fetch');
 
-const { error, log } = console;
+const { log } = console;
 
-const url = process.env.MARKO_WEB_INTEGRATION_TEST_URL || 'http://localhost:80';
+const origin = process.env.MARKO_WEB_INTEGRATION_TEST_URL || 'http://localhost:80';
 
-setInterval(async () => {
+const fetchResponse = async ({
+  path = '/',
+  catchErrors = false,
+  returnNullWhenNotOk = false,
+} = {}) => {
+  const url = `${cleanPath(origin)}/${cleanPath(path)}`;
+  log(`fetching ${url}`);
+  const opts = { method: 'get' };
+  if (!catchErrors) return fetch(url, opts);
   try {
-    const res = await fetch(url, { method: 'get' });
-    if (!res.ok) {
-      error('Response not ok!', res.status, res.statusText);
-      process.exit(1);
-    } else {
-      const html = await res.text();
-      // check for in-body body errors
-      const matches = [...html.matchAll(/data-marko-error="(.*?)"/g)];
-      const errors = [];
-      matches.forEach((values) => {
-        const value = values[1];
-        errors.push(htmlEntities.decode(value));
-      });
-      if (errors.length) {
-        error('In-page, server-side Marko error(s) were encountered!', errors);
-        process.exit(1);
-      }
+    const res = await fetch(url, opts);
+    if (returnNullWhenNotOk && !res.ok) return null;
+    return res;
+  } catch (e) {
+    return null;
+  }
+};
+
+const checkReadiness = async ({
+  path = '/_health',
+  startAfter = 5000,
+  checkInterval = 1000,
+  unhealthyAfter = 5,
+} = {}) => {
+  log('checking readiness...');
+  log(`initially waiting for ${startAfter}ms before checking...`);
+  await wait(startAfter);
+
+  let timesChecked = 0;
+  let booted = false;
+  await whilst(async () => !booted, async () => {
+    timesChecked += 1;
+    if (timesChecked > unhealthyAfter) {
+      throw new Error('The readiness probe has reached its maximum check limit.');
+    }
+    log(`pinging health check, attempt number ${timesChecked}...`);
+    const res = await fetchResponse({ path, catchErrors: true });
+    // if response is null, a connection error occrred
+    if (res == null || (res && !res.ok)) {
+      if (res == null) log('did not receive a response - assuming not ready.');
+      if (res && !res.ok) log(`received a non-ok response from health check - ${res.status} ${res.statusText}`);
+      log(`waiting another ${checkInterval}ms before retrying.`);
+      await wait(checkInterval);
+      return;
+    }
+    booted = true;
+  });
+  log('container is ready.');
+};
 
-      // if not in-body errors, ensure page rendered.
-      const found = /.*<\/head>.*<\/body>.*<\/html>.*/is.test(html);
-      if (!found) {
-        error('Unable to find closing HTML tags!');
-        process.exit(1);
+const testPage = async ({ path, retryAttempts = 3 } = {}) => {
+  log(`testing page path ${path}`);
+
+  let timesChecked = 0;
+  let passed = false;
+  await whilst(async () => !passed, async () => {
+    timesChecked += 1;
+    if (timesChecked > retryAttempts) {
+      throw new Error(`The test runner for page path ${path} has reached its maximum check limit.`);
+    }
+    const res = await fetchResponse({ path });
+    if (!res.ok) throw new Error(`Received a non-ok response from path page ${path}`, res.status, res.statusText);
+    const html = await res.text();
+
+    // first ensure the entire page rendered. if it didn't a fatal backened error occurred
+    // that prevented rendering.
+    const found = /.*<\/head>.*<\/body>.*<\/html>.*/is.test(html);
+    if (!found) throw new Error(`The page at path ${path} did not completely render.`);
+
+    // 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 = [];
+    matches.forEach((values) => {
+      const value = values[1];
+      errors.push(htmlEntities.decode(value));
+    });
+    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...`);
+        return;
       }
-      log('Integration tests passed!');
-      process.exit(0);
+      // otherwise error.
+      log({ errors });
+      throw new Error(`Encountered server-side Marko error(s) at page path ${path}`);
     }
-  } catch (e) {
-    // noop
-  }
-}, 100);
+    passed = true;
+  });
+  log(`page path ${path} passed tests.`);
+};
+
+const run = async () => {
+  await checkReadiness();
+  await testPage({ path: '/' });
+};
+
+run().catch((e) => setImmediate(() => { throw e; }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.3.5",
+  "version": "4.4.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -38,6 +38,7 @@
     "@parameter1/base-cms-tenant-context": "^4.0.2",
     "@parameter1/base-cms-utils": "^4.0.2",
     "@parameter1/base-cms-web-common": "^4.0.2",
+    "async": "^3.2.4",
     "cheerio": "^1.0.0-rc.12",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
@@ -58,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "db792f85f1c74cdd2eb5d518c4ef89136908dc7b"
+  "gitHead": "799dc3460f76ea452fc9edb6a0258987e15de5cc"
 }

package/start-server.js

@@ -68,7 +68,7 @@ module.exports = async ({
   });
 
   // base browse (optional)
-  if (!process.env.BASE_BROWSE_GRAPHQL_URI && site.stack) process.env.BASE_BROWSE_GRAPHQL_URI = `https://base-browse.${site.stack}.base.parameter1.com`;
+  if (!process.env.BASE_BROWSE_GRAPHQL_URI && site.stack) process.env.BASE_BROWSE_GRAPHQL_URI = `https://base-browse.${site.stack}.base.parameter1.com/graphql`;
 
   const graphqlUri = process.env.GRAPHQL_URI;
   const siteId = process.env.SITE_ID;