@atlaskit/react-ufo 3.6.2 → 3.6.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 3.6.4
+
+### Patch Changes
+
+- [#144654](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144654)
+  [`f01bae7a69fc9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f01bae7a69fc9) -
+  remove withProfiling wrappers for intersection observer callbacks
+
+## 3.6.3
+
+### Patch Changes
+
+- [#141647](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141647)
+  [`66f1d049bd2ea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/66f1d049bd2ea) -
+  cleanup ff platform_ufo_vc_fix_ignore_image_mutation
+- [#143633](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/143633)
+  [`16db0c6d6329c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/16db0c6d6329c) -
+  FF cleanup - enable-react-ufo-payload-segment-compressed
+
 ## 3.6.2
 
 ### Patch Changes

package/dist/cjs/create-payload/index.js

@@ -19,7 +19,6 @@ var _additionalPayload = require("../additional-payload");
 var _assets = require("../assets");
 var bundleEvalTiming = _interopRequireWildcard(require("../bundle-eval-timing"));
 var _coinflip = _interopRequireDefault(require("../coinflip"));
-var _constants = require("../common/constants");
 var _config = require("../config");
 var _createExperimentalInteractionMetricsPayload = require("../create-experimental-interaction-metrics-payload");
 var _customTimings = require("../custom-timings");
@@ -35,6 +34,7 @@ var ssr = _interopRequireWildcard(require("../ssr"));
 var _utils = require("./common/utils");
 var _getInteractionStatus = _interopRequireDefault(require("./utils/get-interaction-status"));
 var _getPageVisibilityUpToTtai = _interopRequireDefault(require("./utils/get-page-visibility-up-to-ttai"));
+var _getReactUfoPayloadVersion = require("./utils/get-react-ufo-payload-version");
 var _getSsrDoneTimeValue = _interopRequireDefault(require("./utils/get-ssr-done-time-value"));
 var _getVcMetrics = _interopRequireDefault(require("./utils/get-vc-metrics"));
 var _excluded = ["labelStack", "time"],
@@ -393,7 +393,7 @@ var optimizeCustomData = (0, _selfMeasurements.withProfiling)(function optimizeC
     var label = (0, _utils.stringifyLabelStackFully)(labelStack);
     var value = (_result$get$data = (_result$get = result.get(label)) === null || _result$get === void 0 ? void 0 : _result$get.data) !== null && _result$get$data !== void 0 ? _result$get$data : {};
     result.set(label, {
-      labelStack: (0, _utils.optimizeLabelStack)(labelStack, (0, _constants.getReactUFOVersion)(interaction.type)),
+      labelStack: (0, _utils.optimizeLabelStack)(labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
       data: Object.assign(value, data)
     });
     return result;
@@ -410,7 +410,7 @@ var optimizeCustomData = (0, _selfMeasurements.withProfiling)(function optimizeC
         var label = (0, _utils.stringifyLabelStackFully)([]);
         var labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
-          labelStack: (0, _utils.optimizeLabelStack)([], (0, _constants.getReactUFOVersion)(interaction.type)),
+          labelStack: (0, _utils.optimizeLabelStack)([], (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
           data: Object.assign(labelValue, (0, _defineProperty2.default)({}, key, value))
         });
       }
@@ -723,7 +723,7 @@ function _createInteractionMetricsPayload() {
           pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
           pageVisibilityAtTTAI = (0, _getPageVisibilityUpToTtai.default)(interaction);
           segments = config.killswitchNestedSegments ? [] : knownSegments;
-          segmentTree = (0, _constants.getReactUFOVersion)(interaction.type) === '2.0.0' ? (0, _utils.buildSegmentTree)(segments.map(function (segment) {
+          segmentTree = (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type) === '2.0.0' ? (0, _utils.buildSegmentTree)(segments.map(function (segment) {
             return segment.labelStack;
           })) : {};
           isDetailedPayload = pageVisibilityAtTTAI === 'visible';
@@ -732,7 +732,7 @@ function _createInteractionMetricsPayload() {
           moreAccuratePageVisibilityAtTTI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTI(interaction) : null;
           moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
           labelStack = interaction.labelStack ? {
-            labelStack: (0, _utils.optimizeLabelStack)(interaction.labelStack, (0, _constants.getReactUFOVersion)(interaction.type))
+            labelStack: (0, _utils.optimizeLabelStack)(interaction.labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
           } : {}; // Page Load
           getInitialPageLoadSSRMetrics = function getInitialPageLoadSSRMetrics() {
             var _config$ssr;
@@ -761,14 +761,14 @@ function _createInteractionMetricsPayload() {
                 var labelStack = _ref6.labelStack,
                   others = (0, _objectWithoutProperties2.default)(_ref6, _excluded3);
                 return _objectSpread(_objectSpread({}, others), {}, {
-                  labelStack: labelStack && (0, _utils.optimizeLabelStack)(labelStack, (0, _constants.getReactUFOVersion)(interaction.type))
+                  labelStack: labelStack && (0, _utils.optimizeLabelStack)(labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
                 });
               }),
               holdActive: (0, _toConsumableArray2.default)(interaction.holdActive.values()),
               redirects: optimizeRedirects(interaction.redirects, start),
-              holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, (0, _constants.getReactUFOVersion)(interaction.type)),
-              spans: optimizeSpans(spans, start, (0, _constants.getReactUFOVersion)(interaction.type)),
-              requestInfo: optimizeRequestInfo(interaction.requestInfo, start, (0, _constants.getReactUFOVersion)(interaction.type)),
+              holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
+              spans: optimizeSpans(spans, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
+              requestInfo: optimizeRequestInfo(interaction.requestInfo, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
               customTimings: optimizeCustomTimings(interaction.customTimings, start),
               bundleEvalTimings: objectToArray(getBundleEvalTimings(start)),
               resourceTimings: objectToArray(resourceTimings)
@@ -815,7 +815,7 @@ function _createInteractionMetricsPayload() {
                 'event:sizeInKb': 0,
                 'event:source': {
                   name: 'react-ufo/web',
-                  version: (0, _constants.getReactUFOVersion)(interaction.type)
+                  version: (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)
                 },
                 'event:region': config.region || 'unknown',
                 'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
@@ -839,19 +839,19 @@ function _createInteractionMetricsPayload() {
                   isPreviousInteractionAborted: isPreviousInteractionAborted,
                   abortedByInteractionName: abortedByInteractionName,
                   // performance
-                  apdex: optimizeApdex(interaction.apdex, (0, _constants.getReactUFOVersion)(interaction.type)),
+                  apdex: optimizeApdex(interaction.apdex, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
                   end: Math.round(end),
                   start: Math.round(start),
-                  segments: (0, _constants.getReactUFOVersion)(interaction.type) === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
+                  segments: (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type) === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
                     var labelStack = _ref7.labelStack,
                       others = (0, _objectWithoutProperties2.default)(_ref7, _excluded4);
                     return _objectSpread(_objectSpread({}, others), {}, {
-                      labelStack: (0, _utils.optimizeLabelStack)(labelStack, (0, _constants.getReactUFOVersion)(interaction.type))
+                      labelStack: (0, _utils.optimizeLabelStack)(labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
                     });
                   }),
-                  marks: optimizeMarks(interaction.marks, (0, _constants.getReactUFOVersion)(interaction.type)),
+                  marks: optimizeMarks(interaction.marks, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
                   customData: optimizeCustomData(interaction),
-                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, (0, _constants.getReactUFOVersion)(interaction.type))
+                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
                 }, labelStack), pageLoadInteractionMetrics), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
                   'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
                   'metric:experimental:ttai': expTTAI

package/dist/cjs/create-payload/utils/get-react-ufo-payload-version.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReactUFOPayloadVersion = void 0;
+var _selfMeasurements = require("../../self-measurements");
+var getReactUFOPayloadVersion = exports.getReactUFOPayloadVersion = (0, _selfMeasurements.withProfiling)(function getReactUFOVersion(interactionType) {
+  if (interactionType !== 'page_load' && interactionType !== 'transition') {
+    return '1.0.1';
+  }
+  return '2.0.0';
+});

package/dist/cjs/create-post-interaction-log-payload/index.js

@@ -8,9 +8,9 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _coinflip = _interopRequireDefault(require("../coinflip"));
-var _constants = require("../common/constants");
 var _config = require("../config");
 var _utils = require("../create-payload/common/utils");
+var _getReactUfoPayloadVersion = require("../create-payload/utils/get-react-ufo-payload-version");
 var _hiddenTiming = require("../hidden-timing");
 var _selfMeasurements = require("../self-measurements");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -189,8 +189,7 @@ var createPostInteractionLogPayload = (0, _selfMeasurements.withProfiling)(funct
         'event:schema': '1.0.0',
         'event:source': {
           name: 'react-ufo/web',
-          version: (0, _constants.getReactUFOVersion)(lastInteractionFinish.type),
-          payloadSource: 'platform'
+          version: (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(lastInteractionFinish.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': 'custom.post-interaction-logs',

package/dist/cjs/vc/vc-observer/observers/index.js

@@ -258,10 +258,8 @@ var Observers = exports.Observers = /*#__PURE__*/function () {
                 if ((0, _isNonVisualStyleMutation.default)(mutation)) {
                   ignoreReason = 'non-visual-style';
                 }
-                if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_fix_ignore_image_mutation')) {
-                  if ((0, _vcUtils.isContainedWithinMediaWrapper)(mutation.target)) {
-                    ignoreReason = 'image';
-                  }
+                if ((0, _vcUtils.isContainedWithinMediaWrapper)(mutation.target)) {
+                  ignoreReason = 'image';
                 }
                 _this2.observeElement(mutation.target, mutation, 'attr', ignoreReason, attributeName, oldValue, newValue);
               }

package/dist/cjs/vc/vc-observer-new/viewport-observer/intersection-observer/index.js

@@ -59,15 +59,15 @@ function createIntersectionObserver(args) {
   });
   var observer = new IntersectionObserver(intersectionObserverCallback);
   return {
-    disconnect: (0, _selfMeasurements.withProfiling)(function disconnect() {
+    disconnect: function disconnect() {
       observer.disconnect();
-    }, ['vc']),
-    unobserve: (0, _selfMeasurements.withProfiling)(function unobserve(target) {
+    },
+    unobserve: function unobserve(target) {
       observer.unobserve(target);
-    }, ['vc']),
-    watchAndTag: (0, _selfMeasurements.withProfiling)(function watchAndTag(target, tagOrCallback) {
+    },
+    watchAndTag: function watchAndTag(target, tagOrCallback) {
       callbacksPerElement.set(target, tagOrCallback);
       observer.observe(target);
-    }, ['vc'])
+    }
   };
 }

package/dist/es2019/create-payload/index.js

@@ -4,7 +4,6 @@ import { getLighthouseMetrics } from '../additional-payload';
 import { CHRReporter } from '../assets';
 import * as bundleEvalTiming from '../bundle-eval-timing';
 import coinflip from '../coinflip';
-import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getExperimentalInteractionRate, getUfoNameOverrides } from '../config';
 import { getExperimentalVCMetrics } from '../create-experimental-interaction-metrics-payload';
 import { getBm3Timings } from '../custom-timings';
@@ -20,6 +19,7 @@ import * as ssr from '../ssr';
 import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
 import getInteractionStatus from './utils/get-interaction-status';
 import getPageVisibilityUpToTTAI from './utils/get-page-visibility-up-to-ttai';
+import { getReactUFOPayloadVersion } from './utils/get-react-ufo-payload-version';
 import getSSRDoneTimeValue from './utils/get-ssr-done-time-value';
 import getVCMetrics from './utils/get-vc-metrics';
 const getUfoNameOverride = withProfiling(function getUfoNameOverride(interaction) {
@@ -362,7 +362,7 @@ const optimizeCustomData = withProfiling(function optimizeCustomData(interaction
     const label = stringifyLabelStackFully(labelStack);
     const value = (_result$get$data = (_result$get = result.get(label)) === null || _result$get === void 0 ? void 0 : _result$get.data) !== null && _result$get$data !== void 0 ? _result$get$data : {};
     result.set(label, {
-      labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type)),
+      labelStack: optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type)),
       data: Object.assign(value, data)
     });
     return result;
@@ -374,7 +374,7 @@ const optimizeCustomData = withProfiling(function optimizeCustomData(interaction
         const label = stringifyLabelStackFully([]);
         const labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
-          labelStack: optimizeLabelStack([], getReactUFOVersion(interaction.type)),
+          labelStack: optimizeLabelStack([], getReactUFOPayloadVersion(interaction.type)),
           data: Object.assign(labelValue, {
             [key]: value
           })
@@ -699,14 +699,14 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
   const pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   const pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   const segments = config.killswitchNestedSegments ? [] : knownSegments;
-  const segmentTree = getReactUFOVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(segment => segment.labelStack)) : {};
+  const segmentTree = getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(segment => segment.labelStack)) : {};
   const isDetailedPayload = pageVisibilityAtTTAI === 'visible';
   const isPageLoad = type === 'page_load';
   const calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;
   const moreAccuratePageVisibilityAtTTI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTI(interaction) : null;
   const moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
   const labelStack = interaction.labelStack ? {
-    labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOVersion(interaction.type))
+    labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOPayloadVersion(interaction.type))
   } : {};
   // Page Load
   const getInitialPageLoadSSRMetrics = () => {
@@ -740,13 +740,13 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
         ...others
       }) => ({
         ...others,
-        labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
+        labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
       })),
       holdActive: [...interaction.holdActive.values()],
       redirects: optimizeRedirects(interaction.redirects, start),
-      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOVersion(interaction.type)),
-      spans: optimizeSpans(spans, start, getReactUFOVersion(interaction.type)),
-      requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOVersion(interaction.type)),
+      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOPayloadVersion(interaction.type)),
+      spans: optimizeSpans(spans, start, getReactUFOPayloadVersion(interaction.type)),
+      requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOPayloadVersion(interaction.type)),
       customTimings: optimizeCustomTimings(interaction.customTimings, start),
       bundleEvalTimings: objectToArray(getBundleEvalTimings(start)),
       resourceTimings: objectToArray(resourceTimings)
@@ -787,7 +787,7 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
         'event:sizeInKb': 0,
         'event:source': {
           name: 'react-ufo/web',
-          version: getReactUFOVersion(interaction.type)
+          version: getReactUFOPayloadVersion(interaction.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
@@ -823,19 +823,19 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
           isPreviousInteractionAborted,
           abortedByInteractionName,
           // performance
-          apdex: optimizeApdex(interaction.apdex, getReactUFOVersion(interaction.type)),
+          apdex: optimizeApdex(interaction.apdex, getReactUFOPayloadVersion(interaction.type)),
           end: Math.round(end),
           start: Math.round(start),
-          segments: getReactUFOVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(({
+          segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(({
             labelStack,
             ...others
           }) => ({
             ...others,
-            labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
+            labelStack: optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
           })),
-          marks: optimizeMarks(interaction.marks, getReactUFOVersion(interaction.type)),
+          marks: optimizeMarks(interaction.marks, getReactUFOPayloadVersion(interaction.type)),
           customData: optimizeCustomData(interaction),
-          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOVersion(interaction.type)),
+          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
           ...labelStack,
           ...pageLoadInteractionMetrics,
           ...getDetailedInteractionMetrics(resourceTimings),

package/dist/es2019/create-payload/utils/get-react-ufo-payload-version.js

@@ -0,0 +1,7 @@
+import { withProfiling } from '../../self-measurements';
+export const getReactUFOPayloadVersion = withProfiling(function getReactUFOVersion(interactionType) {
+  if (interactionType !== 'page_load' && interactionType !== 'transition') {
+    return '1.0.1';
+  }
+  return '2.0.0';
+});

package/dist/es2019/create-post-interaction-log-payload/index.js

@@ -1,7 +1,7 @@
 import coinflip from '../coinflip';
-import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getPostInteractionRate } from '../config';
 import { isSegmentLabel, sanitizeUfoName } from '../create-payload/common/utils';
+import { getReactUFOPayloadVersion } from '../create-payload/utils/get-react-ufo-payload-version';
 import { getPageVisibilityState } from '../hidden-timing';
 import { withProfiling } from '../self-measurements';
 const getParentStack = withProfiling(function getParentStack(labelStack) {
@@ -169,8 +169,7 @@ const createPostInteractionLogPayload = withProfiling(function createPostInterac
         'event:schema': '1.0.0',
         'event:source': {
           name: 'react-ufo/web',
-          version: getReactUFOVersion(lastInteractionFinish.type),
-          payloadSource: 'platform'
+          version: getReactUFOPayloadVersion(lastInteractionFinish.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': 'custom.post-interaction-logs',

package/dist/es2019/vc/vc-observer/observers/index.js

@@ -228,10 +228,8 @@ export class Observers {
               if (isNonVisualStyleMutation(mutation)) {
                 ignoreReason = 'non-visual-style';
               }
-              if (fg('platform_ufo_vc_fix_ignore_image_mutation')) {
-                if (isContainedWithinMediaWrapper(mutation.target)) {
-                  ignoreReason = 'image';
-                }
+              if (isContainedWithinMediaWrapper(mutation.target)) {
+                ignoreReason = 'image';
               }
               this.observeElement(mutation.target, mutation, 'attr', ignoreReason, attributeName, oldValue, newValue);
             }

package/dist/es2019/vc/vc-observer-new/viewport-observer/intersection-observer/index.js

@@ -54,15 +54,15 @@ export function createIntersectionObserver(args) {
   });
   const observer = new IntersectionObserver(intersectionObserverCallback);
   return {
-    disconnect: withProfiling(function disconnect() {
+    disconnect: () => {
       observer.disconnect();
-    }, ['vc']),
-    unobserve: withProfiling(function unobserve(target) {
+    },
+    unobserve: target => {
       observer.unobserve(target);
-    }, ['vc']),
-    watchAndTag: withProfiling(function watchAndTag(target, tagOrCallback) {
+    },
+    watchAndTag: (target, tagOrCallback) => {
       callbacksPerElement.set(target, tagOrCallback);
       observer.observe(target);
-    }, ['vc'])
+    }
   };
 }

package/dist/esm/create-payload/index.js

@@ -16,7 +16,6 @@ import { getLighthouseMetrics } from '../additional-payload';
 import { CHRReporter } from '../assets';
 import * as bundleEvalTiming from '../bundle-eval-timing';
 import coinflip from '../coinflip';
-import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getExperimentalInteractionRate, getUfoNameOverrides } from '../config';
 import { getExperimentalVCMetrics } from '../create-experimental-interaction-metrics-payload';
 import { getBm3Timings } from '../custom-timings';
@@ -32,6 +31,7 @@ import * as ssr from '../ssr';
 import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
 import getInteractionStatus from './utils/get-interaction-status';
 import getPageVisibilityUpToTTAI from './utils/get-page-visibility-up-to-ttai';
+import { getReactUFOPayloadVersion } from './utils/get-react-ufo-payload-version';
 import getSSRDoneTimeValue from './utils/get-ssr-done-time-value';
 import getVCMetrics from './utils/get-vc-metrics';
 var getUfoNameOverride = withProfiling(function getUfoNameOverride(interaction) {
@@ -382,7 +382,7 @@ var optimizeCustomData = withProfiling(function optimizeCustomData(interaction)
     var label = stringifyLabelStackFully(labelStack);
     var value = (_result$get$data = (_result$get = result.get(label)) === null || _result$get === void 0 ? void 0 : _result$get.data) !== null && _result$get$data !== void 0 ? _result$get$data : {};
     result.set(label, {
-      labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type)),
+      labelStack: optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type)),
       data: Object.assign(value, data)
     });
     return result;
@@ -399,7 +399,7 @@ var optimizeCustomData = withProfiling(function optimizeCustomData(interaction)
         var label = stringifyLabelStackFully([]);
         var labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
-          labelStack: optimizeLabelStack([], getReactUFOVersion(interaction.type)),
+          labelStack: optimizeLabelStack([], getReactUFOPayloadVersion(interaction.type)),
           data: Object.assign(labelValue, _defineProperty({}, key, value))
         });
       }
@@ -712,7 +712,7 @@ function _createInteractionMetricsPayload() {
           pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
           pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
           segments = config.killswitchNestedSegments ? [] : knownSegments;
-          segmentTree = getReactUFOVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(function (segment) {
+          segmentTree = getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(function (segment) {
             return segment.labelStack;
           })) : {};
           isDetailedPayload = pageVisibilityAtTTAI === 'visible';
@@ -721,7 +721,7 @@ function _createInteractionMetricsPayload() {
           moreAccuratePageVisibilityAtTTI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTI(interaction) : null;
           moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
           labelStack = interaction.labelStack ? {
-            labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOVersion(interaction.type))
+            labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOPayloadVersion(interaction.type))
           } : {}; // Page Load
           getInitialPageLoadSSRMetrics = function getInitialPageLoadSSRMetrics() {
             var _config$ssr;
@@ -750,14 +750,14 @@ function _createInteractionMetricsPayload() {
                 var labelStack = _ref6.labelStack,
                   others = _objectWithoutProperties(_ref6, _excluded3);
                 return _objectSpread(_objectSpread({}, others), {}, {
-                  labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
+                  labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
                 });
               }),
               holdActive: _toConsumableArray(interaction.holdActive.values()),
               redirects: optimizeRedirects(interaction.redirects, start),
-              holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOVersion(interaction.type)),
-              spans: optimizeSpans(spans, start, getReactUFOVersion(interaction.type)),
-              requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOVersion(interaction.type)),
+              holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOPayloadVersion(interaction.type)),
+              spans: optimizeSpans(spans, start, getReactUFOPayloadVersion(interaction.type)),
+              requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOPayloadVersion(interaction.type)),
               customTimings: optimizeCustomTimings(interaction.customTimings, start),
               bundleEvalTimings: objectToArray(getBundleEvalTimings(start)),
               resourceTimings: objectToArray(resourceTimings)
@@ -804,7 +804,7 @@ function _createInteractionMetricsPayload() {
                 'event:sizeInKb': 0,
                 'event:source': {
                   name: 'react-ufo/web',
-                  version: getReactUFOVersion(interaction.type)
+                  version: getReactUFOPayloadVersion(interaction.type)
                 },
                 'event:region': config.region || 'unknown',
                 'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
@@ -828,19 +828,19 @@ function _createInteractionMetricsPayload() {
                   isPreviousInteractionAborted: isPreviousInteractionAborted,
                   abortedByInteractionName: abortedByInteractionName,
                   // performance
-                  apdex: optimizeApdex(interaction.apdex, getReactUFOVersion(interaction.type)),
+                  apdex: optimizeApdex(interaction.apdex, getReactUFOPayloadVersion(interaction.type)),
                   end: Math.round(end),
                   start: Math.round(start),
-                  segments: getReactUFOVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
+                  segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
                     var labelStack = _ref7.labelStack,
                       others = _objectWithoutProperties(_ref7, _excluded4);
                     return _objectSpread(_objectSpread({}, others), {}, {
-                      labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
+                      labelStack: optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
                     });
                   }),
-                  marks: optimizeMarks(interaction.marks, getReactUFOVersion(interaction.type)),
+                  marks: optimizeMarks(interaction.marks, getReactUFOPayloadVersion(interaction.type)),
                   customData: optimizeCustomData(interaction),
-                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOVersion(interaction.type))
+                  reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type))
                 }, labelStack), pageLoadInteractionMetrics), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
                   'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
                   'metric:experimental:ttai': expTTAI

package/dist/esm/create-payload/utils/get-react-ufo-payload-version.js

@@ -0,0 +1,7 @@
+import { withProfiling } from '../../self-measurements';
+export var getReactUFOPayloadVersion = withProfiling(function getReactUFOVersion(interactionType) {
+  if (interactionType !== 'page_load' && interactionType !== 'transition') {
+    return '1.0.1';
+  }
+  return '2.0.0';
+});

package/dist/esm/create-post-interaction-log-payload/index.js

@@ -3,9 +3,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import coinflip from '../coinflip';
-import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getPostInteractionRate } from '../config';
 import { isSegmentLabel, sanitizeUfoName } from '../create-payload/common/utils';
+import { getReactUFOPayloadVersion } from '../create-payload/utils/get-react-ufo-payload-version';
 import { getPageVisibilityState } from '../hidden-timing';
 import { withProfiling } from '../self-measurements';
 var getParentStack = withProfiling(function getParentStack(labelStack) {
@@ -182,8 +182,7 @@ var createPostInteractionLogPayload = withProfiling(function createPostInteracti
         'event:schema': '1.0.0',
         'event:source': {
           name: 'react-ufo/web',
-          version: getReactUFOVersion(lastInteractionFinish.type),
-          payloadSource: 'platform'
+          version: getReactUFOPayloadVersion(lastInteractionFinish.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': 'custom.post-interaction-logs',

package/dist/esm/vc/vc-observer/observers/index.js

@@ -251,10 +251,8 @@ export var Observers = /*#__PURE__*/function () {
                 if (isNonVisualStyleMutation(mutation)) {
                   ignoreReason = 'non-visual-style';
                 }
-                if (fg('platform_ufo_vc_fix_ignore_image_mutation')) {
-                  if (isContainedWithinMediaWrapper(mutation.target)) {
-                    ignoreReason = 'image';
-                  }
+                if (isContainedWithinMediaWrapper(mutation.target)) {
+                  ignoreReason = 'image';
                 }
                 _this2.observeElement(mutation.target, mutation, 'attr', ignoreReason, attributeName, oldValue, newValue);
               }

package/dist/esm/vc/vc-observer-new/viewport-observer/intersection-observer/index.js

@@ -53,15 +53,15 @@ export function createIntersectionObserver(args) {
   });
   var observer = new IntersectionObserver(intersectionObserverCallback);
   return {
-    disconnect: withProfiling(function disconnect() {
+    disconnect: function disconnect() {
       observer.disconnect();
-    }, ['vc']),
-    unobserve: withProfiling(function unobserve(target) {
+    },
+    unobserve: function unobserve(target) {
       observer.unobserve(target);
-    }, ['vc']),
-    watchAndTag: withProfiling(function watchAndTag(target, tagOrCallback) {
+    },
+    watchAndTag: function watchAndTag(target, tagOrCallback) {
       callbacksPerElement.set(target, tagOrCallback);
       observer.observe(target);
-    }, ['vc'])
+    }
   };
 }

package/dist/types/create-payload/utils/get-react-ufo-payload-version.d.ts

@@ -0,0 +1,2 @@
+import type { InteractionType } from '../../interaction-metrics';
+export declare const getReactUFOPayloadVersion: (interactionType: InteractionType) => "1.0.1" | "2.0.0";

package/dist/types/create-post-interaction-log-payload/index.d.ts

@@ -13,7 +13,6 @@ declare const createPostInteractionLogPayload: (args_0: PostInteractionLogOutput
             'event:source': {
                 name: string;
                 version: string;
-                payloadSource: string;
             };
             'event:region': string;
             'experience:key': string;

package/dist/types-ts4.5/create-payload/utils/get-react-ufo-payload-version.d.ts

@@ -0,0 +1,2 @@
+import type { InteractionType } from '../../interaction-metrics';
+export declare const getReactUFOPayloadVersion: (interactionType: InteractionType) => "1.0.1" | "2.0.0";

package/dist/types-ts4.5/create-post-interaction-log-payload/index.d.ts

@@ -13,7 +13,6 @@ declare const createPostInteractionLogPayload: (args_0: PostInteractionLogOutput
             'event:source': {
                 name: string;
                 version: string;
-                payloadSource: string;
             };
             'event:region': string;
             'experience:key': string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "3.6.2",
+	"version": "3.6.4",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -130,9 +130,6 @@
 		"platform_ufo_canvas_heatmap_full_precision": {
 			"type": "boolean"
 		},
-		"enable-react-ufo-payload-segment-compressed": {
-			"type": "boolean"
-		},
 		"ufo_capture_stylesheet_metrics": {
 			"type": "boolean"
 		},
@@ -166,9 +163,6 @@
 		"platform_ufo_disable_ttvc_v1": {
 			"type": "boolean"
 		},
-		"platform_ufo_vc_fix_ignore_image_mutation": {
-			"type": "boolean"
-		},
 		"platform_ufo_assets_check_for_nan": {
 			"type": "boolean"
 		},

package/dist/cjs/common/constants.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getReactUFOVersion = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _selfMeasurements = require("../self-measurements");
-var getReactUFOVersion = exports.getReactUFOVersion = (0, _selfMeasurements.withProfiling)(function getReactUFOVersion(interactionType) {
-  if (interactionType !== 'page_load' && interactionType !== 'transition') {
-    return '1.0.1';
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  if (!(0, _platformFeatureFlags.fg)('enable-react-ufo-payload-segment-compressed')) {
-    return '1.0.1';
-  }
-  return '2.0.0';
-});

package/dist/es2019/common/constants.js

@@ -1,13 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { withProfiling } from '../self-measurements';
-export const getReactUFOVersion = withProfiling(function getReactUFOVersion(interactionType) {
-  if (interactionType !== 'page_load' && interactionType !== 'transition') {
-    return '1.0.1';
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  if (!fg('enable-react-ufo-payload-segment-compressed')) {
-    return '1.0.1';
-  }
-  return '2.0.0';
-});

package/dist/esm/common/constants.js

@@ -1,13 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { withProfiling } from '../self-measurements';
-export var getReactUFOVersion = withProfiling(function getReactUFOVersion(interactionType) {
-  if (interactionType !== 'page_load' && interactionType !== 'transition') {
-    return '1.0.1';
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  if (!fg('enable-react-ufo-payload-segment-compressed')) {
-    return '1.0.1';
-  }
-  return '2.0.0';
-});

package/dist/types/common/constants.d.ts

@@ -1,2 +0,0 @@
-import type { InteractionType } from '../interaction-metrics';
-export declare const getReactUFOVersion: (interactionType: InteractionType) => "1.0.1" | "2.0.0";

package/dist/types-ts4.5/common/constants.d.ts

@@ -1,2 +0,0 @@
-import type { InteractionType } from '../interaction-metrics';
-export declare const getReactUFOVersion: (interactionType: InteractionType) => "1.0.1" | "2.0.0";