Merge branch 'master' into allow-crawling

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.12.5",
+  "version": "3.13.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

packages/global/components/document.marko

@@ -1,6 +1,7 @@
 import createOmedaIdentityBuilder from "@parameter1/base-cms-marko-web-p1-events/utils/create-omeda-identity-builder";
 import { defaultValue } from "@parameter1/base-cms-marko-web/utils";
 import { getAsObject } from "@parameter1/base-cms-object-path";
+import getCookieId from "@parameter1/base-cms-marko-web-omeda-identity-x/utils/get-cookie-id";
 
 $ const {
   site,
@@ -11,6 +12,8 @@ $ const {
   omedaConfig
 } = out.global;
 
+$ const { cookies } = req;
+
 $ const gamDefer = defaultValue(req.query.gamDefer, "ready");
 $ const gtmDefer = defaultValue(req.query.gtmDefer, "load");
 $ const olyticsDefer = defaultValue(req.query.olyticsDefer, "load");
@@ -72,6 +75,23 @@ $ const buttonLabels = { continue: continueLabel };
 
     <${input.head} />
 
+    <marko-web-identity-x-context|{ hasUser, user }|>
+      <if(hasUser && user.id)>
+        <marko-web-gtm-push data={ user_id: user.id } />
+      </if>
+    </marko-web-identity-x-context>
+
+    <!-- Send Encrypted Omeda Id to GTM -->
+    $ const olyEncId = cookies.oly_enc_id ? getCookieId(cookies.oly_enc_id, 'enc') : undefined;
+    <if(olyEncId)>
+      <marko-web-gtm-push data={ oly_enc_id: olyEncId } />
+    </if>
+    <!-- Send Anonomouse Omeda Id to GTM -->
+    $ const olyAnonId = cookies.oly_anon_id ? getCookieId(cookies.oly_anon_id, 'anon') : undefined;
+    <if(olyAnonId)>
+      <marko-web-gtm-push data={ oly_anon_id: olyAnonId } />
+    </if>
+
     <!-- start gtm -->
     <marko-web-gtm-start />
 

packages/global/config/native-x.js

@@ -1,6 +1,6 @@
 const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
 
 module.exports = ({
-  uri = 'https://pmmi.native-x.parameter1.com',
-  enabled = false,
-} = {}) => new NativeXConfiguration(uri, { enabled });
+  uri = 'https://delivery.mindfulcms.com/pmmi/default/compat/native-website',
+  enabled = true,
+} = {}) => new NativeXConfiguration(uri, { enabled, tenantKey: 'pmmi' });

packages/global/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/package-global",
-  "version": "3.12.1",
+  "version": "3.13.1",
   "author": "Brian Miller <[email protected]>",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/packages/global",
   "license": "MIT",
@@ -16,29 +16,29 @@
     "@parameter1/base-cms-dayjs": "^4.5.12",
     "@parameter1/base-cms-image": "^4.6.0",
     "@parameter1/base-cms-inflector": "^4.5.12",
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
     "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.5.12",
     "@parameter1/base-cms-marko-web-gam": "^4.5.12",
     "@parameter1/base-cms-marko-web-gtm": "^4.17.1",
     "@parameter1/base-cms-marko-web-html-sitemap": "^4.5.12",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
-    "@parameter1/base-cms-marko-web-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-inquiry": "^4.5.12",
-    "@parameter1/base-cms-marko-web-native-x": "^4.26.0",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
+    "@parameter1/base-cms-marko-web-identity-x": "^4.36.13",
+    "@parameter1/base-cms-marko-web-inquiry": "^4.27.0",
+    "@parameter1/base-cms-marko-web-native-x": "^4.38.0",
     "@parameter1/base-cms-marko-web-omeda": "^4.23.1",
