@parameter1/base-cms-marko-web 4.6.2 → 4.7.0

package/components/page/layouts/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.6.2/components/page/layouts/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.7.0/components/page/layouts/content.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_content_page_metadata_template = require("../metadata/content.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.6.2/components/page/layouts/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.7.0/components/page/layouts/content.marko",
     tags: [
       "../metadata/content.marko"
     ]

package/components/page/layouts/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.6.2/components/page/layouts/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.7.0/components/page/layouts/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_default_page_metadata_template = require("../metadata/default.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -54,7 +54,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.6.2/components/page/layouts/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.7.0/components/page/layouts/default.marko",
     tags: [
       "../metadata/default.marko"
     ]

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

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

package/eslint.log

@@ -0,0 +1,3 @@
+yarn run v1.22.10
+$ eslint --ext .js --ext .vue --max-warnings 5 ./
+Done in 3.75s.

package/express/apollo.js

@@ -1,5 +1,6 @@
 const { apolloClient } = require('@parameter1/base-cms-express-apollo');
 const { parseBooleanHeader } = require('@parameter1/base-cms-utils');
+const pkg = require('../package.json');
 
 module.exports = (app, uri, config = {}) => {
   /**
@@ -13,7 +14,17 @@ module.exports = (app, uri, config = {}) => {
       if (!value) return o; // do nothing if no cookie or query param is set.
       // otherwise parse the value and set the GraphQL header to match.
       return { ...o, [key]: parseBooleanHeader(value) };
-    }, {});
+    }, {
+      'x-marko-web-request': JSON.stringify({
+        id: req.id,
+        env: process.env.NODE_ENV || 'unknonwn',
+        ua: req.get('user-agent'),
+        origin: `${req.protocol}://${req.get('host')}`,
+        path: req.path,
+        query: req.query,
+      }),
+      'user-agent': `marko-web-express-apollo/${pkg.version} via node-fetch/1.0`,
+    });
     return { headers };
   };
   app.use(apolloClient(uri, config, config.link, contextFn));

package/express/index.js

@@ -5,6 +5,7 @@ const cookieParser = require('cookie-parser');
 const express = require('express');
 const path = require('path');
 const helmet = require('helmet');
+const { nanoid } = require('nanoid');
 const apollo = require('./apollo');
 const graphqlProxy = require('./graphql-proxy');
 const embeddedMedia = require('./embedded-media');
@@ -34,6 +35,12 @@ module.exports = (config = {}) => {
   const app = express();
   const serverDir = path.resolve(rootDir, 'server');
 
+  app.use((req, res, next) => {
+    // set unique request id.
+    req.id = nanoid();
+    next();
+  });
+
   // Add async block error handler.
   app.locals.onAsyncBlockError = config.onAsyncBlockError;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.6.2",
+  "version": "4.7.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -49,6 +49,7 @@
     "http-errors": "^1.8.1",
     "jquery": "^3.6.3",
     "marko": "~4.20.0",
+    "nanoid": "^3.3.4",
     "node-fetch": "^2.6.9",
     "vue": "^2.7.14",
     "vue-server-renderer": "^2.7.14"
@@ -59,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "58cd82b2f1013c28a7213b7fa3b17603f56478ee"
+  "gitHead": "5cb2cc623d2960ec56f41d5fa608ab3cf01dd8e7"
 }