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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.2",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -23,20 +23,20 @@
   },
   "dependencies": {
     "@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",
+    "@parameter1/base-cms-apollo-ssr": "^4.0.2",
+    "@parameter1/base-cms-dayjs": "^4.0.2",
+    "@parameter1/base-cms-embedded-media": "^4.0.2",
+    "@parameter1/base-cms-express-apollo": "^4.0.2",
+    "@parameter1/base-cms-graphql-fragment-types": "^4.0.2",
+    "@parameter1/base-cms-image": "^4.0.2",
+    "@parameter1/base-cms-inflector": "^4.0.2",
+    "@parameter1/base-cms-marko-express": "^4.0.2",
+    "@parameter1/base-cms-marko-node-require": "^4.0.2",
+    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.0.2",
+    "@parameter1/base-cms-object-path": "^4.0.2",
+    "@parameter1/base-cms-tenant-context": "^4.0.2",
+    "@parameter1/base-cms-utils": "^4.0.2",
+    "@parameter1/base-cms-web-common": "^4.0.2",
     "cheerio": "^1.0.0-rc.12",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6b1c5270b9b3031b27d36ec109348efbd80f7933"
+  "gitHead": "68e4f2db27a0deb0f4b33c57d3dc86978f53ee54"
 }

package/express/marko.js

@@ -1,36 +0,0 @@
-/* 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;
-};