-    "@parameter1/base-cms-marko-web-omeda-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-p1-events": "^4.25.1",
-    "@parameter1/base-cms-marko-web-search": "^4.26.0",
-    "@parameter1/base-cms-marko-web-social-sharing": "^4.11.1",
-    "@parameter1/base-cms-marko-web-theme-monorail": "^4.26.0",
-    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.17.1",
+    "@parameter1/base-cms-marko-web-omeda-identity-x": "^4.37.0",
+    "@parameter1/base-cms-marko-web-p1-events": "^4.38.0",
+    "@parameter1/base-cms-marko-web-search": "^4.36.8",
+    "@parameter1/base-cms-marko-web-social-sharing": "^4.36.8",
+    "@parameter1/base-cms-marko-web-theme-monorail": "^4.38.0",
+    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.36.0",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
     "@parameter1/base-cms-web-cli": "^4.18.3",
-    "@parameter1/base-cms-web-common": "^4.5.12",
+    "@parameter1/base-cms-web-common": "^4.36.0",
     "@parameter1/omeda-graphql-client-express": "^0.4.2",
-    "@pmmi-media-group/package-theme-monorail-leaders": "^3.10.0",
+    "@pmmi-media-group/package-theme-monorail-leaders": "^3.13.0",
     "body-parser": "^1.19.0",
     "cheerio": "^1.0.0-rc.10",
     "express": "^4.17.1",

packages/global/templates/content/native-x-story.marko

@@ -8,6 +8,7 @@ $ const { primarySection } = content;
 <theme-default-page title=story.title description=story.teaser>
   <@head>
     <marko-web-native-x-gtm-init />
+    <marko-web-p1-events-track-native-story story=story />
   </@head>
   <@page>
     <marko-web-native-x-story-track-init story=story />

packages/theme-monorail-leaders/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/package-theme-monorail-leaders",
-  "version": "3.10.0",
+  "version": "3.13.0",
   "description": "Marko Wrapper & Components for the Leaders Program",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/packages/theme-monorail-leaders",
   "author": "Brian Miller<[email protected]>",
@@ -14,12 +14,12 @@
     "test": "yarn lint && yarn compile --no-clean"
   },
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
-    "@parameter1/base-cms-web-common": "^4.5.12",
+    "@parameter1/base-cms-web-common": "^4.36.0",
     "graphql": "^14.7.0",
     "graphql-tag": "^2.12.5",
     "object-path": "^0.11.8",

sites/cpgnext.com/config/native-x.js

@@ -1,6 +1,6 @@
-const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
+const configureNativeX = require('@pmmi-media-group/package-global/config/native-x');
 
-const config = new NativeXConfiguration('https://pmmi.native-x.parameter1.com');
+const config = configureNativeX();
 
 config
   .setAliasPlacements('default', [

sites/cpgnext.com/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/cpgnext.com",
-  "version": "3.12.5",
+  "version": "3.13.1",
   "author": "Jessica Stenzel <[email protected]>",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/sites/cpgnext.com",
   "license": "MIT",
@@ -31,24 +31,24 @@
     "win32"
   ],
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
     "@parameter1/base-cms-marko-web-gam": "^4.5.12",
     "@parameter1/base-cms-marko-web-gcse": "^4.5.12",
     "@parameter1/base-cms-marko-web-gtm": "^4.17.1",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
-    "@parameter1/base-cms-marko-web-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-leaders": "^4.16.2",
-    "@parameter1/base-cms-marko-web-native-x": "^4.26.0",
-    "@parameter1/base-cms-marko-web-p1-events": "^4.25.1",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
+    "@parameter1/base-cms-marko-web-identity-x": "^4.36.13",
+    "@parameter1/base-cms-marko-web-leaders": "^4.36.8",
+    "@parameter1/base-cms-marko-web-native-x": "^4.38.0",
+    "@parameter1/base-cms-marko-web-p1-events": "^4.38.0",
     "@parameter1/base-cms-marko-web-reveal-ad": "^4.5.12",
-    "@parameter1/base-cms-marko-web-theme-monorail": "^4.26.0",
-    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.17.1",
+    "@parameter1/base-cms-marko-web-theme-monorail": "^4.38.0",
+    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.36.0",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
     "@parameter1/base-cms-web-cli": "^4.18.3",
-    "@pmmi-media-group/package-global": "^3.12.1",
-    "@pmmi-media-group/package-theme-monorail-leaders": "^3.10.0",
+    "@pmmi-media-group/package-global": "^3.13.1",
+    "@pmmi-media-group/package-theme-monorail-leaders": "^3.13.0",
     "graphql": "^14.5.4",
     "graphql-tag": "^2.10.1"
   }

