@atlaskit/collab-provider 26.0.9 → 27.0.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/collab-provider
 
+## 27.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.10
+
+### Patch Changes
+
+- [`0f5c0015f457f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f5c0015f457f) -
+  Remove feature gate `platform-editor-collab-edit-websocket-only`. Collab editing on commercial and
+  non-GCP tenants reverts to the default polling-first transport strategy.
+- [`962e8dc0188bf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/962e8dc0188bf) -
+  Clean up `platform_editor_offline_editing_web` with `isEnabled: true` for Confluence, keeping
+  offline editing and recovery behavior enabled. Remove the retired experiment from the editor
+  Statsig configuration; consumers must stop querying or overriding this experiment.
+- Updated dependencies
+
 ## 26.0.9
 
 ### Patch Changes

package/dist/cjs/document/document-service.js

@@ -17,7 +17,6 @@ var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _JSONTransformer = require("@atlaskit/editor-json-transformer/JSONTransformer-2");
 var _unsafeExpValNoExposure = require("@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _const = require("../helpers/const");
 var _performance = require("../analytics/performance");
@@ -790,13 +789,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      * mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
      */
     (0, _defineProperty2.default)(this, "lockSteps", function () {
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) || (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-        var _this$getState8;
-        var currentState = (_this$getState8 = _this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(_this);
-        if (currentState) {
-          var _sendableSteps$origin, _sendableSteps3;
-          _this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = (0, _prosemirrorCollab.sendableSteps)(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
-        }
+      var _this$getState8;
+      var currentState = (_this$getState8 = _this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(_this);
+      if (currentState) {
+        var _sendableSteps$origin, _sendableSteps3;
+        _this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = (0, _prosemirrorCollab.sendableSteps)(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
       }
     });
     (0, _defineProperty2.default)(this, "lockStepOrigins", function (origins) {
@@ -854,9 +851,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      */
     function notifyReconnectionConflict(steps) {
       var _this$getState9, _getCollabState;
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', false)) {
-        return;
-      }
       var state = (_this$getState9 = this.getState) === null || _this$getState9 === void 0 ? void 0 : _this$getState9.call(this);
       var unconfirmedSteps = state ? (_getCollabState = (0, _prosemirrorCollab.getCollabState)(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
       if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
@@ -1099,7 +1093,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var _this$getState1,
         _this$getState10,
         _this4 = this;
-      var offlineEditingEnabled = (0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true);
       var onlineStepMergingEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
       // We don't trust `_newState` not to be stale
       // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
@@ -1108,20 +1101,16 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
 
       // Don't send any steps before we're ready.
-      if (offlineEditingEnabled || onlineStepMergingEnabled) {
-        var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-        if (!this.getConnected() || enableOnlineStepMerging) {
-          return;
-        }
+      var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+      if (!this.getConnected() || enableOnlineStepMerging) {
+        return;
       }
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
       if (!unconfirmedStepsData) {
         return;
       }
-      if (offlineEditingEnabled || onlineStepMergingEnabled) {
-        this.lockStepOrigins(unconfirmedStepsData.origins);
-      }
+      this.lockStepOrigins(unconfirmedStepsData.origins);
       var unconfirmedSteps = unconfirmedStepsData.steps;
       // sendAnalyticsEvent is only true when buffering is enabled,
       // to ensure that analytics events with the number of unconfirmed steps is only
@@ -1152,37 +1141,35 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
           versionAfter: version
         });
       }
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true)) {
-        var containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
-          var _tr$getMeta;
-          return tr instanceof _state.Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
-        });
-        if (containsOfflineSteps && !this.timeoutExceeded) {
-          // Only start timer if we're online and don't already have one running
-          if (this.getConnected() && !this.timeout) {
-            this.timeout = setTimeout(function () {
-              // If the timer expires and we're still online, handle the offline steps.
-              // Otherwise, clear the timer so it can restart when we're online again.
-              if (_this4.getConnected()) {
-                _this4.timeoutExceeded = true;
-                var updatedUnconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
-                updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 || updatedUnconfirmedStepsData.origins.forEach(function (origin) {
-                  if (origin instanceof _state.Transaction && origin.getMeta('isOffline')) {
-                    origin.setMeta('isOffline', false);
-                  }
-                });
-              } else {
-                _this4.timeout = undefined;
-              }
-            }, 6000);
-          }
-          return;
-        } else if (this.timeoutExceeded) {
-          this.timeoutExceeded = false;
-          if (this.timeout) {
-            clearTimeout(this.timeout);
-            this.timeout = undefined;
-          }
+      var containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
+        var _tr$getMeta;
+        return tr instanceof _state.Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
+      });
+      if (containsOfflineSteps && !this.timeoutExceeded) {
+        // Only start timer if we're online and don't already have one running
+        if (this.getConnected() && !this.timeout) {
+          this.timeout = setTimeout(function () {
+            // If the timer expires and we're still online, handle the offline steps.
+            // Otherwise, clear the timer so it can restart when we're online again.
+            if (_this4.getConnected()) {
+              _this4.timeoutExceeded = true;
+              var updatedUnconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
+              updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 || updatedUnconfirmedStepsData.origins.forEach(function (origin) {
+                if (origin instanceof _state.Transaction && origin.getMeta('isOffline')) {
+                  origin.setMeta('isOffline', false);
+                }
+              });
+            } else {
+              _this4.timeout = undefined;
+            }
+          }, 6000);
+        }
+        return;
+      } else if (this.timeoutExceeded) {
+        this.timeoutExceeded = false;
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+          this.timeout = undefined;
         }
       }
 

package/dist/cjs/provider/commit-step.js

@@ -15,7 +15,6 @@ var _ncsErrors = require("../errors/ncs-errors");
 var _utils = require("../helpers/utils");
 var _transactionAgentAttribution = require("@atlaskit/editor-common/transaction-agent-attribution");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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 logger = (0, _utils.createLogger)('commit-step', 'black');
@@ -124,9 +123,7 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
           return step;
         });
       }
