@atlaskit/react-ufo 3.13.0 → 3.13.1

package/dist/es2019/vc/vc-observer/getVCRevisionsData.js

@@ -1,7 +1,5 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isVCRevisionEnabled } from '../../config';
 import { getPageVisibilityState } from '../../hidden-timing';
-import { getRevisions } from './revisions/revisions';
 const VCParts = ['25', '50', '75', '80', '85', '90', '95', '98', '99'];
 const READONLY_EMPTY_ARRAY = Array.from({
   length: 0
@@ -33,85 +31,31 @@ export function getVCRevisionsData({
   interaction,
   isVCClean,
   isEventAborted,
-  multiHeatmap,
-  ssr,
   calculatedVC,
   calculatedVCNext,
   experienceKey
 }) {
-  const isTTVCv3Enabled = fg('platform_ufo_vc_enable_revisions_by_experience') ? isVCRevisionEnabled('fy25.03', experienceKey) : isVCRevisionEnabled('fy25.03');
-
-  // As part of `platform_ufo_vc_enable_revisions_by_experience`, we are looking to turn off the `multiHeatmap` branch of code
-  // for calculating TTVC, and instead rely on existing values already available, e.g. `calculatedVC` and `calculatedVCNext`
-  if (!isTTVCv3Enabled && !fg('platform_ufo_vc_enable_revisions_by_experience')) {
-    if (!multiHeatmap) {
-      return null;
-    }
-    return {
-      [`${fullPrefix}vc:rev`]: multiHeatmap === null || multiHeatmap === void 0 ? void 0 : multiHeatmap.getPayloadShapedData({
-        VCParts: VCParts.map(v => parseInt(v)),
-        VCCalculationMethods: getRevisions().map(({
-          classifier
-        }) => classifier.VCCalculationMethod),
-        filterComponentsLog: getRevisions().map(({
-          classifier
-        }) => classifier.filterComponentsLog),
-        isEventAborted,
-        interactionStart: interaction.start,
-        ttai: interaction.end,
-        ssr,
-        clean: isVCClean
-      })
-    };
-  }
   const pageVisibilityUpToTTAI = getPageVisibilityState(interaction.start, interaction.end);
   const isVisiblePageVisibleUpToTTAI = pageVisibilityUpToTTAI === 'visible';
   const shouldHaveVCmetric = isVCClean && !isEventAborted && isVisiblePageVisibleUpToTTAI;
-  if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-    const availableVCRevisionPayloads = [];
-    if (isVCRevisionEnabled('fy25.01', experienceKey)) {
-      availableVCRevisionPayloads.push({
-        revision: 'fy25.01',
-        clean: isVCClean,
-        'metric:vc90': shouldHaveVCmetric ? calculatedVC.VC['90'] : null,
-        vcDetails: createVCDetails(calculatedVC, shouldHaveVCmetric)
-      });
-    }
-    if (isVCRevisionEnabled('fy25.02', experienceKey)) {
-      availableVCRevisionPayloads.push({
-        revision: 'fy25.02',
-        clean: isVCClean,
-        'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
-        vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
-      });
-    }
-    return {
-      [`${fullPrefix}vc:rev`]: availableVCRevisionPayloads
-    };
-  } else {
-    // Create the V2 revision object which is always needed
-    const ttvcV2Revision = {
-      revision: 'fy25.02',
-      clean: isVCClean,
-      'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
-      vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
-    };
-    const isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01');
-    if (isTTVCv1Disabled) {
-      return {
-        [`${fullPrefix}vc:rev`]: [ttvcV2Revision]
-      };
-    }
-
-    // Only create ttvcV1Revision when we're actually going to use it
-    const ttvcV1Revision = {
+  const availableVCRevisionPayloads = [];
+  if (isVCRevisionEnabled('fy25.01', experienceKey)) {
+    availableVCRevisionPayloads.push({
       revision: 'fy25.01',
       clean: isVCClean,
       'metric:vc90': shouldHaveVCmetric ? calculatedVC.VC['90'] : null,
       vcDetails: createVCDetails(calculatedVC, shouldHaveVCmetric)
-    };
-    return {
-      [`${fullPrefix}vc:rev`]: [ttvcV1Revision, ttvcV2Revision]
-    };
+    });
+  }
+  if (isVCRevisionEnabled('fy25.02', experienceKey)) {
+    availableVCRevisionPayloads.push({
+      revision: 'fy25.02',
+      clean: isVCClean,
+      'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
+      vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
+    });
   }
+  return {
+    [`${fullPrefix}vc:rev`]: availableVCRevisionPayloads
+  };
 }

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

@@ -6,9 +6,7 @@ import { attachAbortListeners } from './attachAbortListeners';
 import { getVCRevisionDebugDetails } from './getVCRevisionDebugDetails';
 import { getVCRevisionsData } from './getVCRevisionsData';
 import { getViewportHeight, getViewportWidth } from './getViewport';
-import { MultiRevisionHeatmap } from './heatmap/heatmap';
 import { Observers } from './observers';
-import { getRevisions } from './revisions/revisions';
 const abortReason = {
   scroll: 'scroll',
   keypress: 'keypress',
@@ -41,7 +39,6 @@ export class VCObserver {
     });
     /* heatmap */
     _defineProperty(this, "arraySize", 0);
-    _defineProperty(this, "multiHeatmap", null);
     _defineProperty(this, "componentsLog", {});
     _defineProperty(this, "vcRatios", {});
     _defineProperty(this, "active", false);
@@ -75,7 +72,6 @@ export class VCObserver {
         },
         heatmap: this.heatmap,
         heatmapNext: this.heatmapNext,
-        multiHeatmap: this.multiHeatmap,
         outOfBoundaryInfo: this.outOfBoundaryInfo,
         totalTime: Math.round(this.totalTime + this.observers.getTotalTime()),
         componentsLog: {
@@ -117,10 +113,9 @@ export class VCObserver {
         componentsLog,
         viewport,
         devToolsEnabled,
-        ratios,
-        multiHeatmap
+        ratios
       } = rawData;
-      const isTTVCv1Disabled = fg('platform_ufo_vc_enable_revisions_by_experience') ? !isVCRevisionEnabled('fy25.01', experienceKey) : !isVCRevisionEnabled('fy25.01');
+      const isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01', experienceKey);
 
       // NOTE: as part of platform_ufo_add_vc_abort_reason_by_revisions feature,
       // we want to report abort by scroll events the same way as other abort reasons
@@ -339,8 +334,6 @@ export class VCObserver {
           end: stop
         },
         isVCClean,
-        multiHeatmap,
-        ssr,
         calculatedVC: {
           VC,
           VCBox
@@ -367,7 +360,7 @@ export class VCObserver {
           ...speedIndex
         };
       }
-      const isTTVCv3Enabled = fg('platform_ufo_vc_enable_revisions_by_experience') ? isVCRevisionEnabled('fy25.03', experienceKey) : isVCRevisionEnabled('fy25.03');
+      const isTTVCv3Enabled = isVCRevisionEnabled('fy25.03', experienceKey);
       return {
         'metrics:vc': VC,
         [`${fullPrefix}vc:state`]: true,
@@ -390,29 +383,6 @@ export class VCObserver {
       };
     });
     _defineProperty(this, "handleUpdate", (rawTime, intersectionRect, targetName, element, type, ignoreReason, attributeName, oldValue, newValue) => {
-      this.measureStart();
-      this.legacyHandleUpdate(rawTime, intersectionRect, targetName, element, type, ignoreReason, attributeName, oldValue, newValue);
-      let isTTVCv3Disabled = !isVCRevisionEnabled('fy25.03');
-      if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-        const interaction = getActiveInteraction();
-        isTTVCv3Disabled = !isVCRevisionEnabled('fy25.03', interaction === null || interaction === void 0 ? void 0 : interaction.ufoName);
-      }
-      if (isTTVCv3Disabled) {
-        this.onViewportChangeDetected({
-          timestamp: rawTime,
-          intersectionRect,
-          targetName,
-          element,
-          type,
-          ignoreReason,
-          attributeName,
-          oldValue,
-          newValue
-        });
-      }
-      this.measureStop();
-    });
-    _defineProperty(this, "legacyHandleUpdate", (rawTime, intersectionRect, targetName, element, type, ignoreReason, attributeName, oldValue, newValue) => {
       if (this.abortReason.reason === null || this.abortReason.blocking === false) {
         const time = Math.round(rawTime - this.startTime);
         const mappedValues = this.mapPixelsToHeatmap(intersectionRect.left, intersectionRect.top, intersectionRect.width, intersectionRect.height);
@@ -420,11 +390,8 @@ export class VCObserver {
         if (!ignoreReason) {
           this.applyChangesToHeatMap(mappedValues, time, this.heatmapNext);
         }
-        let isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01');
-        if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-          const interaction = getActiveInteraction();
-          isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01', interaction === null || interaction === void 0 ? void 0 : interaction.ufoName);
-        }
+        const interaction = getActiveInteraction();
+        const isTTVCv1Disabled = !isVCRevisionEnabled('fy25.01', interaction === null || interaction === void 0 ? void 0 : interaction.ufoName);
         if (!isTTVCv1Disabled && (!ignoreReason || ignoreReason === 'not-visible') && type !== 'attr') {
           this.applyChangesToHeatMap(mappedValues, time, this.heatmap);
         }
@@ -443,45 +410,6 @@ export class VCObserver {
         });
       }
     });