sites/healthcarepackaging.com/config/native-x.js

@@ -1,6 +1,6 @@
-const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
+const configureNativeX = require('@pmmi-media-group/package-global/config/native-x');
 
-const config = new NativeXConfiguration('https://pmmi.native-x.parameter1.com');
+const config = configureNativeX();
 
 config
   .setAliasPlacements('default', [

sites/healthcarepackaging.com/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/healthcarepackaging.com",
-  "version": "3.12.5",
+  "version": "3.13.1",
   "author": "Brian Miller <[email protected]>",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/sites/healthcarepackaging.com",
   "license": "MIT",
@@ -31,24 +31,24 @@
     "win32"
   ],
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
     "@parameter1/base-cms-marko-web-gam": "^4.5.12",
     "@parameter1/base-cms-marko-web-gcse": "^4.5.12",
     "@parameter1/base-cms-marko-web-gtm": "^4.17.1",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
-    "@parameter1/base-cms-marko-web-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-leaders": "^4.16.2",
-    "@parameter1/base-cms-marko-web-native-x": "^4.26.0",
-    "@parameter1/base-cms-marko-web-p1-events": "^4.25.1",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
+    "@parameter1/base-cms-marko-web-identity-x": "^4.36.13",
+    "@parameter1/base-cms-marko-web-leaders": "^4.36.8",
+    "@parameter1/base-cms-marko-web-native-x": "^4.38.0",
+    "@parameter1/base-cms-marko-web-p1-events": "^4.38.0",
     "@parameter1/base-cms-marko-web-reveal-ad": "^4.5.12",
-    "@parameter1/base-cms-marko-web-theme-monorail": "^4.26.0",
-    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.17.1",
+    "@parameter1/base-cms-marko-web-theme-monorail": "^4.38.0",
+    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.36.0",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
     "@parameter1/base-cms-web-cli": "^4.18.3",
-    "@pmmi-media-group/package-global": "^3.12.1",
-    "@pmmi-media-group/package-theme-monorail-leaders": "^3.10.0",
+    "@pmmi-media-group/package-global": "^3.13.1",
+    "@pmmi-media-group/package-theme-monorail-leaders": "^3.13.0",
     "graphql": "^14.5.4",
     "graphql-tag": "^2.10.1"
   }

sites/mundopmmi.com/config/native-x.js

@@ -1,6 +1,6 @@
-const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
+const configureNativeX = require('@pmmi-media-group/package-global/config/native-x');
 
-const config = new NativeXConfiguration('https://pmmi.native-x.parameter1.com');
+const config = configureNativeX();
 
 config
   .setAliasPlacements('default', [

sites/mundopmmi.com/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/mundopmmi.com",
-  "version": "3.12.1",
+  "version": "3.13.1",
   "author": "Brandon Krigbaum <[email protected]>",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/sites/mundopmmi.com",
   "license": "MIT",
@@ -31,24 +31,24 @@
     "win32"
   ],
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
     "@parameter1/base-cms-marko-web-gam": "^4.5.12",
     "@parameter1/base-cms-marko-web-gcse": "^4.5.12",
     "@parameter1/base-cms-marko-web-gtm": "^4.17.1",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
-    "@parameter1/base-cms-marko-web-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-leaders": "^4.16.2",
-    "@parameter1/base-cms-marko-web-native-x": "^4.26.0",
-    "@parameter1/base-cms-marko-web-p1-events": "^4.25.1",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
+    "@parameter1/base-cms-marko-web-identity-x": "^4.36.13",
+    "@parameter1/base-cms-marko-web-leaders": "^4.36.8",
+    "@parameter1/base-cms-marko-web-native-x": "^4.38.0",
+    "@parameter1/base-cms-marko-web-p1-events": "^4.38.0",
     "@parameter1/base-cms-marko-web-reveal-ad": "^4.5.12",
-    "@parameter1/base-cms-marko-web-theme-monorail": "^4.26.0",
-    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.17.1",
+    "@parameter1/base-cms-marko-web-theme-monorail": "^4.38.0",
+    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.36.0",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
     "@parameter1/base-cms-web-cli": "^4.18.3",
-    "@pmmi-media-group/package-global": "^3.12.1",
-    "@pmmi-media-group/package-theme-monorail-leaders": "^3.10.0",
+    "@pmmi-media-group/package-global": "^3.13.1",
+    "@pmmi-media-group/package-theme-monorail-leaders": "^3.13.0",
     "graphql": "^14.5.4",
     "graphql-tag": "^2.10.1"
   }