-      if ((0, _expValEquals.expValEquals)('platform_editor_offline_editing_web', 'isEnabled', true)) {
-        stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
-      }
+      stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
       var start = new Date().getTime();
       var ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG = 'Error while adding steps - Invalid Acknowledgement';
       var ADD_STEPS_BROADCAST_ERROR_MSG = 'Error while adding steps - Broadcast threw exception';

package/dist/cjs/provider/index.js

@@ -19,7 +19,6 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _emitter = require("../emitter");
 var _channel = require("../channel");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _utils = require("../helpers/utils");
 var _analyticsHelper = _interopRequireDefault(require("../analytics/analytics-helper"));
 var _telepointersHelper = require("../participants/telepointers-helper");
@@ -158,8 +157,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         if (offlineDuration !== undefined) {
           _this.documentService.throttledCatchupv2(_const.CatchupEventReason.RECONNECTED, {
             disconnectionPeriodSeconds: Math.floor(offlineDuration / 1000),
-            offlineStepsLength: (0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) ? (0, _getOfflineStepsLength.getOfflineStepsLength)(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
-            offlineReplaceStepsLength: (0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) ? (0, _getOfflineStepsLength.getOfflineReplaceStepsLength)(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
+            offlineStepsLength: (0, _getOfflineStepsLength.getOfflineStepsLength)(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()),
+            offlineReplaceStepsLength: (0, _getOfflineStepsLength.getOfflineReplaceStepsLength)(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()),
             unconfirmedStepsLength: unconfirmedStepsLength
           }, _this.sessionId);
         } else if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_early_exit_return_draft')) {

package/dist/cjs/socket-io-provider.js

@@ -33,8 +33,8 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
       // Collab editing: GCP tenant
       return 'gcp-collab';
     } else {
-      // Collab editing: commercial and all other tenants
-      return 'collab-edit';
+      // Collab editing: commercial and all other tenants — polling first, with WebSocket upgrade fallback
+      return 'default';
     }
   };
   switch (getConnectionCase()) {
@@ -51,12 +51,6 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
         transports = ['websocket'];
       }
       break;
-    case 'collab-edit':
-      // Collab edit (commercial and all other tenants): WebSocket only when flag is enabled, otherwise polling fallback
-      if ((0, _fg.fg)('platform-editor-collab-edit-websocket-only')) {
-        transports = ['websocket'];
-      }
-      break;
     default:
       // Default: polling first, with WebSocket upgrade fallback
       break;

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "26.0.9";
+var version = exports.version = "26.0.10";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/document/document-service.js

