@atlaskit/react-ufo 4.1.12 → 4.1.13

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.1.13
+
+### Patch Changes
+
+- [#195513](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/195513)
+  [`49b7bf5d4e698`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/49b7bf5d4e698) -
+  Added reactUFO as marks to Dev Tools
+
 ## 4.1.12
 
 ### Patch Changes

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

@@ -33,6 +33,7 @@ var _roundNumber = require("../round-number");
 var ssr = _interopRequireWildcard(require("../ssr"));
 var _utils = require("./common/utils");
 var _criticalMetricsPayload = require("./critical-metrics-payload");
+var _addPerformanceMeasures = require("./utils/add-performance-measures");
 var _getBrowserMetadata = require("./utils/get-browser-metadata");
 var _getInteractionStatus = _interopRequireDefault(require("./utils/get-interaction-status"));
 var _getNavigationMetrics = require("./utils/get-navigation-metrics");
@@ -201,7 +202,7 @@ function getPPSMetrics(interaction) {
 function getSSRProperties(type) {
   var ssrPhases = getSSRPhaseSuccess(type);
   return _objectSpread(_objectSpread({
-    'ssr:success': (0, _getSsrSuccess.default)(type),
+    'ssr:success': (ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.done) != null ? ssrPhases.done : (0, _getSsrSuccess.default)(type),
     'ssr:featureFlags': getSSRFeatureFlags(type)
   }, (ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.earlyFlush) != null ? {
     'ssr:earlyflush:success': ssrPhases.earlyFlush
@@ -619,9 +620,23 @@ function _createInteractionMetricsPayload() {
             var SSRDoneTime = SSRDoneTimeValue !== undefined ? {
               SSRDoneTime: Math.round(SSRDoneTimeValue)
             } : {};
+            var isBM3ConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp;
+            var isUFOConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime);
+            if (!experimental && (isBM3ConfigSSRDoneAsFmp || isUFOConfigSSRDoneAsFmp) && SSRDoneTimeValue !== undefined && (0, _platformFeatureFlags.fg)('ufo_chrome_devtools_uplift')) {
+              try {
+                performance.mark("FMP", {
+                  startTime: SSRDoneTimeValue,
+                  detail: {
+                    devtools: {
+                      dataType: 'marker'
+                    }
+                  }
+                });
+              } catch (e) {}
+            }
             return _objectSpread(_objectSpread({}, SSRDoneTime), {}, {
-              isBM3ConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp,
-              isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime)
+              isBM3ConfigSSRDoneAsFmp: isBM3ConfigSSRDoneAsFmp,
+              isUFOConfigSSRDoneAsFmp: isUFOConfigSSRDoneAsFmp
             });
           };
           pageLoadInteractionMetrics = getInitialPageLoadSSRMetrics(); // Detailed payload. Page visibility = visible
@@ -690,6 +705,9 @@ function _createInteractionMetricsPayload() {
           finalVCMetrics = _yield$Promise$all2[0];
           experimentalMetrics = _yield$Promise$all2[1];
           paintMetrics = _yield$Promise$all2[2];
+          if (!experimental) {
+            (0, _platformFeatureFlags.fg)('ufo_chrome_devtools_uplift') && (0, _addPerformanceMeasures.addPerformanceMeasures)(interaction.start, (0, _toConsumableArray2.default)((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || []));
+          }
           payload = {
             actionSubject: 'experience',
             action: 'measured',
@@ -768,7 +786,7 @@ function _createInteractionMetricsPayload() {
           }
           payload.attributes.properties['event:sizeInKb'] = (0, _getPayloadSize.default)(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 43:
+        case 44:
         case "end":
           return _context.stop();
       }

package/dist/cjs/create-payload/utils/add-performance-measures.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addPerformanceMeasures = void 0;
+var addPerformanceMeasures = exports.addPerformanceMeasures = function addPerformanceMeasures(start, measures) {
+  try {
+    measures.sort(function (a, b) {
+      return b.revision.localeCompare(a.revision);
+    }).slice(0, 2).forEach(function (entry) {
+      var _entry$vcDetails;
+      if (((_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 || (_entry$vcDetails = _entry$vcDetails['90']) === null || _entry$vcDetails === void 0 ? void 0 : _entry$vcDetails.t) !== undefined) {
+        var _entry$vcDetails2;
+        performance.mark("VC90 (".concat(entry.revision, ")"), {
+          startTime: start + ((_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 || (_entry$vcDetails2 = _entry$vcDetails2['90']) === null || _entry$vcDetails2 === void 0 ? void 0 : _entry$vcDetails2.t),
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
+      }
+    });
+    measures.forEach(function (entry) {
+      var _entry$vcDetails3;
+      if (!entry || !entry.vcDetails) {
+        return;
+      }
+      var VCParts = Object.keys(entry.vcDetails);
+      performance.measure("VC90 (".concat(entry.revision, ")"), {
+        start: start,
+        duration: (_entry$vcDetails3 = entry.vcDetails) === null || _entry$vcDetails3 === void 0 || (_entry$vcDetails3 = _entry$vcDetails3['90']) === null || _entry$vcDetails3 === void 0 ? void 0 : _entry$vcDetails3.t,
+        detail: {
+          devtools: {
+            track: "main metrics",
+            trackGroup: '🛸 reactUFO metrics',
+            color: 'tertiary'
+          }
+        }
+      });
+      VCParts.forEach(function (key) {
+        var _entry$vcDetails4;
+        var duration = (_entry$vcDetails4 = entry.vcDetails) === null || _entry$vcDetails4 === void 0 ? void 0 : _entry$vcDetails4[key].t;
+        if (typeof duration !== 'number') {
+          return;
+        }
+        performance.measure("VC".concat(key), {
+          start: start,
+          duration: duration,
+          detail: {
+            devtools: {
+              track: "VC ".concat(entry.revision),
+              trackGroup: '🛸 reactUFO metrics',
+              color: key === '90' ? 'tertiary' : 'primary-light'
+            }
+          }
+        });
+      });
+    });
+  } catch (error) {}
+};

package/dist/cjs/interaction-metrics/index.js

@@ -621,6 +621,7 @@ function finishInteraction(id, data) {
   data.end = endTime;
   try {
     // for Firefox 102 and older
+
     if ((0, _platformFeatureFlags.fg)('ufo_chrome_devtools_uplift')) {
       performance.measure("\uD83D\uDEF8 [".concat(data.type, "] ").concat(data.ufoName, " [ttai]"), {
         start: data.start,
@@ -633,6 +634,14 @@ function finishInteraction(id, data) {
           }
         }
       });
+      performance.mark("TTAI", {
+        startTime: data.end,
+        detail: {
+          devtools: {
+            dataType: 'marker'
+          }
+        }
+      });
     } else {
       performance.measure("\uD83D\uDEF8 [".concat(data.type, "] ").concat(data.ufoName, " [ttai]"), {
         start: data.start,
@@ -1074,6 +1083,14 @@ function addApdexToAll(apdex) {
             }
           }
         });
+        performance.mark("[bm3] TTI", {
+          startTime: apdex.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdex$startTime2;
         performance.measure("\uD83D\uDEF8 ".concat(apdex.key, " [bm3_tti]"), {
@@ -1108,6 +1125,14 @@ function addApdex(interactionId, apdexInfo) {
             }
           }
         });
+        performance.mark("[bm3] TTI", {
+          startTime: apdexInfo.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdexInfo$startTime2;
         performance.measure("\uD83D\uDEF8 ".concat(apdexInfo.key, " [bm3_tti]"), {

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");
@@ -169,17 +168,16 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
               _context.t1 = [];
             case 16:
               v3Result = _context.t1;
-              (0, _platformFeatureFlags.fg)('ufo_chrome_devtools_uplift') && this.addPerformanceMeasures(param.start, [].concat((0, _toConsumableArray2.default)((v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) || []), (0, _toConsumableArray2.default)(v3Result !== null && v3Result !== void 0 ? v3Result : [])));
               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((0, _toConsumableArray2.default)((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), (0, _toConsumableArray2.default)(v3Result !== null && v3Result !== void 0 ? v3Result : []))
               }));
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -216,48 +214,6 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
     value: function collectSSRPlaceholders() {
       this.ssrPlaceholderHandler.collectExistingPlaceholders();
     }
-  }, {
-    key: "addPerformanceMeasures",
-    value: function addPerformanceMeasures(start, measures) {
-      try {
-        measures.forEach(function (entry) {
-          var _entry$vcDetails;
-          if (!entry || !entry.vcDetails) {
-            return;
-          }
-          var VCParts = Object.keys(entry.vcDetails);
-          performance.measure("VC90 (".concat(entry.revision, ")"), {
-            start: start,
-            duration: (_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 || (_entry$vcDetails = _entry$vcDetails['90']) === null || _entry$vcDetails === void 0 ? void 0 : _entry$vcDetails.t,
-            detail: {
-              devtools: {
-                track: "main metrics",
-                trackGroup: '🛸 reactUFO metrics',
-                color: 'tertiary'
-              }
-            }
-          });
-          VCParts.forEach(function (key) {
-            var _entry$vcDetails2;
-            var duration = (_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 ? void 0 : _entry$vcDetails2[key].t;
-            if (typeof duration !== 'number') {
-              return;
-            }
-            performance.measure("VC".concat(key), {
-              start: start,
-              duration: duration,
-              detail: {
-                devtools: {
-                  track: "VC ".concat(entry.revision),
-                  trackGroup: '🛸 reactUFO metrics',
-                  color: key === '90' ? 'tertiary' : 'primary-light'
-                }
-              }
-            });
-          });
-        });
-      } catch (error) {}
-    }
   }]);
 }(); // Some products set this variable to indicate it is running in SSR
 var isServer = Boolean(globalThis === null || globalThis === void 0 ? void 0 : globalThis.__SERVER__);

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

@@ -21,6 +21,7 @@ import { roundEpsilon } from '../round-number';
 import * as ssr from '../ssr';
 import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
 import { createCriticalMetricsPayloads } from './critical-metrics-payload';
+import { addPerformanceMeasures } from './utils/add-performance-measures';
 import { getBrowserMetadataToLegacyFormat } from './utils/get-browser-metadata';
 import getInteractionStatus from './utils/get-interaction-status';
 import { getNavigationMetricsToLegacyFormat } from './utils/get-navigation-metrics';
@@ -186,7 +187,7 @@ function getPPSMetrics(interaction) {
 function getSSRProperties(type) {
   const ssrPhases = getSSRPhaseSuccess(type);
   return {
-    'ssr:success': getSSRSuccessUtil(type),
+    'ssr:success': (ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.done) != null ? ssrPhases.done : getSSRSuccessUtil(type),
     'ssr:featureFlags': getSSRFeatureFlags(type),
     ...((ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.earlyFlush) != null ? {
       'ssr:earlyflush:success': ssrPhases.earlyFlush
@@ -622,10 +623,24 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
     const SSRDoneTime = SSRDoneTimeValue !== undefined ? {
       SSRDoneTime: Math.round(SSRDoneTimeValue)
     } : {};
+    const isBM3ConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp;
+    const isUFOConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime);
+    if (!experimental && (isBM3ConfigSSRDoneAsFmp || isUFOConfigSSRDoneAsFmp) && SSRDoneTimeValue !== undefined && fg('ufo_chrome_devtools_uplift')) {
+      try {
+        performance.mark(`FMP`, {
+          startTime: SSRDoneTimeValue,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
+      } catch (e) {}
+    }
     return {
       ...SSRDoneTime,
-      isBM3ConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp,
-      isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime)
+      isBM3ConfigSSRDoneAsFmp,
+      isUFOConfigSSRDoneAsFmp
     };
   };
   const pageLoadInteractionMetrics = getInitialPageLoadSSRMetrics();
@@ -675,6 +690,9 @@ async function createInteractionMetricsPayload(interaction, interactionId, exper
   const newUFOName = sanitizeUfoName(ufoName);
   const resourceTimings = getResourceTimings(start, end);
   const [finalVCMetrics, experimentalMetrics, paintMetrics] = await Promise.all([vcMetrics || (await getVCMetrics(interaction)), experimental ? getExperimentalVCMetrics(interaction) : Promise.resolve(undefined), getPaintMetricsToLegacyFormat(type, end)]);
+  if (!experimental) {
+    fg('ufo_chrome_devtools_uplift') && addPerformanceMeasures(interaction.start, [...((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || [])]);
+  }
   const payload = {
     actionSubject: 'experience',
     action: 'measured',

package/dist/es2019/create-payload/utils/add-performance-measures.js

@@ -0,0 +1,54 @@
+export const addPerformanceMeasures = (start, measures) => {
+  try {
+    measures.sort((a, b) => b.revision.localeCompare(a.revision)).slice(0, 2).forEach(entry => {
+      var _entry$vcDetails, _entry$vcDetails$;
+      if (((_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 ? void 0 : (_entry$vcDetails$ = _entry$vcDetails['90']) === null || _entry$vcDetails$ === void 0 ? void 0 : _entry$vcDetails$.t) !== undefined) {
+        var _entry$vcDetails2, _entry$vcDetails2$;
+        performance.mark(`VC90 (${entry.revision})`, {
+          startTime: start + ((_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 ? void 0 : (_entry$vcDetails2$ = _entry$vcDetails2['90']) === null || _entry$vcDetails2$ === void 0 ? void 0 : _entry$vcDetails2$.t),
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
+      }
+    });
+    measures.forEach(entry => {
+      var _entry$vcDetails3, _entry$vcDetails3$;
+      if (!entry || !entry.vcDetails) {
+        return;
+      }
+      const VCParts = Object.keys(entry.vcDetails);
+      performance.measure(`VC90 (${entry.revision})`, {
+        start,
+        duration: (_entry$vcDetails3 = entry.vcDetails) === null || _entry$vcDetails3 === void 0 ? void 0 : (_entry$vcDetails3$ = _entry$vcDetails3['90']) === null || _entry$vcDetails3$ === void 0 ? void 0 : _entry$vcDetails3$.t,
+        detail: {
+          devtools: {
+            track: `main metrics`,
+            trackGroup: '🛸 reactUFO metrics',
+            color: 'tertiary'
+          }
+        }
+      });
+      VCParts.forEach(key => {
+        var _entry$vcDetails4;
+        const duration = (_entry$vcDetails4 = entry.vcDetails) === null || _entry$vcDetails4 === void 0 ? void 0 : _entry$vcDetails4[key].t;
+        if (typeof duration !== 'number') {
+          return;
+        }
+        performance.measure(`VC${key}`, {
+          start,
+          duration,
+          detail: {
+            devtools: {
+              track: `VC ${entry.revision}`,
+              trackGroup: '🛸 reactUFO metrics',
+              color: key === '90' ? 'tertiary' : 'primary-light'
+            }
+          }
+        });
+      });
+    });
+  } catch (error) {}
+};

package/dist/es2019/interaction-metrics/index.js

@@ -539,6 +539,7 @@ function finishInteraction(id, data, endTime = performance.now()) {
   data.end = endTime;
   try {
     // for Firefox 102 and older
+
     if (fg('ufo_chrome_devtools_uplift')) {
       performance.measure(`🛸 [${data.type}] ${data.ufoName} [ttai]`, {
         start: data.start,
@@ -551,6 +552,14 @@ function finishInteraction(id, data, endTime = performance.now()) {
           }
         }
       });
+      performance.mark(`TTAI`, {
+        startTime: data.end,
+        detail: {
+          devtools: {
+            dataType: 'marker'
+          }
+        }
+      });
     } else {
       performance.measure(`🛸 [${data.type}] ${data.ufoName} [ttai]`, {
         start: data.start,
@@ -949,6 +958,14 @@ export function addApdexToAll(apdex) {
             }
           }
         });
+        performance.mark(`[bm3] TTI`, {
+          startTime: apdex.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdex$startTime2;
         performance.measure(`🛸 ${apdex.key} [bm3_tti]`, {
@@ -983,6 +1000,14 @@ export function addApdex(interactionId, apdexInfo) {
             }
           }
         });
+        performance.mark(`[bm3] TTI`, {
+          startTime: apdexInfo.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdexInfo$startTime2;
         performance.measure(`🛸 ${apdexInfo.key} [bm3_tti]`, {

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';
@@ -112,7 +111,6 @@ export class VCObserverWrapper {
       interactionId: param.interactionId,
       ssr: param.includeSSRInV3 ? param.ssr : undefined
     })) : [];
-    fg('ufo_chrome_devtools_uplift') && this.addPerformanceMeasures(param.start, [...((v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) || []), ...(v3Result !== null && v3Result !== void 0 ? v3Result : [])]);
     if (!v3Result) {
       return v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {};
     }
@@ -139,46 +137,6 @@ export class VCObserverWrapper {
   collectSSRPlaceholders() {
     this.ssrPlaceholderHandler.collectExistingPlaceholders();
   }
-  addPerformanceMeasures(start, measures) {
-    try {
-      measures.forEach(entry => {
-        var _entry$vcDetails, _entry$vcDetails$;
-        if (!entry || !entry.vcDetails) {
-          return;
-        }
-        const VCParts = Object.keys(entry.vcDetails);
-        performance.measure(`VC90 (${entry.revision})`, {
-          start,
-          duration: (_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 ? void 0 : (_entry$vcDetails$ = _entry$vcDetails['90']) === null || _entry$vcDetails$ === void 0 ? void 0 : _entry$vcDetails$.t,
-          detail: {
-            devtools: {
-              track: `main metrics`,
-              trackGroup: '🛸 reactUFO metrics',
-              color: 'tertiary'
-            }
-          }
-        });
-        VCParts.forEach(key => {
-          var _entry$vcDetails2;
-          const duration = (_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 ? void 0 : _entry$vcDetails2[key].t;
-          if (typeof duration !== 'number') {
-            return;
-          }
-          performance.measure(`VC${key}`, {
-            start,
-            duration,
-            detail: {
-              devtools: {
-                track: `VC ${entry.revision}`,
-                trackGroup: '🛸 reactUFO metrics',
-                color: key === '90' ? 'tertiary' : 'primary-light'
-              }
-            }
-          });
-        });
-      });
-    } catch (error) {}
-  }
 }
 
 // Some products set this variable to indicate it is running in SSR

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

@@ -33,6 +33,7 @@ import { roundEpsilon } from '../round-number';
 import * as ssr from '../ssr';
 import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
 import { createCriticalMetricsPayloads } from './critical-metrics-payload';
+import { addPerformanceMeasures } from './utils/add-performance-measures';
 import { getBrowserMetadataToLegacyFormat } from './utils/get-browser-metadata';
 import getInteractionStatus from './utils/get-interaction-status';
 import { getNavigationMetricsToLegacyFormat } from './utils/get-navigation-metrics';
@@ -194,7 +195,7 @@ function getPPSMetrics(interaction) {
 function getSSRProperties(type) {
   var ssrPhases = getSSRPhaseSuccess(type);
   return _objectSpread(_objectSpread({
-    'ssr:success': getSSRSuccessUtil(type),
+    'ssr:success': (ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.done) != null ? ssrPhases.done : getSSRSuccessUtil(type),
     'ssr:featureFlags': getSSRFeatureFlags(type)
   }, (ssrPhases === null || ssrPhases === void 0 ? void 0 : ssrPhases.earlyFlush) != null ? {
     'ssr:earlyflush:success': ssrPhases.earlyFlush
@@ -612,9 +613,23 @@ function _createInteractionMetricsPayload() {
             var SSRDoneTime = SSRDoneTimeValue !== undefined ? {
               SSRDoneTime: Math.round(SSRDoneTimeValue)
             } : {};
+            var isBM3ConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp;
+            var isUFOConfigSSRDoneAsFmp = interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime);
+            if (!experimental && (isBM3ConfigSSRDoneAsFmp || isUFOConfigSSRDoneAsFmp) && SSRDoneTimeValue !== undefined && fg('ufo_chrome_devtools_uplift')) {
+              try {
+                performance.mark("FMP", {
+                  startTime: SSRDoneTimeValue,
+                  detail: {
+                    devtools: {
+                      dataType: 'marker'
+                    }
+                  }
+                });
+              } catch (e) {}
+            }
             return _objectSpread(_objectSpread({}, SSRDoneTime), {}, {
-              isBM3ConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp,
-              isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime)
+              isBM3ConfigSSRDoneAsFmp: isBM3ConfigSSRDoneAsFmp,
+              isUFOConfigSSRDoneAsFmp: isUFOConfigSSRDoneAsFmp
             });
           };
           pageLoadInteractionMetrics = getInitialPageLoadSSRMetrics(); // Detailed payload. Page visibility = visible
@@ -683,6 +698,9 @@ function _createInteractionMetricsPayload() {
           finalVCMetrics = _yield$Promise$all2[0];
           experimentalMetrics = _yield$Promise$all2[1];
           paintMetrics = _yield$Promise$all2[2];
+          if (!experimental) {
+            fg('ufo_chrome_devtools_uplift') && addPerformanceMeasures(interaction.start, _toConsumableArray((finalVCMetrics === null || finalVCMetrics === void 0 ? void 0 : finalVCMetrics['ufo:vc:rev']) || []));
+          }
           payload = {
             actionSubject: 'experience',
             action: 'measured',
@@ -761,7 +779,7 @@ function _createInteractionMetricsPayload() {
           }
           payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 43:
+        case 44:
         case "end":
           return _context.stop();
       }

package/dist/esm/create-payload/utils/add-performance-measures.js

@@ -0,0 +1,56 @@
+export var addPerformanceMeasures = function addPerformanceMeasures(start, measures) {
+  try {
+    measures.sort(function (a, b) {
+      return b.revision.localeCompare(a.revision);
+    }).slice(0, 2).forEach(function (entry) {
+      var _entry$vcDetails;
+      if (((_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 || (_entry$vcDetails = _entry$vcDetails['90']) === null || _entry$vcDetails === void 0 ? void 0 : _entry$vcDetails.t) !== undefined) {
+        var _entry$vcDetails2;
+        performance.mark("VC90 (".concat(entry.revision, ")"), {
+          startTime: start + ((_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 || (_entry$vcDetails2 = _entry$vcDetails2['90']) === null || _entry$vcDetails2 === void 0 ? void 0 : _entry$vcDetails2.t),
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
+      }
+    });
+    measures.forEach(function (entry) {
+      var _entry$vcDetails3;
+      if (!entry || !entry.vcDetails) {
+        return;
+      }
+      var VCParts = Object.keys(entry.vcDetails);
+      performance.measure("VC90 (".concat(entry.revision, ")"), {
+        start: start,
+        duration: (_entry$vcDetails3 = entry.vcDetails) === null || _entry$vcDetails3 === void 0 || (_entry$vcDetails3 = _entry$vcDetails3['90']) === null || _entry$vcDetails3 === void 0 ? void 0 : _entry$vcDetails3.t,
+        detail: {
+          devtools: {
+            track: "main metrics",
+            trackGroup: '🛸 reactUFO metrics',
+            color: 'tertiary'
+          }
+        }
+      });
+      VCParts.forEach(function (key) {
+        var _entry$vcDetails4;
+        var duration = (_entry$vcDetails4 = entry.vcDetails) === null || _entry$vcDetails4 === void 0 ? void 0 : _entry$vcDetails4[key].t;
+        if (typeof duration !== 'number') {
+          return;
+        }
+        performance.measure("VC".concat(key), {
+          start: start,
+          duration: duration,
+          detail: {
+            devtools: {
+              track: "VC ".concat(entry.revision),
+              trackGroup: '🛸 reactUFO metrics',
+              color: key === '90' ? 'tertiary' : 'primary-light'
+            }
+          }
+        });
+      });
+    });
+  } catch (error) {}
+};

package/dist/esm/interaction-metrics/index.js

@@ -575,6 +575,7 @@ function finishInteraction(id, data) {
   data.end = endTime;
   try {
     // for Firefox 102 and older
+
     if (fg('ufo_chrome_devtools_uplift')) {
       performance.measure("\uD83D\uDEF8 [".concat(data.type, "] ").concat(data.ufoName, " [ttai]"), {
         start: data.start,
@@ -587,6 +588,14 @@ function finishInteraction(id, data) {
           }
         }
       });
+      performance.mark("TTAI", {
+        startTime: data.end,
+        detail: {
+          devtools: {
+            dataType: 'marker'
+          }
+        }
+      });
     } else {
       performance.measure("\uD83D\uDEF8 [".concat(data.type, "] ").concat(data.ufoName, " [ttai]"), {
         start: data.start,
@@ -1028,6 +1037,14 @@ export function addApdexToAll(apdex) {
             }
           }
         });
+        performance.mark("[bm3] TTI", {
+          startTime: apdex.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdex$startTime2;
         performance.measure("\uD83D\uDEF8 ".concat(apdex.key, " [bm3_tti]"), {
@@ -1062,6 +1079,14 @@ export function addApdex(interactionId, apdexInfo) {
             }
           }
         });
+        performance.mark("[bm3] TTI", {
+          startTime: apdexInfo.stopTime,
+          detail: {
+            devtools: {
+              dataType: 'marker'
+            }
+          }
+        });
       } else {
         var _apdexInfo$startTime2;
         performance.measure("\uD83D\uDEF8 ".concat(apdexInfo.key, " [bm3_tti]"), {

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';
@@ -159,17 +158,16 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
               _context.t1 = [];
             case 16:
               v3Result = _context.t1;
-              fg('ufo_chrome_devtools_uplift') && this.addPerformanceMeasures(param.start, [].concat(_toConsumableArray((v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) || []), _toConsumableArray(v3Result !== null && v3Result !== void 0 ? v3Result : [])));
               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 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -206,48 +204,6 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     value: function collectSSRPlaceholders() {
       this.ssrPlaceholderHandler.collectExistingPlaceholders();
     }
-  }, {
-    key: "addPerformanceMeasures",
-    value: function addPerformanceMeasures(start, measures) {
-      try {
-        measures.forEach(function (entry) {
-          var _entry$vcDetails;
-          if (!entry || !entry.vcDetails) {
-            return;
-          }
-          var VCParts = Object.keys(entry.vcDetails);
-          performance.measure("VC90 (".concat(entry.revision, ")"), {
-            start: start,
-            duration: (_entry$vcDetails = entry.vcDetails) === null || _entry$vcDetails === void 0 || (_entry$vcDetails = _entry$vcDetails['90']) === null || _entry$vcDetails === void 0 ? void 0 : _entry$vcDetails.t,
-            detail: {
-              devtools: {
-                track: "main metrics",
-                trackGroup: '🛸 reactUFO metrics',
-                color: 'tertiary'
-              }
-            }
-          });
-          VCParts.forEach(function (key) {
-            var _entry$vcDetails2;
-            var duration = (_entry$vcDetails2 = entry.vcDetails) === null || _entry$vcDetails2 === void 0 ? void 0 : _entry$vcDetails2[key].t;
-            if (typeof duration !== 'number') {
-              return;
-            }
-            performance.measure("VC".concat(key), {
-              start: start,
-              duration: duration,
-              detail: {
-                devtools: {
-                  track: "VC ".concat(entry.revision),
-                  trackGroup: '🛸 reactUFO metrics',
-                  color: key === '90' ? 'tertiary' : 'primary-light'
-                }
-              }
-            });
-          });
-        });
-      } catch (error) {}
-    }
   }]);
 }();
 

package/dist/types/create-payload/utils/add-performance-measures.d.ts

@@ -0,0 +1,2 @@
+import type { RevisionPayload } from '../../common/vc/types';
+export declare const addPerformanceMeasures: (start: number, measures: RevisionPayload) => void;

package/dist/types/ssr/index.d.ts

@@ -12,7 +12,8 @@ export type SSRFeatureFlags = {
 };
 export type SSRConfig = {
     /**
-     * Used to represent whether SSR as a whole was considered successful. You can consider this the success of the "render" phase success
+     * Used to represent whether SSR as a whole was considered successful. You can consider this the success of the "render" phase success.
+     * Also may be used as the FMP mark
      */
     getDoneMark: () => number | null;
     /**
@@ -31,6 +32,10 @@ export type SSRConfig = {
          * This is generally expected to be earlier than / independant of the prefetch data and may even be non-visual (eg: <link rel="preload" href="..."> tags).
          */
         earlyFlush?: boolean;
+        /**
+         * "done" if present can override the presence / absence of the done mark in the overral SSR success status ('ssr:success').
+         */
+        done?: boolean;
     };
     getFeatureFlags: () => SSRFeatureFlags | null;
     getTimings?: () => ReportedTimings | null;
@@ -41,6 +46,7 @@ export declare function getSSRSuccess(): boolean;
 export declare function getSSRPhaseSuccess(): {
     prefetch?: boolean;
     earlyFlush?: boolean;
+    done?: boolean;
 } | undefined;
 export declare function getSSRDoneTime(): number | undefined;
 export declare function getSSRFeatureFlags(): SSRFeatureFlags | undefined;

package/dist/types/vc/index.d.ts

@@ -21,7 +21,6 @@ export declare class VCObserverWrapper implements VCObserverInterface {
     setReactRootRenderStart(startTime: number): void;
     setReactRootRenderStop(stopTime: number): void;
     collectSSRPlaceholders(): void;
-    private addPerformanceMeasures;
 }
 export declare function isEnvironmentSupported(): boolean;
 export declare function getVCObserver(opts?: VCObserverOptions): VCObserverInterface;

package/dist/types-ts4.5/create-payload/utils/add-performance-measures.d.ts

@@ -0,0 +1,2 @@
+import type { RevisionPayload } from '../../common/vc/types';
+export declare const addPerformanceMeasures: (start: number, measures: RevisionPayload) => void;

package/dist/types-ts4.5/ssr/index.d.ts

@@ -12,7 +12,8 @@ export type SSRFeatureFlags = {
 };
 export type SSRConfig = {
     /**
-     * Used to represent whether SSR as a whole was considered successful. You can consider this the success of the "render" phase success
+     * Used to represent whether SSR as a whole was considered successful. You can consider this the success of the "render" phase success.
+     * Also may be used as the FMP mark
      */
     getDoneMark: () => number | null;
     /**
@@ -31,6 +32,10 @@ export type SSRConfig = {
          * This is generally expected to be earlier than / independant of the prefetch data and may even be non-visual (eg: <link rel="preload" href="..."> tags).
          */
         earlyFlush?: boolean;
+        /**
+         * "done" if present can override the presence / absence of the done mark in the overral SSR success status ('ssr:success').
+         */
+        done?: boolean;
     };
     getFeatureFlags: () => SSRFeatureFlags | null;
     getTimings?: () => ReportedTimings | null;
@@ -41,6 +46,7 @@ export declare function getSSRSuccess(): boolean;
 export declare function getSSRPhaseSuccess(): {
     prefetch?: boolean;
     earlyFlush?: boolean;
+    done?: boolean;
 } | undefined;
 export declare function getSSRDoneTime(): number | undefined;
 export declare function getSSRFeatureFlags(): SSRFeatureFlags | undefined;

package/dist/types-ts4.5/vc/index.d.ts

@@ -21,7 +21,6 @@ export declare class VCObserverWrapper implements VCObserverInterface {
     setReactRootRenderStart(startTime: number): void;
     setReactRootRenderStop(stopTime: number): void;
     collectSSRPlaceholders(): void;
-    private addPerformanceMeasures;
 }
 export declare function isEnvironmentSupported(): boolean;
 export declare function getVCObserver(opts?: VCObserverOptions): VCObserverInterface;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.1.12",
+	"version": "4.1.13",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",