@parameter1/base-cms-marko-web 4.0.0-alpha.0 → 4.0.0-beta.0

package/components/page/metadata/google-structured-data/content.js

@@ -15,12 +15,12 @@ const get = (o, path) => {
 };
 
 const getAuthor = (node) => {
-  const authors = getAsArray(node, 'authors.edges').map(e => get(e, 'node.name'));
+  const authors = getAsArray(node, 'authors.edges').map((e) => get(e, 'node.name'));
   return authors.length ? { '@type': 'Person', name: authors.join(', ') } : undefined;
 };
 
 const getImages = (node) => {
-  const images = getAsArray(node, 'images.edges').map(e => get(e, 'node.src'));
+  const images = getAsArray(node, 'images.edges').map((e) => get(e, 'node.src'));
   return images.length ? images : undefined;
 };
 

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

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/magazine-issue.marko",
     marko_component = require("./magazine-issue.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -13,11 +13,10 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
     warn = module_baseCmsUtils_module.warn,
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    common_template = marko_loadTemplate(require.resolve("./components/common.marko")),
+    common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     common_tag = marko_loadTag(common_template),
-    marko_web_query_template = marko_loadTemplate(require.resolve("@parameter1/base-cms-marko-core/components/queries/index.marko")),
+    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) {
@@ -75,7 +74,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$1.49.0/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/magazine-publication.marko",
     marko_component = require("./magazine-publication.marko"),
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -13,11 +13,10 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
     warn = module_baseCmsUtils_module.warn,
-    marko_loadTemplate = require("marko/src/runtime/helpers/load-template"),
-    common_template = marko_loadTemplate(require.resolve("./components/common.marko")),
+    common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     common_tag = marko_loadTag(common_template),
-    marko_web_query_template = marko_loadTemplate(require.resolve("@parameter1/base-cms-marko-core/components/queries/index.marko")),
+    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) {
@@ -71,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$1.49.0/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/website-section.marko",
     marko_component = require("./website-section.marko"),
     marko_renderer = require("marko/src/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$3.17.3/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/rel-canonical.marko",
     marko_renderer = require("marko/src/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$3.17.3/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/title.marko",
     marko_renderer = require("marko/src/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$3.17.3/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/title.marko"
   };

package/components/page/wrapper.marko.js

@@ -2,14 +2,14 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/wrapper.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
     getAsArray = module_baseCmsObjectPath_module.getAsArray,
     marko_forOf = require("marko/src/runtime/helpers/for-of"),
     marko_assign = require("marko/src/runtime/helpers/assign"),
-    marko_web_element_template = require("../element"),
+    marko_web_element_template = require("../element/index.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
     marko_web_element_tag = marko_loadTag(marko_web_element_template),
     marko_dynamicTag = require("marko/src/runtime/helpers/dynamic-tag");
@@ -56,8 +56,8 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$3.17.3/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/wrapper.marko",
     tags: [
-      "../element"
+      "../element/index.marko"
     ]
   };

package/components/resolve/page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/resolve/page.marko",
     marko_component = require("./page.marko"),
     marko_renderer = require("marko/src/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$3.17.3/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.3/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/rss/website-section.marko",
     marko_renderer = require("marko/src/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$3.17.3/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/rss/website-section.marko"
   };

package/config/asset-manifest.js

@@ -16,7 +16,7 @@ class AssetManifest {
   css() {
     if (!this.stylesheets) {
       const { css } = this.load();
-      this.stylesheets = [css['index.css']];
+      this.stylesheets = [css['main.css']];
     }
     return this.stylesheets;
   }

package/express/index.js

@@ -1,11 +1,10 @@
 const { buildRequestHeaders } = require('@parameter1/base-cms-tenant-context');
 const createApolloClient = require('@parameter1/base-cms-apollo-ssr');
+const { cleanMarkoResponse, markoMiddleware } = require('@parameter1/base-cms-marko-express/middleware');
 const cookieParser = require('cookie-parser');
 const express = require('express');
-const marko = require('marko/express');
 const path = require('path');
 const helmet = require('helmet');
-const cleanMarkoResponse = require('@parameter1/base-cms-marko-core/middleware/clean-marko-response');
 const apollo = require('./apollo');
 const graphqlProxy = require('./graphql-proxy');
 const embeddedMedia = require('./embedded-media');
@@ -111,7 +110,7 @@ module.exports = (config = {}) => {
   app.use(websiteContext(app.locals.config));
 
   // Register the Marko middleware.
-  app.use(marko());
+  app.use(markoMiddleware());
   app.use(cleanMarkoResponse());
 
   // Serve static assets

package/express/load-document.js

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

package/express/load-object.js

@@ -6,5 +6,5 @@ const { keys } = Object;
 module.exports = (value) => {
   const v = getAsObject(value);
   const obj = keys(v).reduce((o, k) => ({ ...o, [dasherize(k)]: v[k] }), {});
-  return { get: name => get(obj, dasherize(name)) };
+  return { get: (name) => get(obj, dasherize(name)) };
 };

package/express/marko.js

@@ -0,0 +1,36 @@
+/* eslint-disable no-underscore-dangle */
+require('marko');
+const buildGlobal = require('@parameter1/base-cms-marko-core/utils/build-marko-global');
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const express = module.main ? module.main.require('express') : require('express');
+
+if (!express) throw new Error('Unable to load Express.');
+
+const patch = (response) => {
+  response.marko = response.marko || function markoResponse(template, data) {
+    if (typeof template === 'string') throw new Error('res.marko does not accept a string or path as a template.');
+
+    const res = this;
+    const { req } = res;
+    res.set({ 'content-type': 'text/html; charset=utf-8' });
+    const $global = buildGlobal(res, data);
+    return template.render({ ...(data || {}), $global }, res).on('error', req.next);
+  };
+};
+
+patch(express.response);
+delete require.cache[__filename];
+
+module.exports = () => {
+  const app = express();
+  app.once('mount', (parent) => {
+    patch(parent.response);
+    if (parent._router) {
+      parent._router.stack.pop(); // express <= 4.x
+    } else {
+      parent.router.stack.pop(); // express 5.x
+    }
+  });
+  return app;
+};

package/express/website-context.js

@@ -2,7 +2,7 @@ const loadWebsite = require('@parameter1/base-cms-web-common/website-context');
 const { asyncRoute } = require('@parameter1/base-cms-utils');
 const { setDayjsLocale } = require('@parameter1/base-cms-dayjs/utils');
 
-module.exports = coreConfig => asyncRoute(async (req, res, next) => {
+module.exports = (coreConfig) => asyncRoute(async (req, res, next) => {
   const { apollo } = res.locals;
   const websiteContext = await loadWebsite(apollo);
   coreConfig.setWebsiteContext(websiteContext);

package/index.js

@@ -1,3 +1,8 @@
+if (process.env.MARKO_REQUIRE_PREBUILT_TEMPLATES == null) {
+  // force prebuilt templates if env not set
+  process.env.MARKO_REQUIRE_PREBUILT_TEMPLATES = true;
+}
+
 const startServer = require('./start-server');
 
 module.exports = { startServer };

package/middleware/page-node/index.js

@@ -2,7 +2,7 @@ const { isFunction: isFn } = require('@parameter1/base-cms-utils');
 const { getAsObject } = require('@parameter1/base-cms-object-path');
 const ResolvedNode = require('./resolved');
 
-const createNode = data => new ResolvedNode(data);
+const createNode = (data) => new ResolvedNode(data);
 
 class PageNode {
   constructor(apolloClient, {

package/middleware/page-node/resolved.js

@@ -19,7 +19,7 @@ class ResolvedNode {
   }
 
   getEdgeNodesFor(path) {
-    return this.getAsArray(`${path}.edges`).map(edge => asObject(edge).node);
+    return this.getAsArray(`${path}.edges`).map((edge) => asObject(edge).node);
   }
 }
 

package/package.json

@@ -1,33 +1,42 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0-beta.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
   "license": "MIT",
   "repository": "https://github.com/parameter1/base-cms/tree/master/packages/marko-web",
+  "engines": {
+    "node": ">=14.15"
+  },
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
   "scripts": {
-    "lint": "yarn lint:js && yarn lint:css",
-    "lint:js": "eslint --ext .js --ext .vue --max-warnings 5 ./",
-    "lint:css": "stylelint ./**/*.scss --max-warnings 5",
-    "compile": "basecms-marko-compile compile --dir ./ --silent true",
-    "test": "yarn compile && yarn lint"
+    "lint:fix": "yarn lint --fix",
+    "lint": "eslint --ext .js --ext .vue --max-warnings 5 ./",
+    "compile": "basecms-marko-compile compile",
+    "prepublish": "yarn compile --silent",
+    "test": "yarn compile --no-clean && yarn lint"
   },
   "dependencies": {
     "@godaddy/terminus": "^4.11.2",
-    "@parameter1/base-cms-apollo-ssr": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-dayjs": "^3.17.3",
-    "@parameter1/base-cms-embedded-media": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-express-apollo": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-graphql-fragment-types": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-image": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-inflector": "^3.0.0",
-    "@parameter1/base-cms-marko-node-require": "^3.0.0",
-    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.0.0-alpha.0",
-    "@parameter1/base-cms-object-path": "^3.0.0",
-    "@parameter1/base-cms-tenant-context": "^3.0.0",
-    "@parameter1/base-cms-utils": "^3.0.0",
-    "@parameter1/base-cms-web-common": "^4.0.0-alpha.0",
+    "@parameter1/base-cms-apollo-ssr": "^4.0.0-beta.0",
+    "@parameter1/base-cms-dayjs": "^4.0.0-beta.0",
+    "@parameter1/base-cms-embedded-media": "^4.0.0-beta.0",
+    "@parameter1/base-cms-express-apollo": "^4.0.0-beta.0",
+    "@parameter1/base-cms-graphql-fragment-types": "^4.0.0-beta.0",
+    "@parameter1/base-cms-image": "^4.0.0-beta.0",
+    "@parameter1/base-cms-inflector": "^4.0.0-beta.0",
+    "@parameter1/base-cms-marko-express": "^4.0.0-beta.0",
+    "@parameter1/base-cms-marko-node-require": "^4.0.0-beta.0",
+    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.0.0-beta.0",
+    "@parameter1/base-cms-object-path": "^4.0.0-beta.0",
+    "@parameter1/base-cms-tenant-context": "^4.0.0-beta.0",
+    "@parameter1/base-cms-utils": "^4.0.0-beta.0",
+    "@parameter1/base-cms-web-common": "^4.0.0-beta.0",
     "cheerio": "^1.0.0-rc.12",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
@@ -42,10 +51,10 @@
     "vue-server-renderer": "^2.7.14"
   },
   "peerDependencies": {
-    "@parameter1/base-cms-marko-core": "^3.0.0"
+    "@parameter1/base-cms-marko-core": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bfe5ea5e2d1a603db7dc4e20e87a280564fc36d8"
+  "gitHead": "6b1c5270b9b3031b27d36ec109348efbd80f7933"
 }

package/start-server.js

@@ -1,4 +1,4 @@
-require('./node-require');
+require('@parameter1/base-cms-marko-node-require');
 const http = require('http');
 const path = require('path');
 const { createTerminus } = require('@godaddy/terminus');
@@ -14,7 +14,9 @@ if (!process.env.EXPOSED_HOST) process.env.EXPOSED_HOST = env.HOST || 'localhost
 
 process.on('unhandledRejection', (e) => { throw e; });
 
-const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+const wait = (ms) => new Promise((resolve) => {
+  setTimeout(resolve, ms);
+});
 
 module.exports = async ({
   rootDir,
@@ -148,5 +150,5 @@ module.exports = async ({
         }
       }
     });
-  }).catch(e => setImmediate(() => { throw e; }));
+  }).catch((e) => setImmediate(() => { throw e; }));
 };

package/utils/embedded-media/facebook-oembed.js

@@ -12,7 +12,7 @@ const buildFacebookElement = ({
     ...(width && { width }),
     ...(showText && { 'show-text': true }),
   };
-  const data = Object.keys(params).map(key => `data-${key}="${params[key]}"`);
+  const data = Object.keys(params).map((key) => `data-${key}="${params[key]}"`);
   return `<div class="fb-post" ${data.join(' ')}></div><script async defer src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v3.2"></script>`;
 };
 
@@ -39,7 +39,6 @@ const facebook = (url) => {
   return buildFacebookElement({ href, showText: true });
 };
 
-
 /**
  *
  */

package/utils/embedded-media/image.js

@@ -1,6 +1,6 @@
 const { buildImgixUrl } = require('@parameter1/base-cms-image');
 
-const stringifyAttrs = attrs => Object.keys(attrs).reduce((arr, key) => {
+const stringifyAttrs = (attrs) => Object.keys(attrs).reduce((arr, key) => {
   const value = attrs[key];
   if (value) arr.push(`${key}="${value}"`);
   return arr;
@@ -44,7 +44,7 @@ module.exports = (tag, { config } = {}, { lazyloadImages } = {}) => {
       'data-srcset': lazyload ? maxSrcset : null,
       media: '(min-width: 576px)',
     },
-  ].map(source => `<source ${stringifyAttrs(source)}>`).join('');
+  ].map((source) => `<source ${stringifyAttrs(source)}>`).join('');
 
   const minSrc = buildImgixUrl(src, { w: minWidth });
   const minSrcset = `${buildImgixUrl(src, { w: minWidth, dpr: 2 })} 2x`;
@@ -59,7 +59,7 @@ module.exports = (tag, { config } = {}, { lazyloadImages } = {}) => {
     'data-image-id': tag.id,
     alt,
     width: (width && height) ? minWidth : null,
-    height: (height && height) ? Math.round(height / width * minWidth) : null,
+    height: (height && height) ? Math.round((height / width) * minWidth) : null,
   };
 
   const captionElement = caption ? `<span class="caption">${caption}</span>` : '';

package/utils/embedded-media/instagram-oembed.js

@@ -11,7 +11,7 @@ const buildInstagramElement = ({
     ...(lazy && { lazy: true }),
     ...(width && { width }),
   };
-  const data = Object.keys(params).map(key => `${key}="${params[key]}"`);
+  const data = Object.keys(params).map((key) => `${key}="${params[key]}"`);
   if (data.lazy) {
     data.loading = 'lazy';
   }

package/utils/hierarchy-aliases.js

@@ -1,3 +1,3 @@
 const { getAsArray } = require('@parameter1/base-cms-object-path');
 
-module.exports = section => getAsArray(section, 'hierarchy').map(s => s.alias).reverse();
+module.exports = (section) => getAsArray(section, 'hierarchy').map((s) => s.alias).reverse();

package/utils/hierarchy-ids.js

@@ -1,3 +1,3 @@
 const { getAsArray } = require('@parameter1/base-cms-object-path');
 
-module.exports = section => getAsArray(section, 'hierarchy').map(s => s.id).reverse();
+module.exports = (section) => getAsArray(section, 'hierarchy').map((s) => s.id).reverse();

package/utils/render-ssr-component.js

@@ -9,7 +9,7 @@ module.exports = async (Component, { id, props } = {}) => {
   if (get(Component, 'props.id')) throw new Error('The provided component has an `id` prop which is incompatible with SSR rendering.');
   const app = new Vue({
     provide: { EventBus },
-    render: h => h(Component, { attrs: { id }, props }),
+    render: (h) => h(Component, { attrs: { id }, props }),
   });
   return renderer.renderToString(app);
 };

package/components/document/components/lazysizes.marko.js

@@ -1,21 +0,0 @@
-// Compiled using marko@4.20.2 - DO NOT EDIT
-"use strict";
-
-var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$2.13.0/components/document/components/lazysizes.marko",
-    marko_renderer = require("marko/src/runtime/components/renderer");
-
-function render(input, out, __component, component, state) {
-  var data = input;
-
-  out.w("<script>\n/*! lazysizes - v5.3.2 */\n!function(e){var t=function(u,D,f){\"use strict\";var k,H;if(function(){var e;var t={lazyClass:\"lazyload\",loadedClass:\"lazyloaded\",loadingClass:\"lazyloading\",preloadClass:\"lazypreload\",errorClass:\"lazyerror\",autosizesClass:\"lazyautosizes\",fastLoadedClass:\"ls-is-cached\",iframeLoadMode:0,srcAttr:\"data-src\",srcsetAttr:\"data-srcset\",sizesAttr:\"data-sizes\",minSize:40,customMedia:{},init:true,expFactor:1.5,hFac:.8,loadMode:2,loadHidden:true,ricTimeout:0,throttleDelay:125};H=u.lazySizesConfig||u.lazysizesConfig||{};for(e in t){if(!(e in H)){H[e]=t[e]}}}(),!D||!D.getElementsByClassName){return{init:function(){},cfg:H,noSupport:true}}var O=D.documentElement,i=u.HTMLPictureElement,P=\"addEventListener\",$=\"getAttribute\",q=u[P].bind(u),I=u.setTimeout,U=u.requestAnimationFrame||I,o=u.requestIdleCallback,j=/^picture$/i,r=[\"load\",\"error\",\"lazyincluded\",\"_lazyloaded\"],a={},G=Array.prototype.forEach,J=function(e,t){if(!a[t]){a[t]=new RegExp(\"(\\\\s|^)\"+t+\"(\\\\s|$)\")}return a[t].test(e[$](\"class\")||\"\")&&a[t]},K=function(e,t){if(!J(e,t)){e.setAttribute(\"class\",(e[$](\"class\")||\"\").trim()+\" \"+t)}},Q=function(e,t){var a;if(a=J(e,t)){e.setAttribute(\"class\",(e[$](\"class\")||\"\").replace(a,\" \"))}},V=function(t,a,e){var i=e?P:\"removeEventListener\";if(e){V(t,a)}r.forEach(function(e){t[i](e,a)})},X=function(e,t,a,i,r){var n=D.createEvent(\"Event\");if(!a){a={}}a.instance=k;n.initEvent(t,!i,!r);n.detail=a;e.dispatchEvent(n);return n},Y=function(e,t){var a;if(!i&&(a=u.picturefill||H.pf)){if(t&&t.src&&!e[$](\"srcset\")){e.setAttribute(\"srcset\",t.src)}a({reevaluate:true,elements:[e]})}else if(t&&t.src){e.src=t.src}},Z=function(e,t){return(getComputedStyle(e,null)||{})[t]},s=function(e,t,a){a=a||e.offsetWidth;while(a<H.minSize&&t&&!e._lazysizesWidth){a=t.offsetWidth;t=t.parentNode}return a},ee=function(){var a,i;var t=[];var r=[];var n=t;var s=function(){var e=n;n=t.length?r:t;a=true;i=false;while(e.length){e.shift()()}a=false};var e=function(e,t){if(a&&!t){e.apply(this,arguments)}else{n.push(e);if(!i){i=true;(D.hidden?I:U)(s)}}};e._lsFlush=s;return e}(),te=function(a,e){return e?function(){ee(a)}:function(){var e=this;var t=arguments;ee(function(){a.apply(e,t)})}},ae=function(e){var a;var i=0;var r=H.throttleDelay;var n=H.ricTimeout;var t=function(){a=false;i=f.now();e()};var s=o&&n>49?function(){o(t,{timeout:n});if(n!==H.ricTimeout){n=H.ricTimeout}}:te(function(){I(t)},true);return function(e){var t;if(e=e===true){n=33}if(a){return}a=true;t=r-(f.now()-i);if(t<0){t=0}if(e||t<9){s()}else{I(s,t)}}},ie=function(e){var t,a;var i=99;var r=function(){t=null;e()};var n=function(){var e=f.now()-a;if(e<i){I(n,i-e)}else{(o||r)(r)}};return function(){a=f.now();if(!t){t=I(n,i)}}},e=function(){var v,m,c,h,e;var y,z,g,p,C,b,A;var n=/^img$/i;var d=/^iframe$/i;var E=\"onscroll\"in u&&!/(gle|ing)bot/.test(navigator.userAgent);var _=0;var w=0;var M=0;var N=-1;var L=function(e){M--;if(!e||M<0||!e.target){M=0}};var x=function(e){if(A==null){A=Z(D.body,\"visibility\")==\"hidden\"}return A||!(Z(e.parentNode,\"visibility\")==\"hidden\"&&Z(e,\"visibility\")==\"hidden\")};var W=function(e,t){var a;var i=e;var r=x(e);g-=t;b+=t;p-=t;C+=t;while(r&&(i=i.offsetParent)&&i!=D.body&&i!=O){r=(Z(i,\"opacity\")||1)>0;if(r&&Z(i,\"overflow\")!=\"visible\"){a=i.getBoundingClientRect();r=C>a.left&&p<a.right&&b>a.top-1&&g<a.bottom+1}}return r};var t=function(){var e,t,a,i,r,n,s,o,l,u,f,c;var d=k.elements;if((h=H.loadMode)&&M<8&&(e=d.length)){t=0;N++;for(;t<e;t++){if(!d[t]||d[t]._lazyRace){continue}if(!E||k.prematureUnveil&&k.prematureUnveil(d[t])){R(d[t]);continue}if(!(o=d[t][$](\"data-expand\"))||!(n=o*1)){n=w}if(!u){u=!H.expand||H.expand<1?O.clientHeight>500&&O.clientWidth>500?500:370:H.expand;k._defEx=u;f=u*H.expFactor;c=H.hFac;A=null;if(w<f&&M<1&&N>2&&h>2&&!D.hidden){w=f;N=0}else if(h>1&&N>1&&M<6){w=u}else{w=_}}if(l!==n){y=innerWidth+n*c;z=innerHeight+n;s=n*-1;l=n}a=d[t].getBoundingClientRect();if((b=a.bottom)>=s&&(g=a.top)<=z&&(C=a.right)>=s*c&&(p=a.left)<=y&&(b||C||p||g)&&(H.loadHidden||x(d[t]))&&(m&&M<3&&!o&&(h<3||N<4)||W(d[t],n))){R(d[t]);r=true;if(M>9){break}}else if(!r&&m&&!i&&M<4&&N<4&&h>2&&(v[0]||H.preloadAfterLoad)&&(v[0]||!o&&(b||C||p||g||d[t][$](H.sizesAttr)!=\"auto\"))){i=v[0]||d[t]}}if(i&&!r){R(i)}}};var a=ae(t);var S=function(e){var t=e.target;if(t._lazyCache){delete t._lazyCache;return}L(e);K(t,H.loadedClass);Q(t,H.loadingClass);V(t,B);X(t,\"lazyloaded\")};var i=te(S);var B=function(e){i({target:e.target})};var T=function(e,t){var a=e.getAttribute(\"data-load-mode\")||H.iframeLoadMode;if(a==0){e.contentWindow.location.replace(t)}else if(a==1){e.src=t}};var F=function(e){var t;var a=e[$](H.srcsetAttr);if(t=H.customMedia[e[$](\"data-media\")||e[$](\"media\")]){e.setAttribute(\"media\",t)}if(a){e.setAttribute(\"srcset\",a)}};var s=te(function(t,e,a,i,r){var n,s,o,l,u,f;if(!(u=X(t,\"lazybeforeunveil\",e)).defaultPrevented){if(i){if(a){K(t,H.autosizesClass)}else{t.setAttribute(\"sizes\",i)}}s=t[$](H.srcsetAttr);n=t[$](H.srcAttr);if(r){o=t.parentNode;l=o&&j.test(o.nodeName||\"\")}f=e.firesLoad||\"src\"in t&&(s||n||l);u={target:t};K(t,H.loadingClass);if(f){clearTimeout(c);c=I(L,2500);V(t,B,true)}if(l){G.call(o.getElementsByTagName(\"source\"),F)}if(s){t.setAttribute(\"srcset\",s)}else if(n&&!l){if(d.test(t.nodeName)){T(t,n)}else{t.src=n}}if(r&&(s||l)){Y(t,{src:n})}}if(t._lazyRace){delete t._lazyRace}Q(t,H.lazyClass);ee(function(){var e=t.complete&&t.naturalWidth>1;if(!f||e){if(e){K(t,H.fastLoadedClass)}S(u);t._lazyCache=true;I(function(){if(\"_lazyCache\"in t){delete t._lazyCache}},9)}if(t.loading==\"lazy\"){M--}},true)});var R=function(e){if(e._lazyRace){return}var t;var a=n.test(e.nodeName);var i=a&&(e[$](H.sizesAttr)||e[$](\"sizes\"));var r=i==\"auto\";if((r||!m)&&a&&(e[$](\"src\")||e.srcset)&&!e.complete&&!J(e,H.errorClass)&&J(e,H.lazyClass)){return}t=X(e,\"lazyunveilread\").detail;if(r){re.updateElem(e,true,e.offsetWidth)}e._lazyRace=true;M++;s(e,t,r,i,a)};var r=ie(function(){H.loadMode=3;a()});var o=function(){if(H.loadMode==3){H.loadMode=2}r()};var l=function(){if(m){return}if(f.now()-e<999){I(l,999);return}m=true;H.loadMode=3;a();q(\"scroll\",o,true)};return{_:function(){e=f.now();k.elements=D.getElementsByClassName(H.lazyClass);v=D.getElementsByClassName(H.lazyClass+\" \"+H.preloadClass);q(\"scroll\",a,true);q(\"resize\",a,true);q(\"pageshow\",function(e){if(e.persisted){var t=D.querySelectorAll(\".\"+H.loadingClass);if(t.length&&t.forEach){U(function(){t.forEach(function(e){if(e.complete){R(e)}})})}}});if(u.MutationObserver){new MutationObserver(a).observe(O,{childList:true,subtree:true,attributes:true})}else{O[P](\"DOMNodeInserted\",a,true);O[P](\"DOMAttrModified\",a,true);setInterval(a,999)}q(\"hashchange\",a,true);[\"focus\",\"mouseover\",\"click\",\"load\",\"transitionend\",\"animationend\"].forEach(function(e){D[P](e,a,true)});if(/d$|^c/.test(D.readyState)){l()}else{q(\"load\",l);D[P](\"DOMContentLoaded\",a);I(l,2e4)}if(k.elements.length){t();ee._lsFlush()}else{a()}},checkElems:a,unveil:R,_aLSL:o}}(),re=function(){var a;var n=te(function(e,t,a,i){var r,n,s;e._lazysizesWidth=i;i+=\"px\";e.setAttribute(\"sizes\",i);if(j.test(t.nodeName||\"\")){r=t.getElementsByTagName(\"source\");for(n=0,s=r.length;n<s;n++){r[n].setAttribute(\"sizes\",i)}}if(!a.detail.dataAttr){Y(e,a.detail)}});var i=function(e,t,a){var i;var r=e.parentNode;if(r){a=s(e,r,a);i=X(e,\"lazybeforesizes\",{width:a,dataAttr:!!t});if(!i.defaultPrevented){a=i.detail.width;if(a&&a!==e._lazysizesWidth){n(e,r,i,a)}}}};var e=function(){var e;var t=a.length;if(t){e=0;for(;e<t;e++){i(a[e])}}};var t=ie(e);return{_:function(){a=D.getElementsByClassName(H.autosizesClass);q(\"resize\",t)},checkElems:t,updateElem:i}}(),t=function(){if(!t.i&&D.getElementsByClassName){t.i=true;re._();e._()}};return I(function(){H.init&&t()}),k={cfg:H,autoSizer:re,loader:e,init:t,uP:Y,aC:K,rC:Q,hC:J,fire:X,gW:s,rAF:ee}}(e,e.document,Date);e.lazySizes=t,\"object\"==typeof module&&module.exports&&(module.exports=t)}(\"undefined\"!=typeof window?window:{});\n</script>");
-}
-
-marko_template._ = marko_renderer(render, {
-    ___implicit: true,
-    ___type: marko_componentType
-  });
-
-marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$2.13.0/components/document/components/lazysizes.marko"
-  };

package/node-require.js

@@ -1,6 +0,0 @@
-/* eslint-disable global-require */
-if (process.env.BASE_CMS_MARKO_NODE_REQUIRE) {
-  require('@parameter1/base-cms-marko-node-require');
-} else {
-  require('marko/node-require');
-}

package/refactor-notes.md

@@ -1,80 +0,0 @@
-# Marko Web Refactor
-
-## Punch List
-- [x] Content: Whitepapers (forms, downloads, etc)
-- [x] Contact Us Page
-- [x] Search: Google
-- [x] Subscribe
-- [x] Reveal Ad
-- [x] Video Play Overlay
-- [x] NativeX Plugin
-- [ ] Content: Media Galleries (really only Bizbash)
-- [ ] Search: Bing (EE and Bizbash only)
-- [ ] IdentityX Plugin (OGJ only)
-- [ ] Inquiry Plugin (Bizbash only)
-- [ ] Contact Us Submissions - move to site package for now
-- [ ] Mailer Service for Contact Us and Inquiry
-- [x] Review unused theme CSS
-- [ ] Verify page model resolver speed once converted
-
-## Core
-- Page loaders should not use routes
-- Document / page wrappers should support all types
-- Decouple page context components
-- Investigate CMS element components
-  - Decouple BEM classes?
-  - Decouple Imigix?
-
-## Common
-- Remove direct, third-party dependencies
-  - NativeX
-  - GTM
-  - GAM
-  - Reskin
-- Re-factor items
-- Make `item` vs `node` vars consistent
-- Create generic query loaders
-- Create generic layouts (with customizable items)
-- Create generic load more handlers
-
-
-## To do
-- All instances of `<cms-browser-component>` need to be replaced with `<marko-web-browser-component>`
-- Rename `<cms-document>` to `<marko-web-document>`
-- Placeholder ads were removed.
-- The basecmsrc file will need to update to include additional browser packages
-- All instances of `<cms-query-*>` need to be changed to `<marko-web-query-*>`
-- Add `images.fallback` to core config on all sites
-- Change `<cms-page-container>` to `<marko-web-page-container>`
-- Change `<cms-page-rel-canonical>` to `<marko-web-page-rel-canonical>`, `pathname` became `path`
-- Change `<cms-page-metadata>` to `<mark-web-page-metadata>`
-```marko
-<marko-web-page-metadata-content
-  for="content"
-  type=content.type
-  title=get(content, "metadata.title")
-  description=get(content, "metadata.description")
-  canonical-path=content.canonicalPath
-  image-src=get(content, "metadata.image.src")
-  published-date=get(content, "metadata.publishedDate")
-  updated-date=get(content, "metadata.updatedDate")
-  expires-date=get(content, "metadata.expiresDate")
-/>
-
-<marko-web-page-metadata
-  title=get(section, "metadata.title")
-  description=get(section, "metadata.description")
-  canonical-path=section.canonicalPath
-/>
-```
-- Change `<cms-page-title>` to `<marko-web-page-title>`
-- Change `<cms-page-description>` to `<marko-web-page-description>`, `content` is now `value`
-- Sticky Leaderbaord
-  - the `refreshable` prop was removed. anything that should not refresh so set `refresh-interval` to 0
-  - name changed to `<marko-web-gam-fixed-ad-bottom>`
-  - update sass vars to match theme
-- Update `<endeavor-item>` and `<endeavor-item-list>` to `<marko-web-node>` and `<marko-web-node-list>`
-- Update `&__contents` to `&__nodes` for `<marko-web-node-list>`, `&__item` to `&__node`
-- Need to add `/__load-more` to no-follow
-- Remove `load-more` routes from sites
-- Remove the `routing-utils` package from endeavor and use the `json-error-handler` from `@parameter1/base-cms-marko-web/express/json-error-handler`