@@ -5,7 +5,6 @@ import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -678,13 +677,11 @@ export class DocumentService {
      * mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
      */
     _defineProperty(this, "lockSteps", () => {
-      if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-        var _this$getState8;
-        const currentState = (_this$getState8 = this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(this);
-        if (currentState) {
-          var _sendableSteps$origin, _sendableSteps3;
-          this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = sendableSteps(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
-        }
+      var _this$getState8;
+      const currentState = (_this$getState8 = this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(this);
+      if (currentState) {
+        var _sendableSteps$origin, _sendableSteps3;
+        this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = sendableSteps(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
       }
     });
     _defineProperty(this, "lockStepOrigins", origins => {
@@ -737,9 +734,6 @@ export class DocumentService {
    */
   notifyReconnectionConflict(steps) {
     var _this$getState9, _getCollabState;
-    if (editorExperiment('platform_editor_offline_editing_web', false)) {
-      return;
-    }
     const state = (_this$getState9 = this.getState) === null || _this$getState9 === void 0 ? void 0 : _this$getState9.call(this);
     const unconfirmedSteps = state ? (_getCollabState = getCollabState(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
     if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
@@ -952,7 +946,6 @@ export class DocumentService {
   send(tr, _oldState, _newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
   ) {
     var _this$getState1, _this$getState10;
-    const offlineEditingEnabled = editorExperiment('platform_editor_offline_editing_web', true);
     const onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
     // We don't trust `_newState` not to be stale
     // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
@@ -961,20 +954,16 @@ export class DocumentService {
     const newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
 
     // Don't send any steps before we're ready.
-    if (offlineEditingEnabled || onlineStepMergingEnabled) {
-      const enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-      if (!this.getConnected() || enableOnlineStepMerging) {
-        return;
-      }
+    const enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+    if (!this.getConnected() || enableOnlineStepMerging) {
+      return;
     }
     const unconfirmedStepsData = sendableSteps(newState);
     const version = this.getVersionFromCollabState(newState, 'collab-provider: send');
     if (!unconfirmedStepsData) {
       return;
     }
-    if (offlineEditingEnabled || onlineStepMergingEnabled) {
-      this.lockStepOrigins(unconfirmedStepsData.origins);
-    }
+    this.lockStepOrigins(unconfirmedStepsData.origins);
     const unconfirmedSteps = unconfirmedStepsData.steps;
     // sendAnalyticsEvent is only true when buffering is enabled,
     // to ensure that analytics events with the number of unconfirmed steps is only
@@ -1005,37 +994,35 @@ export class DocumentService {
         versionAfter: version
       });
     }
-    if (editorExperiment('platform_editor_offline_editing_web', true)) {
-      const containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(tr => {
-        var _tr$getMeta;
-        return tr instanceof Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
-      });
-      if (containsOfflineSteps && !this.timeoutExceeded) {
-        // Only start timer if we're online and don't already have one running
-        if (this.getConnected() && !this.timeout) {
-          this.timeout = setTimeout(() => {
-            // If the timer expires and we're still online, handle the offline steps.
-            // Otherwise, clear the timer so it can restart when we're online again.
-            if (this.getConnected()) {
-              this.timeoutExceeded = true;
-              const updatedUnconfirmedStepsData = sendableSteps(newState);
-              updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 ? void 0 : updatedUnconfirmedStepsData.origins.forEach(origin => {
-                if (origin instanceof Transaction && origin.getMeta('isOffline')) {
-                  origin.setMeta('isOffline', false);
-                }
-              });
-            } else {
-              this.timeout = undefined;
-            }
-          }, 6000);
-        }
-        return;
-      } else if (this.timeoutExceeded) {
-        this.timeoutExceeded = false;
-        if (this.timeout) {
-          clearTimeout(this.timeout);
-          this.timeout = undefined;
-        }
+    const containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(tr => {
+      var _tr$getMeta;
+      return tr instanceof Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
+    });
+    if (containsOfflineSteps && !this.timeoutExceeded) {
+      // Only start timer if we're online and don't already have one running
+      if (this.getConnected() && !this.timeout) {
+        this.timeout = setTimeout(() => {
+          // If the timer expires and we're still online, handle the offline steps.
+          // Otherwise, clear the timer so it can restart when we're online again.
+          if (this.getConnected()) {
+            this.timeoutExceeded = true;
+            const updatedUnconfirmedStepsData = sendableSteps(newState);
+            updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 ? void 0 : updatedUnconfirmedStepsData.origins.forEach(origin => {
+              if (origin instanceof Transaction && origin.getMeta('isOffline')) {
+                origin.setMeta('isOffline', false);
+              }
+            });
+          } else {
+            this.timeout = undefined;
+          }
+        }, 6000);
+      }
+      return;
+    } else if (this.timeoutExceeded) {
+      this.timeoutExceeded = false;
+      if (this.timeout) {
+        clearTimeout(this.timeout);
+        this.timeout = undefined;
       }
     }
 

package/dist/es2019/provider/commit-step.js

@@ -5,7 +5,6 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const logger = createLogger('commit-step', 'black');
 export const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
 export class CommitStepService {
@@ -114,9 +113,7 @@ export class CommitStepService {
         return step;
       });
     }
-    if (expValEquals('platform_editor_offline_editing_web', 'isEnabled', true)) {
-      stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
-    }
+    stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
     const start = new Date().getTime();
     const ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG = 'Error while adding steps - Invalid Acknowledgement';
     const ADD_STEPS_BROADCAST_ERROR_MSG = 'Error while adding steps - Broadcast threw exception';

package/dist/es2019/provider/index.js

@@ -5,7 +5,6 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { createLogger, logObfuscatedSteps } from '../helpers/utils';
 import AnalyticsHelper from '../analytics/analytics-helper';
 import { telepointerCallback } from '../participants/telepointers-helper';
@@ -138,8 +137,8 @@ export class Provider extends Emitter {
         if (offlineDuration !== undefined) {
           this.documentService.throttledCatchupv2(CatchupEventReason.RECONNECTED, {
             disconnectionPeriodSeconds: Math.floor(offlineDuration / 1000),
-            offlineStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineStepsLength(this.documentService.getUnconfirmedSteps(), this.documentService.getUnconfirmedStepsOrigins()) : undefined,
-            offlineReplaceStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineReplaceStepsLength(this.documentService.getUnconfirmedSteps(), this.documentService.getUnconfirmedStepsOrigins()) : undefined,
+            offlineStepsLength: getOfflineStepsLength(this.documentService.getUnconfirmedSteps(), this.documentService.getUnconfirmedStepsOrigins()),
+            offlineReplaceStepsLength: getOfflineReplaceStepsLength(this.documentService.getUnconfirmedSteps(), this.documentService.getUnconfirmedStepsOrigins()),
             unconfirmedStepsLength: unconfirmedStepsLength
           }, this.sessionId);
         } else if (isExperimentEnabled('platform_editor_early_exit_return_draft')) {

package/dist/es2019/socket-io-provider.js

@@ -23,8 +23,8 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       // Collab editing: GCP tenant
       return 'gcp-collab';
     } else {
-      // Collab editing: commercial and all other tenants
-      return 'collab-edit';
+      // Collab editing: commercial and all other tenants — polling first, with WebSocket upgrade fallback
+      return 'default';
     }
   };
   switch (getConnectionCase()) {
@@ -41,12 +41,6 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
         transports = ['websocket'];
       }
       break;
-    case 'collab-edit':
-      // Collab edit (commercial and all other tenants): WebSocket only when flag is enabled, otherwise polling fallback
-      if (fg('platform-editor-collab-edit-websocket-only')) {
-        transports = ['websocket'];
-      }
-      break;
     default:
       // Default: polling first, with WebSocket upgrade fallback
       break;

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "26.0.9";
+export const version = "26.0.10";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/document/document-service.js

@@ -15,7 +15,6 @@ import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -784,13 +783,11 @@ export var DocumentService = /*#__PURE__*/function () {
      * mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
      */
     _defineProperty(this, "lockSteps", function () {
-      if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-        var _this$getState8;
-        var currentState = (_this$getState8 = _this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(_this);
-        if (currentState) {
-          var _sendableSteps$origin, _sendableSteps3;
-          _this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = sendableSteps(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
-        }
+      var _this$getState8;
+      var currentState = (_this$getState8 = _this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(_this);
+      if (currentState) {
+        var _sendableSteps$origin, _sendableSteps3;
+        _this.lockStepOrigins((_sendableSteps$origin = (_sendableSteps3 = sendableSteps(currentState)) === null || _sendableSteps3 === void 0 ? void 0 : _sendableSteps3.origins) !== null && _sendableSteps$origin !== void 0 ? _sendableSteps$origin : []);
       }
     });
     _defineProperty(this, "lockStepOrigins", function (origins) {
@@ -848,9 +845,6 @@ export var DocumentService = /*#__PURE__*/function () {
      */
     function notifyReconnectionConflict(steps) {
       var _this$getState9, _getCollabState;
-      if (editorExperiment('platform_editor_offline_editing_web', false)) {
-        return;
-      }
       var state = (_this$getState9 = this.getState) === null || _this$getState9 === void 0 ? void 0 : _this$getState9.call(this);
       var unconfirmedSteps = state ? (_getCollabState = getCollabState(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
       if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
@@ -1093,7 +1087,6 @@ export var DocumentService = /*#__PURE__*/function () {
       var _this$getState1,
         _this$getState10,
         _this4 = this;
-      var offlineEditingEnabled = editorExperiment('platform_editor_offline_editing_web', true);
       var onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
       // We don't trust `_newState` not to be stale
       // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
@@ -1102,20 +1095,16 @@ export var DocumentService = /*#__PURE__*/function () {
       var newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
 
       // Don't send any steps before we're ready.
-      if (offlineEditingEnabled || onlineStepMergingEnabled) {
-        var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-        if (!this.getConnected() || enableOnlineStepMerging) {
-          return;
-        }
+      var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
+      if (!this.getConnected() || enableOnlineStepMerging) {
+        return;
       }
       var unconfirmedStepsData = sendableSteps(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
       if (!unconfirmedStepsData) {
         return;
       }
-      if (offlineEditingEnabled || onlineStepMergingEnabled) {
-        this.lockStepOrigins(unconfirmedStepsData.origins);
-      }
+      this.lockStepOrigins(unconfirmedStepsData.origins);
       var unconfirmedSteps = unconfirmedStepsData.steps;
       // sendAnalyticsEvent is only true when buffering is enabled,
       // to ensure that analytics events with the number of unconfirmed steps is only
@@ -1146,37 +1135,35 @@ export var DocumentService = /*#__PURE__*/function () {
           versionAfter: version
         });
       }
-      if (editorExperiment('platform_editor_offline_editing_web', true)) {
-        var containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
-          var _tr$getMeta;
-          return tr instanceof Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
-        });
-        if (containsOfflineSteps && !this.timeoutExceeded) {
-          // Only start timer if we're online and don't already have one running
-          if (this.getConnected() && !this.timeout) {
-            this.timeout = setTimeout(function () {
-              // If the timer expires and we're still online, handle the offline steps.
-              // Otherwise, clear the timer so it can restart when we're online again.
-              if (_this4.getConnected()) {
-                _this4.timeoutExceeded = true;
-                var updatedUnconfirmedStepsData = sendableSteps(newState);
-                updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 || updatedUnconfirmedStepsData.origins.forEach(function (origin) {
-                  if (origin instanceof Transaction && origin.getMeta('isOffline')) {
-                    origin.setMeta('isOffline', false);
-                  }
-                });
-              } else {
-                _this4.timeout = undefined;
-              }
-            }, 6000);
-          }
-          return;
-        } else if (this.timeoutExceeded) {
-          this.timeoutExceeded = false;
-          if (this.timeout) {
-            clearTimeout(this.timeout);
-            this.timeout = undefined;
-          }
+      var containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
+        var _tr$getMeta;
+        return tr instanceof Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
+      });
+      if (containsOfflineSteps && !this.timeoutExceeded) {
+        // Only start timer if we're online and don't already have one running
+        if (this.getConnected() && !this.timeout) {
+          this.timeout = setTimeout(function () {
+            // If the timer expires and we're still online, handle the offline steps.
+            // Otherwise, clear the timer so it can restart when we're online again.
+            if (_this4.getConnected()) {
+              _this4.timeoutExceeded = true;
+              var updatedUnconfirmedStepsData = sendableSteps(newState);
+              updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 || updatedUnconfirmedStepsData.origins.forEach(function (origin) {
+                if (origin instanceof Transaction && origin.getMeta('isOffline')) {
+                  origin.setMeta('isOffline', false);
+                }
+              });
+            } else {
+              _this4.timeout = undefined;
+            }
+          }, 6000);
+        }
+        return;
+      } else if (this.timeoutExceeded) {
+        this.timeoutExceeded = false;
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+          this.timeout = undefined;
         }
       }
 

package/dist/esm/provider/commit-step.js

@@ -10,7 +10,6 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var logger = createLogger('commit-step', 'black');
 export var RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
 export var CommitStepService = /*#__PURE__*/function () {
@@ -117,9 +116,7 @@ export var CommitStepService = /*#__PURE__*/function () {
           return step;
         });
       }
-      if (expValEquals('platform_editor_offline_editing_web', 'isEnabled', true)) {
-        stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
-      }
+      stepsWithClientAndUserId = this.addOfflineMetadata(stepsWithClientAndUserId, stepOrigins);
       var start = new Date().getTime();
       var ADD_STEPS_ACKNOWLEDGEMENT_ERROR_MSG = 'Error while adding steps - Invalid Acknowledgement';
       var ADD_STEPS_BROADCAST_ERROR_MSG = 'Error while adding steps - Broadcast threw exception';

package/dist/esm/provider/index.js

@@ -18,7 +18,6 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { createLogger, logObfuscatedSteps } from '../helpers/utils';
 import AnalyticsHelper from '../analytics/analytics-helper';
 import { telepointerCallback } from '../participants/telepointers-helper';
@@ -152,8 +151,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         if (offlineDuration !== undefined) {
           _this.documentService.throttledCatchupv2(CatchupEventReason.RECONNECTED, {
             disconnectionPeriodSeconds: Math.floor(offlineDuration / 1000),
-            offlineStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineStepsLength(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
-            offlineReplaceStepsLength: editorExperiment('platform_editor_offline_editing_web', true) ? getOfflineReplaceStepsLength(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()) : undefined,
+            offlineStepsLength: getOfflineStepsLength(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()),
+            offlineReplaceStepsLength: getOfflineReplaceStepsLength(_this.documentService.getUnconfirmedSteps(), _this.documentService.getUnconfirmedStepsOrigins()),
             unconfirmedStepsLength: unconfirmedStepsLength
           }, _this.sessionId);
         } else if (isExperimentEnabled('platform_editor_early_exit_return_draft')) {

package/dist/esm/socket-io-provider.js

@@ -25,8 +25,8 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       // Collab editing: GCP tenant
       return 'gcp-collab';
     } else {
-      // Collab editing: commercial and all other tenants
-      return 'collab-edit';
+      // Collab editing: commercial and all other tenants — polling first, with WebSocket upgrade fallback
+      return 'default';
     }
   };
   switch (getConnectionCase()) {
@@ -43,12 +43,6 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
         transports = ['websocket'];
       }
       break;
-    case 'collab-edit':
-      // Collab edit (commercial and all other tenants): WebSocket only when flag is enabled, otherwise polling fallback
-      if (fg('platform-editor-collab-edit-websocket-only')) {
-        transports = ['websocket'];
-      }
-      break;
     default:
       // Default: polling first, with WebSocket upgrade fallback
       break;

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "26.0.9";
+export var version = "26.0.10";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "26.0.9",
+	"version": "27.0.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,8 +29,8 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/react-ufo": "^7.9.0",
-		"@atlaskit/tmp-editor-statsig": "^187.0.0",
+		"@atlaskit/react-ufo": "^7.10.0",
+		"@atlaskit/tmp-editor-statsig": "^188.0.0",
 		"@atlaskit/ufo": "^1.2.0",
 		"@atlaskit/util-service-support": "^7.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -64,12 +64,9 @@
 		},
 		"platform_editor_blocked_document_ux": {
 			"type": "boolean"
-		},
-		"platform-editor-collab-edit-websocket-only": {
-			"type": "boolean"
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.4.0"
+		"@atlaskit/editor-common": "^122.0.0"
 	}
 }