@mindful-web/marko-web-native-x 1.86.0 → 1.92.2

package/README.md

@@ -44,6 +44,12 @@ The render component requires the following properties:
 - `when`: A boolean. When truthy, the content node will be replaced by the ad (if available)
 - `sectionName`: Used by the conversion utilities. Because ads do not have website context, indicate the name of the primary section of the "content" (the ad, once replaced)
 
+#### Visitor location headers
+
+Placement requests are made server-to-server during the SSR render, so the ad delivery API cannot determine the visitor's location on its own. To support geographically targeted native line items, the Cloudflare visitor location headers on the inbound request (`cf-ipcountry`, `cf-region-code`, etc.) are automatically forwarded to the delivery API as `x-` prefixed headers (`x-country-code`, `x-region-code`, etc.) by [create-headers.js](utils/create-headers.js), using the shared `getVisitorLocationHeaders` helper from `@mindful-web/utils`. This is the same helper and header contract used for website banner ads by `@mindful-web/marko-web-mindful-ads`.
+
+No action is needed in consuming apps, but the site's Cloudflare zone must have the ["Add visitor location headers" managed transform](https://developers.cloudflare.com/rules/transform/managed-transforms/reference/#add-visitor-location-headers) enabled. When the headers are absent, geo-targeted line items will not serve; line items without geo targeting are unaffected.
+
 #### Aliases
 
 When registering an placement, you must specify an alias. If you are not using any alias-aware placements, you should use the value `default` for the alias field. This is the most common!