sites/oemmagazine.org/config/native-x.js

@@ -1,6 +1,6 @@
-const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
+const configureNativeX = require('@pmmi-media-group/package-global/config/native-x');
 
-const config = new NativeXConfiguration('https://pmmi.native-x.parameter1.com');
+const config = configureNativeX();
 
 config
   .setAliasPlacements('default', [

sites/oemmagazine.org/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmmi-media-group/oemmagazine.org",
-  "version": "3.12.5",
+  "version": "3.13.1",
   "author": "Brian Miller <[email protected]>",
   "repository": "https://github.com/parameter1/pmmi-media-group-websites/tree/master/sites/oemmagazine.org",
   "license": "MIT",
@@ -31,24 +31,24 @@
     "win32"
   ],
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.9.0",
-    "@parameter1/base-cms-marko-web": "^4.22.3",
+    "@parameter1/base-cms-marko-core": "^4.36.0",
+    "@parameter1/base-cms-marko-web": "^4.36.13",
     "@parameter1/base-cms-marko-web-gam": "^4.5.12",
     "@parameter1/base-cms-marko-web-gcse": "^4.5.12",
     "@parameter1/base-cms-marko-web-gtm": "^4.17.1",
-    "@parameter1/base-cms-marko-web-icons": "^4.16.2",
-    "@parameter1/base-cms-marko-web-identity-x": "^4.24.0",
-    "@parameter1/base-cms-marko-web-leaders": "^4.16.2",
-    "@parameter1/base-cms-marko-web-native-x": "^4.26.0",
-    "@parameter1/base-cms-marko-web-p1-events": "^4.25.1",
+    "@parameter1/base-cms-marko-web-icons": "^4.36.8",
+    "@parameter1/base-cms-marko-web-identity-x": "^4.36.13",
+    "@parameter1/base-cms-marko-web-leaders": "^4.36.8",
+    "@parameter1/base-cms-marko-web-native-x": "^4.38.0",
+    "@parameter1/base-cms-marko-web-p1-events": "^4.38.0",
     "@parameter1/base-cms-marko-web-reveal-ad": "^4.5.12",
-    "@parameter1/base-cms-marko-web-theme-monorail": "^4.26.0",
-    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.17.1",
+    "@parameter1/base-cms-marko-web-theme-monorail": "^4.38.0",
+    "@parameter1/base-cms-marko-web-theme-monorail-magazine": "^4.36.0",
     "@parameter1/base-cms-object-path": "^4.5.12",
     "@parameter1/base-cms-utils": "^4.5.12",
     "@parameter1/base-cms-web-cli": "^4.18.3",
-    "@pmmi-media-group/package-global": "^3.12.1",
-    "@pmmi-media-group/package-theme-monorail-leaders": "^3.10.0",
+    "@pmmi-media-group/package-global": "^3.13.1",
+    "@pmmi-media-group/package-theme-monorail-leaders": "^3.13.0",
     "graphql": "^14.5.4",
     "graphql-tag": "^2.10.1"
   }

sites/packworld.com/config/native-x.js

@@ -1,6 +1,6 @@
-const NativeXConfiguration = require('@parameter1/base-cms-marko-web-native-x/config');
+const configureNativeX = require('@pmmi-media-group/package-global/config/native-x');
 
-const config = new NativeXConfiguration('https://pmmi.native-x.parameter1.com');
+const config = configureNativeX();
 
 config
   .setAliasPlacements('default', [