-    _defineProperty(this, "onViewportChangeDetected", ({
-      element,
-      type,
-      ignoreReason,
-      timestamp,
-      targetName,
-      intersectionRect,
-      attributeName,
-      oldValue,
-      newValue
-    }) => {
-      if (this.multiHeatmap === null) {
-        return;
-      }
-      // @todo add abort reason handling
-      const time = Math.round(timestamp - this.startTime);
-      const revisions = getRevisions();
-      const revisionsClassification = revisions.map(revision => {
-        return revision.classifier.classifyUpdate({
-          element,
-          type,
-          ignoreReason
-        });
-      }, []);
-      this.multiHeatmap.handleUpdate({
-        time,
-        targetName,
-        intersectionRect,
-        type,
-        element,
-        classification: revisionsClassification,
-        onError: error => {
-          this.setAbortReason(abortReason.error, error.time, error.error);
-        },
-        attributeName,
-        oldValue,
-        newValue
-      });
-    });
     _defineProperty(this, "mapPixelsToHeatmap", (left, top, width, height) => {
       const {
         w,
@@ -571,11 +499,6 @@ export class VCObserver {
     });
     this.heatmap = !isVCRevisionEnabled('fy25.01') ? [] : this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    this.multiHeatmap = new MultiRevisionHeatmap({
-      viewport: this.viewport,
-      revisions: getRevisions(),
-      devToolsEnabled: this.devToolsEnabled
-    });
     this.isPostInteraction = options.isPostInteraction || false;
   }
   start({
@@ -727,11 +650,6 @@ export class VCObserver {
     this.detachAbortListeners();
     this.heatmap = !isVCRevisionEnabled('fy25.01') ? [] : this.getCleanHeatmap();
     this.heatmapNext = this.getCleanHeatmap();
-    this.multiHeatmap = new MultiRevisionHeatmap({
-      viewport: this.viewport,
-      revisions: getRevisions(),
-      devToolsEnabled: this.devToolsEnabled
-    });
     this.totalTime = 0;
     this.componentsLog = {};
     this.vcRatios = {};

package/dist/esm/config/index.js

@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
 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 { fg } from '@atlaskit/platform-feature-flags';
 var config;
 var DEFAULT_TTVC_REVISION = 'fy25.02';
 
@@ -11,24 +10,20 @@ var DEFAULT_TTVC_REVISION = 'fy25.02';
 // and they could delete empty members
 
 export function setUFOConfig(newConfig) {
-  if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-    var _newConfig$vc;
-    // Handle edge cases with `enabledVCRevisions`
-    var _ref = (_newConfig$vc = newConfig === null || newConfig === void 0 ? void 0 : newConfig.vc) !== null && _newConfig$vc !== void 0 ? _newConfig$vc : {},
-      enabledVCRevisions = _ref.enabledVCRevisions;
-    if (_typeof(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience) === 'object') {
-      config = _objectSpread(_objectSpread({}, newConfig), {}, {
-        vc: _objectSpread(_objectSpread({}, newConfig.vc), {}, {
-          enabledVCRevisions: {
-            // enforce axiom about `enabledVCRevisions.all` config
-            all: Array.from(new Set([DEFAULT_TTVC_REVISION].concat(_toConsumableArray(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.all), _toConsumableArray(Object.values(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience).flat())))),
-            byExperience: _objectSpread({}, enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience)
-          }
-        })
-      });
-    } else {
-      config = newConfig;
-    }
+  var _newConfig$vc;
+  // Handle edge cases with `enabledVCRevisions`
+  var _ref = (_newConfig$vc = newConfig === null || newConfig === void 0 ? void 0 : newConfig.vc) !== null && _newConfig$vc !== void 0 ? _newConfig$vc : {},
+    enabledVCRevisions = _ref.enabledVCRevisions;
+  if (_typeof(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience) === 'object') {
+    config = _objectSpread(_objectSpread({}, newConfig), {}, {
+      vc: _objectSpread(_objectSpread({}, newConfig.vc), {}, {
+        enabledVCRevisions: {
+          // enforce axiom about `enabledVCRevisions.all` config
+          all: Array.from(new Set([DEFAULT_TTVC_REVISION].concat(_toConsumableArray(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.all), _toConsumableArray(Object.values(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience).flat())))),
+          byExperience: _objectSpread({}, enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience)
+        }
+      })
+    });
   } else {
     config = newConfig;
   }
@@ -50,7 +45,7 @@ export function getEnabledVCRevisions() {
       var _config$vc2, _enabledVCRevisions$b;
       var _ref2 = (_config$vc2 = config.vc) !== null && _config$vc2 !== void 0 ? _config$vc2 : {},
         enabledVCRevisions = _ref2.enabledVCRevisions;
-      if (isValidConfigArray(enabledVCRevisions === null || enabledVCRevisions === void 0 || (_enabledVCRevisions$b = enabledVCRevisions.byExperience) === null || _enabledVCRevisions$b === void 0 ? void 0 : _enabledVCRevisions$b[experienceKey]) && fg('platform_ufo_vc_enable_revisions_by_experience')) {
+      if (isValidConfigArray(enabledVCRevisions === null || enabledVCRevisions === void 0 || (_enabledVCRevisions$b = enabledVCRevisions.byExperience) === null || _enabledVCRevisions$b === void 0 ? void 0 : _enabledVCRevisions$b[experienceKey])) {
         var _enabledVCRevisions$b2;
         return (_enabledVCRevisions$b2 = enabledVCRevisions.byExperience) === null || _enabledVCRevisions$b2 === void 0 ? void 0 : _enabledVCRevisions$b2[experienceKey];
       }

package/dist/esm/create-payload/utils/get-vc-metrics.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 { fg } from '@atlaskit/platform-feature-flags';
-import { getConfig, getMostRecentVCRevision, isVCRevisionEnabled } from '../../config';
+import { getConfig, getMostRecentVCRevision } from '../../config';
 import { postInteractionLog } from '../../interaction-metrics';
 import { getVCObserver } from '../../vc';
 import getInteractionStatus from './get-interaction-status';
@@ -15,8 +15,8 @@ function getVCMetrics(_x) {
 }
 function _getVCMetrics() {
   _getVCMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interaction) {
-    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$experimentalI;
-    var config, interactionStatus, pageVisibilityUpToTTAI, shouldReportVCMetrics, isSSREnabled, ssr, tti, prefix, result, _result$ufoVcRev, mostRecentVCRevision, mostRecentVCRevisionPayload, _result$ufoVcRev2, ttvcV2Revision, VC;
+    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$experimentalI, _result$ufoVcRev;
+    var config, interactionStatus, pageVisibilityUpToTTAI, shouldReportVCMetrics, isSSREnabled, ssr, tti, prefix, result, mostRecentVCRevision, mostRecentVCRevisionPayload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -67,60 +67,21 @@ function _getVCMetrics() {
             getVCObserver().stop(interaction.ufoName);
           }
           postInteractionLog.setLastInteractionFinishVCResult(result);
-          if (!fg('platform_ufo_vc_enable_revisions_by_experience')) {
-            _context.next = 29;
-            break;
-          }
           mostRecentVCRevision = getMostRecentVCRevision(interaction.ufoName);
           mostRecentVCRevisionPayload = result === null || result === void 0 || (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(function (_ref) {
             var revision = _ref.revision;
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 26;
+            _context.next = 25;
             break;
           }
           return _context.abrupt("return", result);
-        case 26:
+        case 25:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 29:
-          if (isVCRevisionEnabled('fy25.01')) {
-            _context.next = 36;
-            break;
-          }
-          ttvcV2Revision = result === null || result === void 0 || (_result$ufoVcRev2 = result['ufo:vc:rev']) === null || _result$ufoVcRev2 === void 0 ? void 0 : _result$ufoVcRev2.find(function (_ref2) {
-            var revision = _ref2.revision;
-            return revision === 'fy25.02';
-          });
-          if (ttvcV2Revision !== null && ttvcV2Revision !== void 0 && ttvcV2Revision.clean) {
-            _context.next = 33;
-            break;
-          }
-          return _context.abrupt("return", result);
-        case 33:
-          return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
-            'metric:vc90': ttvcV2Revision['metric:vc90']
-          }));
-        case 36:
-          VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
-          if (!(!VC || !(result !== null && result !== void 0 && result["".concat(prefix, ":vc:clean")]))) {
-            _context.next = 39;
-            break;
-          }
-          return _context.abrupt("return", result);
-        case 39:
-          if (!(interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible')) {
-            _context.next = 41;
-            break;
-          }
-          return _context.abrupt("return", result);
-        case 41:
-          return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
-            'metric:vc90': VC['90']
-          }));
-        case 42:
+        case 26:
         case "end":
           return _context.stop();
       }

package/dist/esm/vc/index.js

@@ -7,7 +7,6 @@ var _process;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 { fg } from '@atlaskit/platform-feature-flags';
 import { isVCRevisionEnabled } from '../config';
 import { VCObserverNOOP } from './no-op-vc-observer';
 import { VCObserver } from './vc-observer';
@@ -17,22 +16,13 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, VCObserverWrapper);
     this.newVCObserver = null;
-    if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-      this.oldVCObserver = null;
-      if (isVCRevisionEnabled('fy25.03')) {
-        this.newVCObserver = new VCObserverNew({
-          selectorConfig: opts.selectorConfig
-        });
-      }
-      if (isVCRevisionEnabled('fy25.01') || isVCRevisionEnabled('fy25.02')) {
-        this.oldVCObserver = new VCObserver(opts);
-      }
-    } else {
-      if (isVCRevisionEnabled('fy25.03')) {
-        this.newVCObserver = new VCObserverNew({
-          selectorConfig: opts.selectorConfig
-        });
-      }
+    this.oldVCObserver = null;
+    if (isVCRevisionEnabled('fy25.03')) {
+      this.newVCObserver = new VCObserverNew({
+        selectorConfig: opts.selectorConfig
+      });
+    }
+    if (isVCRevisionEnabled('fy25.01') || isVCRevisionEnabled('fy25.02')) {
       this.oldVCObserver = new VCObserver(opts);
     }
   }
@@ -41,25 +31,15 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     value: function start(_ref) {
       var startTime = _ref.startTime,
         experienceKey = _ref.experienceKey;
-      if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-        if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
-          var _this$oldVCObserver;
-          (_this$oldVCObserver = this.oldVCObserver) === null || _this$oldVCObserver === void 0 || _this$oldVCObserver.start({
-            startTime: startTime
-          });
-        }
-        if (isVCRevisionEnabled('fy25.03', experienceKey)) {
-          var _this$newVCObserver;
-          (_this$newVCObserver = this.newVCObserver) === null || _this$newVCObserver === void 0 || _this$newVCObserver.start({
-            startTime: startTime
-          });
-        }
-      } else {
-        var _this$oldVCObserver2, _this$newVCObserver2;
-        (_this$oldVCObserver2 = this.oldVCObserver) === null || _this$oldVCObserver2 === void 0 || _this$oldVCObserver2.start({
+      if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
+        var _this$oldVCObserver;
+        (_this$oldVCObserver = this.oldVCObserver) === null || _this$oldVCObserver === void 0 || _this$oldVCObserver.start({
           startTime: startTime
         });
-        (_this$newVCObserver2 = this.newVCObserver) === null || _this$newVCObserver2 === void 0 || _this$newVCObserver2.start({
+      }
+      if (isVCRevisionEnabled('fy25.03', experienceKey)) {
+        var _this$newVCObserver;
+        (_this$newVCObserver = this.newVCObserver) === null || _this$newVCObserver === void 0 || _this$newVCObserver.start({
           startTime: startTime
         });
       }
@@ -67,104 +47,72 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop(experienceKey) {
-      if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
-        if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
-          var _this$oldVCObserver3;
-          (_this$oldVCObserver3 = this.oldVCObserver) === null || _this$oldVCObserver3 === void 0 || _this$oldVCObserver3.stop();
-        }
-        if (isVCRevisionEnabled('fy25.03', experienceKey)) {
-          var _this$newVCObserver3;
-          (_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 || _this$newVCObserver3.stop();
-        }
-      } else {
-        var _this$oldVCObserver4, _this$newVCObserver4;
-        (_this$oldVCObserver4 = this.oldVCObserver) === null || _this$oldVCObserver4 === void 0 || _this$oldVCObserver4.stop();
-        (_this$newVCObserver4 = this.newVCObserver) === null || _this$newVCObserver4 === void 0 || _this$newVCObserver4.stop();
+      if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
+        var _this$oldVCObserver2;
+        (_this$oldVCObserver2 = this.oldVCObserver) === null || _this$oldVCObserver2 === void 0 || _this$oldVCObserver2.stop();
+      }
+      if (isVCRevisionEnabled('fy25.03', experienceKey)) {
+        var _this$newVCObserver2;
+        (_this$newVCObserver2 = this.newVCObserver) === null || _this$newVCObserver2 === void 0 || _this$newVCObserver2.stop();
       }
     }
   }, {
     key: "getVCRawData",
     value: function getVCRawData() {
-      var _this$oldVCObserver$g, _this$oldVCObserver5;
-      return (_this$oldVCObserver$g = (_this$oldVCObserver5 = this.oldVCObserver) === null || _this$oldVCObserver5 === void 0 ? void 0 : _this$oldVCObserver5.getVCRawData()) !== null && _this$oldVCObserver$g !== void 0 ? _this$oldVCObserver$g : null;
+      var _this$oldVCObserver$g, _this$oldVCObserver3;
+      return (_this$oldVCObserver$g = (_this$oldVCObserver3 = this.oldVCObserver) === null || _this$oldVCObserver3 === void 0 ? void 0 : _this$oldVCObserver3.getVCRawData()) !== null && _this$oldVCObserver$g !== void 0 ? _this$oldVCObserver$g : null;
     }
   }, {
     key: "getVCResult",
     value: function () {
       var _getVCResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-        var _this$oldVCObserver6, _this$newVCObserver5, _ref2, experienceKey, v1v2Result, v3Result, _this$oldVCObserver7, _this$newVCObserver6, _ref3, oldResult, newResult;
+        var _this$oldVCObserver4, _this$newVCObserver3, _ref2;
+        var experienceKey, v1v2Result, v3Result;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!fg('platform_ufo_vc_enable_revisions_by_experience')) {
-                _context.next = 23;
-                break;
-              }
               experienceKey = param.experienceKey;
               if (!(isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey))) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
-              _context.next = 5;
-              return (_this$oldVCObserver6 = this.oldVCObserver) === null || _this$oldVCObserver6 === void 0 ? void 0 : _this$oldVCObserver6.getVCResult(param);
-            case 5:
+              _context.next = 4;
+              return (_this$oldVCObserver4 = this.oldVCObserver) === null || _this$oldVCObserver4 === void 0 ? void 0 : _this$oldVCObserver4.getVCResult(param);
+            case 4:
               _context.t0 = _context.sent;
-              _context.next = 9;
+              _context.next = 8;
               break;
-            case 8:
+            case 7:
               _context.t0 = {};
-            case 9:
+            case 8:
               v1v2Result = _context.t0;
               if (!isVCRevisionEnabled('fy25.03', experienceKey)) {
-                _context.next = 16;
+                _context.next = 15;
                 break;
               }
-              _context.next = 13;
-              return (_this$newVCObserver5 = this.newVCObserver) === null || _this$newVCObserver5 === void 0 ? void 0 : _this$newVCObserver5.getVCResult({
+              _context.next = 12;
+              return (_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 ? void 0 : _this$newVCObserver3.getVCResult({
                 start: param.start,
-                stop: param.stop,
-                interactionId: param.interactionId
+                stop: param.stop
               });
-            case 13:
+            case 12:
               _context.t1 = _context.sent;
-              _context.next = 17;
+              _context.next = 16;
               break;
-            case 16:
+            case 15:
               _context.t1 = [];
-            case 17:
+            case 16:
               v3Result = _context.t1;
               if (v3Result) {
-                _context.next = 20;
+                _context.next = 19;
                 break;
               }
               return _context.abrupt("return", v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {});
-            case 20:
+            case 19:
               return _context.abrupt("return", _objectSpread(_objectSpread({}, v1v2Result), {}, {
                 'ufo:vc:rev': [].concat(_toConsumableArray((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), _toConsumableArray(v3Result !== null && v3Result !== void 0 ? v3Result : []))
               }));
-            case 23:
-              _context.next = 25;
-              return (_this$oldVCObserver7 = this.oldVCObserver) === null || _this$oldVCObserver7 === void 0 ? void 0 : _this$oldVCObserver7.getVCResult(param);
-            case 25:
-              oldResult = _context.sent;
-              _context.next = 28;
-              return (_this$newVCObserver6 = this.newVCObserver) === null || _this$newVCObserver6 === void 0 ? void 0 : _this$newVCObserver6.getVCResult({
-                start: param.start,
-                stop: param.stop,
-                interactionId: param.interactionId
-              });
-            case 28:
-              newResult = _context.sent;
-              if (!(oldResult && !newResult)) {
-                _context.next = 31;
-                break;
-              }
-              return _context.abrupt("return", oldResult);
-            case 31:
-              return _context.abrupt("return", _objectSpread(_objectSpread({}, oldResult !== null && oldResult !== void 0 ? oldResult : {}), {}, {
-                'ufo:vc:rev': [].concat(_toConsumableArray((_ref3 = oldResult === null || oldResult === void 0 ? void 0 : oldResult['ufo:vc:rev']) !== null && _ref3 !== void 0 ? _ref3 : []), _toConsumableArray(newResult !== null && newResult !== void 0 ? newResult : []))
-              }));
-            case 32:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -178,20 +126,20 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
   }, {
     key: "setSSRElement",
     value: function setSSRElement(element) {
-      var _this$oldVCObserver8;
-      (_this$oldVCObserver8 = this.oldVCObserver) === null || _this$oldVCObserver8 === void 0 || _this$oldVCObserver8.setSSRElement(element);
+      var _this$oldVCObserver5;
+      (_this$oldVCObserver5 = this.oldVCObserver) === null || _this$oldVCObserver5 === void 0 || _this$oldVCObserver5.setSSRElement(element);
     }
   }, {
     key: "setReactRootRenderStart",
     value: function setReactRootRenderStart(startTime) {
-      var _this$oldVCObserver9;
-      (_this$oldVCObserver9 = this.oldVCObserver) === null || _this$oldVCObserver9 === void 0 || _this$oldVCObserver9.setReactRootRenderStart(startTime || performance.now());
+      var _this$oldVCObserver6;
+      (_this$oldVCObserver6 = this.oldVCObserver) === null || _this$oldVCObserver6 === void 0 || _this$oldVCObserver6.setReactRootRenderStart(startTime || performance.now());
     }
   }, {
     key: "setReactRootRenderStop",
     value: function setReactRootRenderStop(stopTime) {
-      var _this$oldVCObserver10;
-      (_this$oldVCObserver10 = this.oldVCObserver) === null || _this$oldVCObserver10 === void 0 || _this$oldVCObserver10.setReactRootRenderStop(stopTime || performance.now());
+      var _this$oldVCObserver7;
+      (_this$oldVCObserver7 = this.oldVCObserver) === null || _this$oldVCObserver7 === void 0 || _this$oldVCObserver7.setReactRootRenderStop(stopTime || performance.now());
     }
   }]);
 }();