package/components/fetch-elements.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/fetch-elements.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/fetch-elements.marko",
     marko_component = require("./fetch-elements.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
@@ -50,7 +50,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/fetch-elements.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/fetch-elements.marko",
     component: "./fetch-elements.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/gtm-init.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/gtm-init.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/gtm-init.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/gtm-init.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/gtm-init.marko",
     tags: [
       "@mindful-web/marko-web-gtm/components/init.marko",
       "@mindful-web/marko-web-gtm/components/noscript.marko"

package/components/init.marko

@@ -1,10 +1,26 @@
+import isV2Site from "@mindful-web/marko-web-p1-events/utils/is-v2-site";
 import { warn } from "@mindful-web/utils";
 
 $ const { uri, enabled, on } = input;
 $ const src = "https://cdn.parameter1.com/native-x/v1.2.0/lib.min.js";
 
+// ⛔ SUPPRESSED ON v2 SITES. The v2 p1-events library tracks native ads itself (its
+// `mindfulNativeAds` plugin reads the same server-rendered `data-mindful-fields` markup
+// fortnight-js does), and BOTH emit `Native Website Creative` / `Native Website Ad Unit` -- so
+// loading both DOUBLE-COUNTS every native ad event.
+//
+// The gate is read here rather than passed in by each site's `document.marko` so that setting
+// `p1events.v2` flips the config swap, this, and the banner ads together. A per-document
+// `enabled=… && !v2` would let the three drift apart, and a partial migration miscounts in a
+// specific direction: this still loading on v2 double-counts, while removing it before the v2
+// config lands loses native ads entirely.
+//
+// ⚠️ NOT COVERED: `pmmi-prosource` calls `fortnight('init', …)` directly from `app/app.html`,
+// bypassing this component. That site must be edited by hand when it migrates.
+$ const v2 = isV2Site(out.global.site);
+
 <if(uri)>
-  <if(enabled)>
+  <if(enabled && !v2)>
     <if(on)>
       <marko-web-deferred-script-loader-register
         name="fortnight"

package/components/init.marko.js

@@ -2,8 +2,10 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/init.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/init.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
+    module_isV2Site = require("@mindful-web/marko-web-p1-events/utils/is-v2-site"),
+    isV2Site = module_isV2Site.default || module_isV2Site,
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
     warn = module_utils_module.warn,
@@ -22,8 +24,10 @@ function render(input, out, __component, component, state) {
 
   const src = "https://cdn.parameter1.com/native-x/v1.2.0/lib.min.js";
 
+  const v2 = isV2Site(out.global.site);
+
   if (uri) {
-    if (enabled) {
+    if (enabled && (!v2)) {
       if (on) {
         marko_web_deferred_script_loader_register_tag({
             name: "fortnight",
@@ -56,7 +60,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/init.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/init.marko",
     tags: [
       "@mindful-web/marko-web-deferred-script-loader/components/register.marko"
     ]

package/components/publisher-stories.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/publisher-stories.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/publisher-stories.marko",
     marko_component = require("./publisher-stories.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultFragment = require("../apollo/graphql/fragments/publisher-stories"),
@@ -88,7 +88,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/publisher-stories.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/publisher-stories.marko",
     component: "./publisher-stories.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/render.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/render.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/render.marko",
     marko_component = require("./render.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
@@ -67,7 +67,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/render.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/render.marko",
     component: "./render.marko",
     tags: [
       "./retrieve.marko"

package/components/retrieve.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/retrieve.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/retrieve.marko",
     marko_component = require("./retrieve.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/marko-web/utils"),
@@ -86,7 +86,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/retrieve.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/retrieve.marko",
     component: "./retrieve.marko",
     tags: [
       "./fetch-elements.marko"

package/components/story/advertiser-related-stories.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/advertiser-related-stories.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/advertiser-related-stories.marko",
     marko_component = require("./advertiser-related-stories.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultFragment = require("../../apollo/graphql/fragments/related-stories"),
@@ -76,7 +76,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/advertiser-related-stories.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/advertiser-related-stories.marko",
     component: "./advertiser-related-stories.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/story/track-end-of-content.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-end-of-content.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-end-of-content.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -23,7 +23,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-end-of-content.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-end-of-content.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/components/story/track-init.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-init.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-init.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -38,7 +38,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-init.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-init.marko",
     tags: [
       "@mindful-web/marko-web-gtm/components/push.marko"
     ]

package/components/story/track-outbound-links.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-outbound-links.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-outbound-links.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -25,7 +25,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-outbound-links.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-outbound-links.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/components/story/track-page-view.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-page-view.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-page-view.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_gtm_push_template = require("@mindful-web/marko-web-gtm/components/push.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -25,7 +25,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-page-view.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-page-view.marko",
     tags: [
       "@mindful-web/marko-web-gtm/components/push.marko"
     ]

package/components/story/track-social-share.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-social-share.marko",
+    marko_componentType = "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-social-share.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -23,7 +23,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-native-x$1.86.0/components/story/track-social-share.marko",
+    id: "/@mindful-web/marko-web-native-x$1.92.2/components/story/track-social-share.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindful-web/marko-web-native-x",
-  "version": "1.86.0",
+  "version": "1.92.2",
   "description": "NativeX Marko components for Mindful Web websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "license": "MIT",
@@ -13,11 +13,12 @@
     "test": "yarn compile --no-clean && yarn lint"
   },
   "dependencies": {
-    "@mindful-web/marko-web-deferred-script-loader": "^1.83.1",
-    "@mindful-web/marko-web-gtm": "^1.83.1",
-    "@mindful-web/object-path": "^1.83.1",
-    "@mindful-web/utils": "^1.83.1",
-    "@mindful-web/web-common": "^1.86.0",
+    "@mindful-web/marko-web-deferred-script-loader": "^1.92.0",
+    "@mindful-web/marko-web-gtm": "^1.92.0",
+    "@mindful-web/marko-web-p1-events": "^1.92.2",
+    "@mindful-web/object-path": "^1.92.0",
+    "@mindful-web/utils": "^1.92.0",
+    "@mindful-web/web-common": "^1.92.0",
     "graphql-tag": "^2.12.6",
     "node-fetch": "^2.6.9"
   },
@@ -28,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "48d984cb5612956c13516f44f4c880ca7116b1ad"
+  "gitHead": "df62dca04be704ae15f4135f6952a5799a0c3866"
 }

package/utils/create-headers.js

@@ -1,7 +1,18 @@
+const { getVisitorLocationHeaders } = require('@mindful-web/utils');
+
+/**
+ * Builds the headers sent with server-to-server NativeX/Mindful delivery requests. The
+ * forwarded Cloudflare visitor location headers allow the delivery API to apply geographic
+ * targeting; they use the same contract as website banner ads.
+ *
+ * @param {{ req?: import('express').Request }} args
+ * @returns {Record<string, string>}
+ */
 module.exports = ({ req }) => {
   if (!req) return {};
   return {
     'x-forwarded-for': req.ip,
     'user-agent': req.get('user-agent'),
+    ...getVisitorLocationHeaders(req),
   };
 };