@atlaskit/react-ufo 4.17.1 → 5.0.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 5.0.0
+
+### Major Changes
+
+- [`f06d1289b0fbd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f06d1289b0fbd) -
+  Decouple fy26.04 and vcNext TTVC revisions, default revision to be fy26.04
+
 ## 4.17.1
 
 ### Patch Changes

package/dist/cjs/vc/index.js

@@ -14,7 +14,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../config");
 var _noOpVcObserver = require("./no-op-vc-observer");
 var _vcObserver = require("./vc-observer");
@@ -36,8 +35,7 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
     this.ssrPlaceholderHandler = new _ssrPlaceholders.SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    var ttvcV4RevisionName = (0, _platformFeatureFlags.fg)('platform_ufo_vcnext_to_fy26_04_revision_update') ? 'fy26.04' : 'next';
-    if ((0, _config.isVCRevisionEnabled)('fy25.03') || (0, _config.isVCRevisionEnabled)(ttvcV4RevisionName)) {
+    if ((0, _config.isVCRevisionEnabled)('fy25.03') || (0, _config.isVCRevisionEnabled)('fy26.04')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new _vcObserverNew.default({
         selectorConfig: opts.selectorConfig,

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

@@ -18,13 +18,16 @@ var _interactionMetrics = require("../../interaction-metrics");
 var _ssrPlaceholders = require("../vc-observer/observers/ssr-placeholders");
 var _entriesTimeline = _interopRequireDefault(require("./entries-timeline"));
 var _getElementName2 = _interopRequireDefault(require("./get-element-name"));
-var _fy25_2 = _interopRequireDefault(require("./metric-calculator/fy25_03"));
+var _fy25_ = _interopRequireDefault(require("./metric-calculator/fy25_03"));
 var _fy26_ = _interopRequireDefault(require("./metric-calculator/fy26_04"));
 var _getViewportHeight = _interopRequireDefault(require("./metric-calculator/utils/get-viewport-height"));
 var _getViewportWidth = _interopRequireDefault(require("./metric-calculator/utils/get-viewport-width"));
+var _vcNext2 = _interopRequireDefault(require("./metric-calculator/vc-next"));
 var _rawDataHandler = _interopRequireDefault(require("./raw-data-handler"));
 var _viewportObserver = _interopRequireDefault(require("./viewport-observer"));
 var _windowEventObserver = _interopRequireDefault(require("./window-event-observer"));
+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) { (0, _defineProperty2.default)(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; }
 var SSRState = {
   normal: 1,
   waitingForFirstRender: 2,
@@ -250,7 +253,7 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
     key: "getVCResult",
     value: function () {
       var _getVCResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(param) {
-        var start, stop, interactionId, interactionType, interactionAbortReason, isPageVisible, include3p, includeSSRRatio, excludeSmartAnswersInSearch, includeRawData, rawDataStopTime, results, feVCCalculationStartTime, calculator_fy25_03, orderedEntries, fy25_03, calculator_fy26_04, fy26_04, vcNext, _fy25_, calculator_next, _vcNext, feVCCalculationEndTime, rawVCCalculationStartTime, rawHandler, rawStopTime, rawOrderedEntries, raw;
+        var start, stop, interactionId, interactionType, interactionAbortReason, isPageVisible, include3p, includeSSRRatio, excludeSmartAnswersInSearch, includeRawData, rawDataStopTime, results, feVCCalculationStartTime, calculator_fy25_03, orderedEntries, fy25_03, calculator_fy26_04, fy26_04, calculator_next, vcNext, _vcNext, feVCCalculationEndTime, rawVCCalculationStartTime, rawHandler, rawStopTime, rawOrderedEntries, raw;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -258,7 +261,7 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
               results = [];
               this.addStartEntry(start);
               feVCCalculationStartTime = performance.now();
-              calculator_fy25_03 = new _fy25_2.default();
+              calculator_fy25_03 = new _fy25_.default();
               if (param.includeSSRInV3 && param.ssr) {
                 this.addSSR(param.ssr);
               }
@@ -266,15 +269,11 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 start: start,
                 stop: stop
               });
-              if (!(0, _platformFeatureFlags.fg)('platform_ufo_vcnext_to_fy26_04_revision_update')) {
-                _context.next = 30;
-                break;
-              }
               if (!(0, _config.isVCRevisionEnabled)('fy25.03')) {
-                _context.next = 14;
+                _context.next = 13;
                 break;
               }
-              _context.next = 11;
+              _context.next = 10;
               return calculator_fy25_03.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -288,13 +287,13 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 11:
+            case 10:
               _context.t0 = _context.sent;
-              _context.next = 15;
+              _context.next = 14;
               break;
-            case 14:
+            case 13:
               _context.t0 = null;
-            case 15:
+            case 14:
               fy25_03 = _context.t0;
               if (fy25_03) {
                 results.push(fy25_03);
@@ -306,11 +305,11 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 this.addSSR(param.ssr);
               }
               calculator_fy26_04 = new _fy26_.default();
-              if (!((0, _config.isVCRevisionEnabled)('fy26.04') || (0, _config.isVCRevisionEnabled)('next'))) {
-                _context.next = 25;
+              if (!(0, _config.isVCRevisionEnabled)('fy26.04')) {
+                _context.next = 24;
                 break;
               }
-              _context.next = 22;
+              _context.next = 21;
               return calculator_fy26_04.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -324,53 +323,29 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 22:
+            case 21:
               _context.t1 = _context.sent;
-              _context.next = 26;
+              _context.next = 25;
               break;
-            case 25:
+            case 24:
               _context.t1 = null;
-            case 26:
+            case 25:
               fy26_04 = _context.t1;
-              if (fy26_04) {
-                vcNext = {
-                  revision: 'next',
-                  'metric:vc90': fy26_04['metric:vc90'],
-                  clean: fy26_04['clean']
-                };
-                results.push(fy26_04);
-                results.push(vcNext);
+              if (!fy26_04) {
+                _context.next = 43;
+                break;
               }
-              _context.next = 40;
-              break;
-            case 30:
-              _context.next = 32;
-              return calculator_fy25_03.calculate({
-                orderedEntries: orderedEntries,
-                startTime: start,
-                stopTime: stop,
-                interactionId: interactionId,
-                interactionType: interactionType,
-                isPostInteraction: this.isPostInteraction,
-                include3p: include3p,
-                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
-                includeSSRRatio: includeSSRRatio,
-                isPageVisible: isPageVisible,
-                interactionAbortReason: interactionAbortReason
-              });
-            case 32:
-              _fy25_ = _context.sent;
-              if (_fy25_) {
-                results.push(_fy25_);
+              results.push(fy26_04);
+              if (!(0, _platformFeatureFlags.fg)('platform_ufo_vcnext_for_ttvc_v5')) {
+                _context.next = 41;
+                break;
               }
-
-              // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
-              // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
-              if (param.ssr && !param.includeSSRInV3 && (0, _platformFeatureFlags.fg)('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
-                this.addSSR(param.ssr);
+              calculator_next = new _vcNext2.default();
+              if (!(0, _config.isVCRevisionEnabled)('next')) {
+                _context.next = 36;
+                break;
               }
-              calculator_next = new _fy26_.default();
-              _context.next = 38;
+              _context.next = 33;
               return calculator_next.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -379,20 +354,33 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 interactionType: interactionType,
                 isPostInteraction: this.isPostInteraction,
                 include3p: include3p,
+                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
                 includeSSRRatio: includeSSRRatio,
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 38:
-              _vcNext = _context.sent;
-              if (_vcNext) {
-                _vcNext.revision = 'next';
-                results.push(_vcNext);
+            case 33:
+              _context.t2 = _context.sent;
+              _context.next = 37;
+              break;
+            case 36:
+              _context.t2 = null;
+            case 37:
+              vcNext = _context.t2;
+              if (vcNext) {
+                results.push(vcNext);
               }
-            case 40:
+              _context.next = 43;
+              break;
+            case 41:
+              _vcNext = _objectSpread(_objectSpread({}, fy26_04), {}, {
+                revision: 'next'
+              });
+              results.push(_vcNext);
+            case 43:
               feVCCalculationEndTime = performance.now();
               if (!(includeRawData && (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_raw_data'))) {
-                _context.next = 51;
+                _context.next = 54;
                 break;
               }
               rawVCCalculationStartTime = performance.now();
@@ -402,14 +390,14 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 start: start,
                 stop: rawStopTime
               }) : orderedEntries;
-              _context.next = 48;
+              _context.next = 51;
               return rawHandler.getRawData({
                 entries: rawOrderedEntries,
                 startTime: start,
                 stopTime: rawStopTime,
                 isPageVisible: isPageVisible
               });
-            case 48:
+            case 51:
               raw = _context.sent;
               results.forEach(function (result) {
                 delete result.vcDetails;
@@ -420,9 +408,9 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 raw.feVCTime = Number((feVCCalculationEndTime - feVCCalculationStartTime).toFixed(2));
                 results.push(raw);
               }
-            case 51:
+            case 54:
               return _context.abrupt("return", results);
-            case 52:
+            case 55:
             case "end":
               return _context.stop();
           }

package/dist/cjs/vc/vc-observer-new/metric-calculator/fy26_04/index.js

@@ -33,8 +33,9 @@ var fy26_04_excluded_attributes = ['data-is-hovered' // non-visual attribute
 ];
 var VCCalculator_FY26_04 = exports.default = /*#__PURE__*/function (_VCCalculator_FY25_) {
   function VCCalculator_FY26_04() {
+    var revisionNo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'fy26.04';
     (0, _classCallCheck2.default)(this, VCCalculator_FY26_04);
-    return _callSuper(this, VCCalculator_FY26_04, ['fy26.04']);
+    return _callSuper(this, VCCalculator_FY26_04, [revisionNo]);
   }
   (0, _inherits2.default)(VCCalculator_FY26_04, _VCCalculator_FY25_);
   return (0, _createClass2.default)(VCCalculator_FY26_04, [{

package/dist/cjs/vc/vc-observer-new/metric-calculator/vc-next/index.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _fy26_ = _interopRequireDefault(require("../fy26_04"));
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+var getConsideredEntryTypes = function getConsideredEntryTypes() {
+  var consideredEntryTypes = [];
+  return consideredEntryTypes;
+};
+var getExcludedEntryTypes = function getExcludedEntryTypes() {
+  var excludedEntryTypes = [];
+  return excludedEntryTypes;
+};
+var VCCalculator_Next = exports.default = /*#__PURE__*/function (_VCCalculator_FY26_) {
+  function VCCalculator_Next() {
+    (0, _classCallCheck2.default)(this, VCCalculator_Next);
+    return _callSuper(this, VCCalculator_Next, ['next']);
+  }
+  (0, _inherits2.default)(VCCalculator_Next, _VCCalculator_FY26_);
+  return (0, _createClass2.default)(VCCalculator_Next, [{
+    key: "isEntryIncluded",
+    value: function isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch) {
+      var isEntryIncludedInV4 = _superPropGet(VCCalculator_Next, "isEntryIncluded", this, 3)([entry, include3p, excludeSmartAnswersInSearch]);
+      if (isEntryIncludedInV4 && !getExcludedEntryTypes().includes(entry.data.type)) {
+        return true;
+      }
+      return getConsideredEntryTypes().includes(entry.data.type);
+    }
+  }]);
+}(_fy26_.default);

package/dist/es2019/vc/index.js

@@ -1,5 +1,4 @@
 var _process, _process$env;
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isVCRevisionEnabled } from '../config';
 import { VCObserverNOOP } from './no-op-vc-observer';
 import { VCObserver } from './vc-observer';
@@ -16,8 +15,7 @@ export class VCObserverWrapper {
     this.ssrPlaceholderHandler = new SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    const ttvcV4RevisionName = fg('platform_ufo_vcnext_to_fy26_04_revision_update') ? 'fy26.04' : 'next';
-    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled(ttvcV4RevisionName)) {
+    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled('fy26.04')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new VCObserverNew({
         selectorConfig: opts.selectorConfig,

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

@@ -9,6 +9,7 @@ import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
 import VCCalculator_FY26_04 from './metric-calculator/fy26_04';
 import getViewportHeight from './metric-calculator/utils/get-viewport-height';
 import getViewportWidth from './metric-calculator/utils/get-viewport-width';
+import VCCalculator_Next from './metric-calculator/vc-next';
 import RawDataHandler from './raw-data-handler';
 import ViewportObserver from './viewport-observer';
 import WindowEventObserver from './window-event-observer';
@@ -228,90 +229,67 @@ export default class VCObserverNew {
       start,
       stop
     });
-    if (fg('platform_ufo_vcnext_to_fy26_04_revision_update')) {
-      const fy25_03 = isVCRevisionEnabled('fy25.03') ? await calculator_fy25_03.calculate({
-        orderedEntries,
-        startTime: start,
-        stopTime: stop,
-        interactionId,
-        interactionType,
-        isPostInteraction: this.isPostInteraction,
-        include3p,
-        excludeSmartAnswersInSearch,
-        includeSSRRatio,
-        isPageVisible,
-        interactionAbortReason
-      }) : null;
-      if (fy25_03) {
-        results.push(fy25_03);
-      }
+    const fy25_03 = isVCRevisionEnabled('fy25.03') ? await calculator_fy25_03.calculate({
+      orderedEntries,
+      startTime: start,
+      stopTime: stop,
+      interactionId,
+      interactionType,
+      isPostInteraction: this.isPostInteraction,
+      include3p,
+      excludeSmartAnswersInSearch,
+      includeSSRRatio,
+      isPageVisible,
+      interactionAbortReason
+    }) : null;
+    if (fy25_03) {
+      results.push(fy25_03);
+    }
 
-      // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
-      // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
-      if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
-        this.addSSR(param.ssr);
-      }
-      const calculator_fy26_04 = new VCCalculator_FY26_04();
-      const fy26_04 = isVCRevisionEnabled('fy26.04') || isVCRevisionEnabled('next') ? await calculator_fy26_04.calculate({
-        orderedEntries,
-        startTime: start,
-        stopTime: stop,
-        interactionId,
-        interactionType,
-        isPostInteraction: this.isPostInteraction,
-        include3p,
-        excludeSmartAnswersInSearch,
-        includeSSRRatio,
-        isPageVisible,
-        interactionAbortReason
-      }) : null;
-      if (fy26_04) {
+    // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
+    // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
+    if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
+      this.addSSR(param.ssr);
+    }
+    const calculator_fy26_04 = new VCCalculator_FY26_04();
+    const fy26_04 = isVCRevisionEnabled('fy26.04') ? await calculator_fy26_04.calculate({
+      orderedEntries,
+      startTime: start,
+      stopTime: stop,
+      interactionId,
+      interactionType,
+      isPostInteraction: this.isPostInteraction,
+      include3p,
+      excludeSmartAnswersInSearch,
+      includeSSRRatio,
+      isPageVisible,
+      interactionAbortReason
+    }) : null;
+    if (fy26_04) {
+      results.push(fy26_04);
+      if (fg('platform_ufo_vcnext_for_ttvc_v5')) {
+        const calculator_next = new VCCalculator_Next();
+        const vcNext = isVCRevisionEnabled('next') ? await calculator_next.calculate({
+          orderedEntries,
+          startTime: start,
+          stopTime: stop,
+          interactionId,
+          interactionType,
+          isPostInteraction: this.isPostInteraction,
+          include3p,
+          excludeSmartAnswersInSearch,
+          includeSSRRatio,
+          isPageVisible,
+          interactionAbortReason
+        }) : null;
+        if (vcNext) {
+          results.push(vcNext);
+        }
+      } else {
         const vcNext = {
-          revision: 'next',
-          'metric:vc90': fy26_04['metric:vc90'],
-          clean: fy26_04['clean']
+          ...fy26_04,
+          revision: 'next'
         };
-        results.push(fy26_04);
-        results.push(vcNext);
-      }
-    } else {
-      const fy25_03 = await calculator_fy25_03.calculate({
-        orderedEntries,
-        startTime: start,
-        stopTime: stop,
-        interactionId,
-        interactionType,
-        isPostInteraction: this.isPostInteraction,
-        include3p,
-        excludeSmartAnswersInSearch,
-        includeSSRRatio,
-        isPageVisible,
-        interactionAbortReason
-      });
-      if (fy25_03) {
-        results.push(fy25_03);
-      }
-
-      // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
-      // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
-      if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
-        this.addSSR(param.ssr);
-      }
-      const calculator_next = new VCCalculator_FY26_04();
-      const vcNext = await calculator_next.calculate({
-        orderedEntries,
-        startTime: start,
-        stopTime: stop,
-        interactionId,
-        interactionType,
-        isPostInteraction: this.isPostInteraction,
-        include3p,
-        includeSSRRatio,
-        isPageVisible,
-        interactionAbortReason
-      });
-      if (vcNext) {
-        vcNext.revision = 'next';
         results.push(vcNext);
       }
     }

package/dist/es2019/vc/vc-observer-new/metric-calculator/fy26_04/index.js

@@ -16,8 +16,8 @@ const getExcludedEntryTypes = () => {
 const fy26_04_excluded_attributes = ['data-is-hovered' // non-visual attribute
 ];
 export default class VCCalculator_FY26_04 extends VCCalculator_FY25_03 {
-  constructor() {
-    super('fy26.04');
+  constructor(revisionNo = 'fy26.04') {
+    super(revisionNo);
   }
   isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch) {
     const isEntryIncludedInV3 = super.isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch);

package/dist/es2019/vc/vc-observer-new/metric-calculator/vc-next/index.js

@@ -0,0 +1,21 @@
+import VCCalculator_FY26_04 from "../fy26_04";
+const getConsideredEntryTypes = () => {
+  const consideredEntryTypes = [];
+  return consideredEntryTypes;
+};
+const getExcludedEntryTypes = () => {
+  const excludedEntryTypes = [];
+  return excludedEntryTypes;
+};
+export default class VCCalculator_Next extends VCCalculator_FY26_04 {
+  constructor() {
+    super('next');
+  }
+  isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch) {
+    const isEntryIncludedInV4 = super.isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch);
+    if (isEntryIncludedInV4 && !getExcludedEntryTypes().includes(entry.data.type)) {
+      return true;
+    }
+    return getConsideredEntryTypes().includes(entry.data.type);
+  }
+}

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';
@@ -26,8 +25,7 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     this.ssrPlaceholderHandler = new SSRPlaceholderHandlers({
       enablePageLayoutPlaceholder: (_opts$ssrEnablePageLa = opts.ssrEnablePageLayoutPlaceholder) !== null && _opts$ssrEnablePageLa !== void 0 ? _opts$ssrEnablePageLa : false
     });
-    var ttvcV4RevisionName = fg('platform_ufo_vcnext_to_fy26_04_revision_update') ? 'fy26.04' : 'next';
-    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled(ttvcV4RevisionName)) {
+    if (isVCRevisionEnabled('fy25.03') || isVCRevisionEnabled('fy26.04')) {
       var _opts$ssrEnablePageLa2;
       this.newVCObserver = new VCObserverNew({
         selectorConfig: opts.selectorConfig,

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

@@ -5,6 +5,8 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { getActiveInteraction } from '../../interaction-metrics';
@@ -15,6 +17,7 @@ import VCCalculator_FY25_03 from './metric-calculator/fy25_03';
 import VCCalculator_FY26_04 from './metric-calculator/fy26_04';
 import getViewportHeight from './metric-calculator/utils/get-viewport-height';
 import getViewportWidth from './metric-calculator/utils/get-viewport-width';
+import VCCalculator_Next from './metric-calculator/vc-next';
 import RawDataHandler from './raw-data-handler';
 import ViewportObserver from './viewport-observer';
 import WindowEventObserver from './window-event-observer';
@@ -243,7 +246,7 @@ var VCObserverNew = /*#__PURE__*/function () {
     key: "getVCResult",
     value: function () {
       var _getVCResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-        var start, stop, interactionId, interactionType, interactionAbortReason, isPageVisible, include3p, includeSSRRatio, excludeSmartAnswersInSearch, includeRawData, rawDataStopTime, results, feVCCalculationStartTime, calculator_fy25_03, orderedEntries, fy25_03, calculator_fy26_04, fy26_04, vcNext, _fy25_, calculator_next, _vcNext, feVCCalculationEndTime, rawVCCalculationStartTime, rawHandler, rawStopTime, rawOrderedEntries, raw;
+        var start, stop, interactionId, interactionType, interactionAbortReason, isPageVisible, include3p, includeSSRRatio, excludeSmartAnswersInSearch, includeRawData, rawDataStopTime, results, feVCCalculationStartTime, calculator_fy25_03, orderedEntries, fy25_03, calculator_fy26_04, fy26_04, calculator_next, vcNext, _vcNext, feVCCalculationEndTime, rawVCCalculationStartTime, rawHandler, rawStopTime, rawOrderedEntries, raw;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -259,15 +262,11 @@ var VCObserverNew = /*#__PURE__*/function () {
                 start: start,
                 stop: stop
               });
-              if (!fg('platform_ufo_vcnext_to_fy26_04_revision_update')) {
-                _context.next = 30;
-                break;
-              }
               if (!isVCRevisionEnabled('fy25.03')) {
-                _context.next = 14;
+                _context.next = 13;
                 break;
               }
-              _context.next = 11;
+              _context.next = 10;
               return calculator_fy25_03.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -281,13 +280,13 @@ var VCObserverNew = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 11:
+            case 10:
               _context.t0 = _context.sent;
-              _context.next = 15;
+              _context.next = 14;
               break;
-            case 14:
+            case 13:
               _context.t0 = null;
-            case 15:
+            case 14:
               fy25_03 = _context.t0;
               if (fy25_03) {
                 results.push(fy25_03);
@@ -299,11 +298,11 @@ var VCObserverNew = /*#__PURE__*/function () {
                 this.addSSR(param.ssr);
               }
               calculator_fy26_04 = new VCCalculator_FY26_04();
-              if (!(isVCRevisionEnabled('fy26.04') || isVCRevisionEnabled('next'))) {
-                _context.next = 25;
+              if (!isVCRevisionEnabled('fy26.04')) {
+                _context.next = 24;
                 break;
               }
-              _context.next = 22;
+              _context.next = 21;
               return calculator_fy26_04.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -317,53 +316,29 @@ var VCObserverNew = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 22:
+            case 21:
               _context.t1 = _context.sent;
-              _context.next = 26;
+              _context.next = 25;
               break;
-            case 25:
+            case 24:
               _context.t1 = null;
-            case 26:
+            case 25:
               fy26_04 = _context.t1;
-              if (fy26_04) {
-                vcNext = {
-                  revision: 'next',
-                  'metric:vc90': fy26_04['metric:vc90'],
-                  clean: fy26_04['clean']
-                };
-                results.push(fy26_04);
-                results.push(vcNext);
+              if (!fy26_04) {
+                _context.next = 43;
+                break;
               }
-              _context.next = 40;
-              break;
-            case 30:
-              _context.next = 32;
-              return calculator_fy25_03.calculate({
-                orderedEntries: orderedEntries,
-                startTime: start,
-                stopTime: stop,
-                interactionId: interactionId,
-                interactionType: interactionType,
-                isPostInteraction: this.isPostInteraction,
-                include3p: include3p,
-                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
-                includeSSRRatio: includeSSRRatio,
-                isPageVisible: isPageVisible,
-                interactionAbortReason: interactionAbortReason
-              });
-            case 32:
-              _fy25_ = _context.sent;
-              if (_fy25_) {
-                results.push(_fy25_);
+              results.push(fy26_04);
+              if (!fg('platform_ufo_vcnext_for_ttvc_v5')) {
+                _context.next = 41;
+                break;
               }
-
-              // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
-              // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
-              if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
-                this.addSSR(param.ssr);
+              calculator_next = new VCCalculator_Next();
+              if (!isVCRevisionEnabled('next')) {
+                _context.next = 36;
+                break;
               }
-              calculator_next = new VCCalculator_FY26_04();
-              _context.next = 38;
+              _context.next = 33;
               return calculator_next.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -372,20 +347,33 @@ var VCObserverNew = /*#__PURE__*/function () {
                 interactionType: interactionType,
                 isPostInteraction: this.isPostInteraction,
                 include3p: include3p,
+                excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
                 includeSSRRatio: includeSSRRatio,
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 38:
-              _vcNext = _context.sent;
-              if (_vcNext) {
-                _vcNext.revision = 'next';
-                results.push(_vcNext);
+            case 33:
+              _context.t2 = _context.sent;
+              _context.next = 37;
+              break;
+            case 36:
+              _context.t2 = null;
+            case 37:
+              vcNext = _context.t2;
+              if (vcNext) {
+                results.push(vcNext);
               }
-            case 40:
+              _context.next = 43;
+              break;
+            case 41:
+              _vcNext = _objectSpread(_objectSpread({}, fy26_04), {}, {
+                revision: 'next'
+              });
+              results.push(_vcNext);
+            case 43:
               feVCCalculationEndTime = performance.now();
               if (!(includeRawData && fg('platform_ufo_enable_vc_raw_data'))) {
-                _context.next = 51;
+                _context.next = 54;
                 break;
               }
               rawVCCalculationStartTime = performance.now();
@@ -395,14 +383,14 @@ var VCObserverNew = /*#__PURE__*/function () {
                 start: start,
                 stop: rawStopTime
               }) : orderedEntries;
-              _context.next = 48;
+              _context.next = 51;
               return rawHandler.getRawData({
                 entries: rawOrderedEntries,
                 startTime: start,
                 stopTime: rawStopTime,
                 isPageVisible: isPageVisible
               });
-            case 48:
+            case 51:
               raw = _context.sent;
               results.forEach(function (result) {
                 delete result.vcDetails;
@@ -413,9 +401,9 @@ var VCObserverNew = /*#__PURE__*/function () {
                 raw.feVCTime = Number((feVCCalculationEndTime - feVCCalculationStartTime).toFixed(2));
                 results.push(raw);
               }
-            case 51:
+            case 54:
               return _context.abrupt("return", results);
-            case 52:
+            case 55:
             case "end":
               return _context.stop();
           }

package/dist/esm/vc/vc-observer-new/metric-calculator/fy26_04/index.js

@@ -26,8 +26,9 @@ var fy26_04_excluded_attributes = ['data-is-hovered' // non-visual attribute
 ];
 var VCCalculator_FY26_04 = /*#__PURE__*/function (_VCCalculator_FY25_) {
   function VCCalculator_FY26_04() {
+    var revisionNo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'fy26.04';
     _classCallCheck(this, VCCalculator_FY26_04);
-    return _callSuper(this, VCCalculator_FY26_04, ['fy26.04']);
+    return _callSuper(this, VCCalculator_FY26_04, [revisionNo]);
   }
   _inherits(VCCalculator_FY26_04, _VCCalculator_FY25_);
   return _createClass(VCCalculator_FY26_04, [{

package/dist/esm/vc/vc-observer-new/metric-calculator/vc-next/index.js

@@ -0,0 +1,36 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _get from "@babel/runtime/helpers/get";
+import _inherits from "@babel/runtime/helpers/inherits";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+import VCCalculator_FY26_04 from "../fy26_04";
+var getConsideredEntryTypes = function getConsideredEntryTypes() {
+  var consideredEntryTypes = [];
+  return consideredEntryTypes;
+};
+var getExcludedEntryTypes = function getExcludedEntryTypes() {
+  var excludedEntryTypes = [];
+  return excludedEntryTypes;
+};
+var VCCalculator_Next = /*#__PURE__*/function (_VCCalculator_FY26_) {
+  function VCCalculator_Next() {
+    _classCallCheck(this, VCCalculator_Next);
+    return _callSuper(this, VCCalculator_Next, ['next']);
+  }
+  _inherits(VCCalculator_Next, _VCCalculator_FY26_);
+  return _createClass(VCCalculator_Next, [{
+    key: "isEntryIncluded",
+    value: function isEntryIncluded(entry, include3p, excludeSmartAnswersInSearch) {
+      var isEntryIncludedInV4 = _superPropGet(VCCalculator_Next, "isEntryIncluded", this, 3)([entry, include3p, excludeSmartAnswersInSearch]);
+      if (isEntryIncludedInV4 && !getExcludedEntryTypes().includes(entry.data.type)) {
+        return true;
+      }
+      return getConsideredEntryTypes().includes(entry.data.type);
+    }
+  }]);
+}(VCCalculator_FY26_04);
+export { VCCalculator_Next as default };

package/dist/types/vc/vc-observer-new/metric-calculator/fy26_04/index.d.ts

@@ -1,6 +1,6 @@
 import type { VCObserverEntry } from '../../types';
 import VCCalculator_FY25_03 from '../fy25_03';
 export default class VCCalculator_FY26_04 extends VCCalculator_FY25_03 {
-    constructor();
+    constructor(revisionNo?: string);
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean, excludeSmartAnswersInSearch?: boolean): boolean;
 }

package/dist/types/vc/vc-observer-new/metric-calculator/vc-next/index.d.ts

@@ -0,0 +1,6 @@
+import type { VCObserverEntry } from "../../types";
+import VCCalculator_FY26_04 from "../fy26_04";
+export default class VCCalculator_Next extends VCCalculator_FY26_04 {
+    constructor();
+    protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean, excludeSmartAnswersInSearch?: boolean): boolean;
+}

package/dist/types-ts4.5/vc/vc-observer-new/metric-calculator/fy26_04/index.d.ts

@@ -1,6 +1,6 @@
 import type { VCObserverEntry } from '../../types';
 import VCCalculator_FY25_03 from '../fy25_03';
 export default class VCCalculator_FY26_04 extends VCCalculator_FY25_03 {
-    constructor();
+    constructor(revisionNo?: string);
     protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean, excludeSmartAnswersInSearch?: boolean): boolean;
 }

package/dist/types-ts4.5/vc/vc-observer-new/metric-calculator/vc-next/index.d.ts

@@ -0,0 +1,6 @@
+import type { VCObserverEntry } from "../../types";
+import VCCalculator_FY26_04 from "../fy26_04";
+export default class VCCalculator_Next extends VCCalculator_FY26_04 {
+    constructor();
+    protected isEntryIncluded(entry: VCObserverEntry, include3p?: boolean, excludeSmartAnswersInSearch?: boolean): boolean;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.17.1",
+	"version": "5.0.0",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -129,7 +129,7 @@
 		"platform_ufo_segment_critical_metrics": {
 			"type": "boolean"
 		},
-		"platform_ufo_vcnext_to_fy26_04_revision_update": {
+		"platform_ufo_vcnext_for_ttvc_v5": {
 			"type": "boolean"
 		},
 		"platform_ufo_v4_fix_nested_ssr_placeholder": {