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

package/components/page/metadata/content.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.1/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/content.marko",
     marko_component = require("./content.marko"),
     marko_renderer = require("marko/src/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$3.17.1/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.17.1/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/default.marko",
     marko_renderer = require("marko/src/runtime/components/renderer"),
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/src/runtime/helpers/load-tag"),
@@ -22,7 +22,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$3.17.1/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.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/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$3.8.0/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/dynamic-page.marko",
     marko_component = require("./dynamic-page.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) {
@@ -76,7 +75,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$3.8.0/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.0.0-beta.0/components/page/metadata/dynamic-page.marko",
     component: "./dynamic-page.marko",
     tags: [
       "./components/common.marko",

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$3.8.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$3.8.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$3.8.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$3.8.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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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,51 +1,60 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "3.17.3",
+  "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.9.0",
-    "@parameter1/base-cms-apollo-ssr": "^3.0.0",
-    "@parameter1/base-cms-dayjs": "^3.17.3",
-    "@parameter1/base-cms-embedded-media": "^3.13.5",
-    "@parameter1/base-cms-express-apollo": "^3.0.0",
-    "@parameter1/base-cms-graphql-fragment-types": "^3.0.0",
-    "@parameter1/base-cms-image": "^3.13.5",
-    "@parameter1/base-cms-inflector": "^3.0.0",
-    "@parameter1/base-cms-marko-node-require": "^3.0.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": "^3.3.1",
-    "cheerio": "^1.0.0-rc.10",
-    "cookie-parser": "^1.4.5",
-    "express": "^4.17.1",
-    "express-http-proxy": "^1.6.2",
+    "@godaddy/terminus": "^4.11.2",
+    "@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",
+    "express-http-proxy": "^1.6.3",
     "graphql": "^14.7.0",
-    "graphql-tag": "^2.12.5",
+    "graphql-tag": "^2.12.6",
     "helmet": "^3.23.3",
-    "http-errors": "^1.8.0",
-    "jquery": "^3.6.0",
+    "http-errors": "^1.8.1",
+    "jquery": "^3.6.3",
     "marko": "~4.20.0",
-    "vue": "^2.6.14",
-    "vue-server-renderer": "^2.6.14",
-    "whatwg-fetch": "^3.6.1"
+    "vue": "^2.7.14",
+    "vue-server-renderer": "^2.7.14"
   },
   "peerDependencies": {
-    "@parameter1/base-cms-marko-core": "^2.0.0"
+    "@parameter1/base-cms-marko-core": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "238a0ee634681aded2365a8f30e7383004f3fb93"
+  "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);
 };