@parameter1/base-cms-marko-web 3.3.1 → 3.7.2

package/middleware/disabled-features.js

@@ -0,0 +1,15 @@
+module.exports = () => ((req, res, next) => {
+  const { disabledFeatures } = req.cookies;
+  res.locals.disabledFeatures = new Set();
+  if (disabledFeatures) {
+    try {
+      disabledFeatures.split(',').forEach((flag) => {
+        const trimmed = flag.trim();
+        if (trimmed) res.locals.disabledFeatures.add(trimmed);
+      });
+    } catch (e) {
+      next();
+    }
+  }
+  next();
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "3.3.1",
+  "version": "3.7.2",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a9bdf4adb57d161694e527e3818e149dc6ed95b0"
+  "gitHead": "444cbefe6e939cdaa4dc7845e550b5df726253e0"
 }

package/start-server.js

@@ -6,6 +6,7 @@ const { isFunction: isFn, parseBooleanHeader } = require('@parameter1/base-cms-u
 const errorHandlers = require('./express/error-handlers');
 const express = require('./express');
 const loadMore = require('./express/load-more');
+const disabledFeatures = require('./middleware/disabled-features');
 
 const { env } = process;
 if (!process.env.LIVERELOAD_PORT) process.env.LIVERELOAD_PORT = 4010;
@@ -90,6 +91,8 @@ module.exports = async ({
   // Register load more after onStart to ensure userland middleware is available.
   loadMore(app);
 
+  app.use(disabledFeatures());
+
   // Load website routes.
   if (!isFn(routes)) throw new Error('A routes function is required.');
   routes(app);

package/utils/embedded-media/image.js

@@ -6,6 +6,13 @@ const stringifyAttrs = attrs => Object.keys(attrs).reduce((arr, key) => {
   return arr;
 }, []).join(' ');
 
+const buildWrapperClass = ({ caption, credit }) => {
+  const classes = [];
+  if (caption) classes.push('image-with-caption');
+  if (credit) classes.push('image-with-credit');
+  return classes.join(' ');
+};
+
 module.exports = (tag, { config } = {}, { lazyloadImages } = {}) => {
   const lazyload = lazyloadImages == null ? config.lazyloadImages() : lazyloadImages;
   const src = tag.get('src');
@@ -17,10 +24,13 @@ module.exports = (tag, { config } = {}, { lazyloadImages } = {}) => {
   const width = tag.get('width');
   const height = tag.get('height');
 
+  const wrapperClass = buildWrapperClass({ caption, credit });
+
   const attrs = {
     'data-embed-type': tag.type,
     'data-embed-id': tag.id,
     'data-embed-align': align,
+    ...(wrapperClass && { class: wrapperClass }),
   };
 
   const minWidth = 400;