@atlaskit/collab-provider 9.29.3 → 9.30.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/collab-provider
 
+## 9.30.0
+
+### Minor Changes
+
+- [#114156](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114156)
+  [`bc6a63af2d1d0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc6a63af2d1d0) -
+  Bump adf-schema to 37.0.0 and adf-schema-json to 1.16.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.29.3
 
 ### Patch Changes

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

@@ -50,8 +50,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
   function DocumentService(participantsService, analyticsHelper, fetchCatchup, fetchCatchupv2, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, isNameSpaceLocked) {
     var _this = this;
     var enableErrorOnFailedDocumentApply = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
-    var reconcileOnRecovery = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
-    var options = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : {
+    var options = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : {
       __livePage: false
     };
     (0, _classCallCheck2.default)(this, DocumentService);
@@ -330,17 +329,12 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
               // We can then reconcile the document with the preserved state.
               unconfirmedSteps = _this.getUnconfirmedSteps();
-              if (!_this.reconcileOnRecovery) {
-                _context4.next = 6;
-                break;
-              }
-              _context4.next = 5;
+              _context4.next = 4;
               return _this.getCurrentState();
-            case 5:
+            case 4:
               currentState = _context4.sent;
-            case 6:
-              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && _this.reconcileOnRecovery && currentState);
-              _context4.prev = 7;
+              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState);
+              _context4.prev = 6;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -357,29 +351,29 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
 
               // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
               if (!(useReconcile && currentState)) {
-                _context4.next = 15;
+                _context4.next = 14;
                 break;
               }
-              _context4.next = 13;
+              _context4.next = 12;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 13:
-              _context4.next = 16;
+            case 12:
+              _context4.next = 15;
               break;
-            case 15:
+            case 14:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 16:
+            case 15:
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
                 useReconcile: useReconcile
               });
-              _context4.next = 24;
+              _context4.next = 23;
               break;
-            case 19:
-              _context4.prev = 19;
-              _context4.t0 = _context4["catch"](7);
+            case 18:
+              _context4.prev = 18;
+              _context4.t0 = _context4["catch"](6);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 useReconcile: useReconcile
@@ -393,11 +387,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                   code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 24:
+            case 23:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[7, 19]]);
+        }, _callee4, null, [[6, 18]]);
       }));
       return function (_x) {
         return _ref6.apply(this, arguments);
@@ -667,7 +661,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     this.metadataService = metadataService;
     this.isNameSpaceLocked = isNameSpaceLocked;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
-    this.reconcileOnRecovery = reconcileOnRecovery;
     this.options = options;
     this.stepQueue = new _stepQueueState.StepQueueState();
   }

package/dist/cjs/feature-flags/index.js

@@ -9,8 +9,7 @@ exports.getProductSpecificFeatureFlags = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false,
-  reconcileOnRecovery: false
+  blockViewOnly: false
 };
 
 /**
@@ -19,8 +18,7 @@ var defaultNCSFeatureFlags = {
 var productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
-    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/cjs/provider/index.js

@@ -273,11 +273,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     _this.isProviderInitialized = false;
     _this.participantsService = new _participantsService.ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined, _this.getPresenceData, _this.setUserId);
     _this.metadataService = new _metadataService.MetadataService(_this.emitCallback, _this.channel.sendMetadata);
-    var reconcileOnRecovery = (0, _featureFlags.getCollabProviderFeatureFlag)('reconcileOnRecovery', _this.config.featureFlags);
     _this.namespaceService = new _namespaceService.NamespaceService();
     _this.documentService = new _documentService.DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.channel.fetchCatchupv2, _this.channel.fetchReconcile, _this.emitCallback, _this.channel.broadcast, function () {
       return _this.userId;
-    }, _this.onErrorHandled, _this.metadataService, _this.namespaceService.getIsNamespaceLocked.bind(_this.namespaceService), _this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery, {
+    }, _this.onErrorHandled, _this.metadataService, _this.namespaceService.getIsNamespaceLocked.bind(_this.namespaceService), _this.config.enableErrorOnFailedDocumentApply, {
       __livePage: _this.config.__livePage || false
     });
     _this.api = new _api.Api(config, _this.documentService, _this.channel);

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 = "9.29.3";
+var version = exports.version = "9.30.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -34,7 +34,7 @@ export class DocumentService {
    * @param metadataService
    * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
    */
-  constructor(participantsService, analyticsHelper, fetchCatchup, fetchCatchupv2, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, isNameSpaceLocked, enableErrorOnFailedDocumentApply = false, reconcileOnRecovery = false, options = {
+  constructor(participantsService, analyticsHelper, fetchCatchup, fetchCatchupv2, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, isNameSpaceLocked, enableErrorOnFailedDocumentApply = false, options = {
     __livePage: false
   }) {
     // Fires analytics to editor when collab editor cannot sync up
@@ -285,11 +285,8 @@ export class DocumentService {
       // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
       // We can then reconcile the document with the preserved state.
       const unconfirmedSteps = this.getUnconfirmedSteps();
-      let currentState;
-      if (this.reconcileOnRecovery) {
-        currentState = await this.getCurrentState();
-      }
-      const useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && this.reconcileOnRecovery && currentState);
+      const currentState = await this.getCurrentState();
+      const useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState);
       try {
         var _this$analyticsHelper13;
         // Reset the editor,
@@ -550,7 +547,6 @@ export class DocumentService {
     this.metadataService = metadataService;
     this.isNameSpaceLocked = isNameSpaceLocked;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
-    this.reconcileOnRecovery = reconcileOnRecovery;
     this.options = options;
     this.stepQueue = new StepQueueState();
   }

package/dist/es2019/feature-flags/index.js

@@ -1,7 +1,6 @@
 const defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false,
-  reconcileOnRecovery: false
+  blockViewOnly: false
 };
 
 /**
@@ -10,8 +9,7 @@ const defaultNCSFeatureFlags = {
 const productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
-    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
   }
 };
 const filterFeatureFlagNames = flags => {

package/dist/es2019/provider/index.js

@@ -228,9 +228,8 @@ export class Provider extends Emitter {
     this.isProviderInitialized = false;
     this.participantsService = new ParticipantsService(this.analyticsHelper, undefined, this.emitCallback, this.config.getUser, this.channel.broadcast, this.channel.sendPresenceJoined, this.getPresenceData, this.setUserId);
     this.metadataService = new MetadataService(this.emitCallback, this.channel.sendMetadata);
-    const reconcileOnRecovery = getCollabProviderFeatureFlag('reconcileOnRecovery', this.config.featureFlags);
     this.namespaceService = new NamespaceService();
-    this.documentService = new DocumentService(this.participantsService, this.analyticsHelper, this.channel.fetchCatchup, this.channel.fetchCatchupv2, this.channel.fetchReconcile, this.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService, this.namespaceService.getIsNamespaceLocked.bind(this.namespaceService), this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery, {
+    this.documentService = new DocumentService(this.participantsService, this.analyticsHelper, this.channel.fetchCatchup, this.channel.fetchCatchupv2, this.channel.fetchReconcile, this.emitCallback, this.channel.broadcast, () => this.userId, this.onErrorHandled, this.metadataService, this.namespaceService.getIsNamespaceLocked.bind(this.namespaceService), this.config.enableErrorOnFailedDocumentApply, {
       __livePage: this.config.__livePage || false
     });
     this.api = new Api(config, this.documentService, this.channel);

package/dist/es2019/version-wrapper.js

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

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

@@ -43,8 +43,7 @@ export var DocumentService = /*#__PURE__*/function () {
   function DocumentService(participantsService, analyticsHelper, fetchCatchup, fetchCatchupv2, fetchReconcile, providerEmitCallback, broadcast, getUserId, onErrorHandled, metadataService, isNameSpaceLocked) {
     var _this = this;
     var enableErrorOnFailedDocumentApply = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
-    var reconcileOnRecovery = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
-    var options = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : {
+    var options = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : {
       __livePage: false
     };
     _classCallCheck(this, DocumentService);
@@ -323,17 +322,12 @@ export var DocumentService = /*#__PURE__*/function () {
               // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
               // We can then reconcile the document with the preserved state.
               unconfirmedSteps = _this.getUnconfirmedSteps();
-              if (!_this.reconcileOnRecovery) {
-                _context4.next = 6;
-                break;
-              }
-              _context4.next = 5;
+              _context4.next = 4;
               return _this.getCurrentState();
-            case 5:
+            case 4:
               currentState = _context4.sent;
-            case 6:
-              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && _this.reconcileOnRecovery && currentState);
-              _context4.prev = 7;
+              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState);
+              _context4.prev = 6;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -350,29 +344,29 @@ export var DocumentService = /*#__PURE__*/function () {
 
               // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
               if (!(useReconcile && currentState)) {
-                _context4.next = 15;
+                _context4.next = 14;
                 break;
               }
-              _context4.next = 13;
+              _context4.next = 12;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 13:
-              _context4.next = 16;
+            case 12:
+              _context4.next = 15;
               break;
-            case 15:
+            case 14:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 16:
+            case 15:
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
                 useReconcile: useReconcile
               });
-              _context4.next = 24;
+              _context4.next = 23;
               break;
-            case 19:
-              _context4.prev = 19;
-              _context4.t0 = _context4["catch"](7);
+            case 18:
+              _context4.prev = 18;
+              _context4.t0 = _context4["catch"](6);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 useReconcile: useReconcile
@@ -386,11 +380,11 @@ export var DocumentService = /*#__PURE__*/function () {
                   code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 24:
+            case 23:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[7, 19]]);
+        }, _callee4, null, [[6, 18]]);
       }));
       return function (_x) {
         return _ref6.apply(this, arguments);
@@ -660,7 +654,6 @@ export var DocumentService = /*#__PURE__*/function () {
     this.metadataService = metadataService;
     this.isNameSpaceLocked = isNameSpaceLocked;
     this.enableErrorOnFailedDocumentApply = enableErrorOnFailedDocumentApply;
-    this.reconcileOnRecovery = reconcileOnRecovery;
     this.options = options;
     this.stepQueue = new StepQueueState();
   }

package/dist/esm/feature-flags/index.js

@@ -1,8 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var defaultNCSFeatureFlags = {
   testFF: false,
-  blockViewOnly: false,
-  reconcileOnRecovery: false
+  blockViewOnly: false
 };
 
 /**
@@ -11,8 +10,7 @@ var defaultNCSFeatureFlags = {
 var productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
-    blockViewOnly: 'confluence.frontend.ncs.block-view-only',
-    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
+    blockViewOnly: 'confluence.frontend.ncs.block-view-only'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/esm/provider/index.js

@@ -266,11 +266,10 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _this.isProviderInitialized = false;
     _this.participantsService = new ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined, _this.getPresenceData, _this.setUserId);
     _this.metadataService = new MetadataService(_this.emitCallback, _this.channel.sendMetadata);
-    var reconcileOnRecovery = getCollabProviderFeatureFlag('reconcileOnRecovery', _this.config.featureFlags);
     _this.namespaceService = new NamespaceService();
     _this.documentService = new DocumentService(_this.participantsService, _this.analyticsHelper, _this.channel.fetchCatchup, _this.channel.fetchCatchupv2, _this.channel.fetchReconcile, _this.emitCallback, _this.channel.broadcast, function () {
       return _this.userId;
-    }, _this.onErrorHandled, _this.metadataService, _this.namespaceService.getIsNamespaceLocked.bind(_this.namespaceService), _this.config.enableErrorOnFailedDocumentApply, reconcileOnRecovery, {
+    }, _this.onErrorHandled, _this.metadataService, _this.namespaceService.getIsNamespaceLocked.bind(_this.namespaceService), _this.config.enableErrorOnFailedDocumentApply, {
       __livePage: _this.config.__livePage || false
     });
     _this.api = new Api(config, _this.documentService, _this.channel);

package/dist/esm/version-wrapper.js

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

package/dist/types/document/document-service.d.ts

@@ -21,7 +21,6 @@ export declare class DocumentService {
     private metadataService;
     private isNameSpaceLocked;
     private enableErrorOnFailedDocumentApply;
-    private reconcileOnRecovery;
     private options;
     private getState;
     private onSyncUpError?;
@@ -45,7 +44,7 @@ export declare class DocumentService {
      * @param metadataService
      * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
      */
-    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, reconcileOnRecovery?: boolean, options?: {
+    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, options?: {
         __livePage: boolean;
     });
     /**

package/dist/types/feature-flags/types.d.ts

@@ -1,7 +1,6 @@
 export interface NCSFeatureFlags {
     testFF?: boolean;
     blockViewOnly?: boolean;
-    reconcileOnRecovery?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

package/dist/types-ts4.5/document/document-service.d.ts

@@ -21,7 +21,6 @@ export declare class DocumentService {
     private metadataService;
     private isNameSpaceLocked;
     private enableErrorOnFailedDocumentApply;
-    private reconcileOnRecovery;
     private options;
     private getState;
     private onSyncUpError?;
@@ -45,7 +44,7 @@ export declare class DocumentService {
      * @param metadataService
      * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
      */
-    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, reconcileOnRecovery?: boolean, options?: {
+    constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, options?: {
         __livePage: boolean;
     });
     /**

package/dist/types-ts4.5/feature-flags/types.d.ts

@@ -1,7 +1,6 @@
 export interface NCSFeatureFlags {
     testFF?: boolean;
     blockViewOnly?: boolean;
-    reconcileOnRecovery?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

package/package.json

@@ -1,81 +1,81 @@
 {
-  "name": "@atlaskit/collab-provider",
-  "version": "9.29.3",
-  "description": "A provider for collaborative editing.",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
-  "author": "Atlassian Pty Ltd",
-  "license": "Apache-2.0",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "module:es2019": "dist/es2019/index.js",
-  "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.5 <4.9": {
-      "*": [
-        "dist/types-ts4.5/*",
-        "dist/types-ts4.5/index.d.ts"
-      ]
-    }
-  },
-  "sideEffects": false,
-  "atlaskit:src": "src/index.ts",
-  "atlassian": {
-    "team": "Editor: Collaboration",
-    "inPublicMirror": true,
-    "releaseModel": "continuous",
-    "productPushConsumption": [
-      "jira"
-    ]
-  },
-  "af:exports": {
-    ".": "./src/index.ts",
-    "./socket-io-provider": "./src/socket-io-provider.ts",
-    "./types": "./src/types.ts",
-    "./version-wrapper": "./src/version-wrapper.ts"
-  },
-  "dependencies": {
-    "@atlaskit/analytics-gas-types": "^5.1.0",
-    "@atlaskit/analytics-listeners": "^8.9.0",
-    "@atlaskit/editor-common": "^82.0.0",
-    "@atlaskit/editor-json-transformer": "^8.13.0",
-    "@atlaskit/editor-prosemirror": "4.0.1",
-    "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/prosemirror-collab": "^0.4.0",
-    "@atlaskit/ufo": "^0.2.0",
-    "@atlaskit/util-service-support": "^6.2.0",
-    "@babel/runtime": "^7.0.0",
-    "eventemitter2": "^4.1.0",
-    "lodash": "^4.17.21",
-    "socket.io-client": "^4.7.1"
-  },
-  "techstack": {
-    "@atlassian/frontend": {
-      "tree-shaking": []
-    },
-    "@repo/internal": {
-      "deprecation": "no-deprecated-imports",
-      "design-tokens": [
-        "color"
-      ],
-      "styling": [
-        "emotion"
-      ]
-    }
-  },
-  "devDependencies": {
-    "@atlaskit/adf-schema": "^36.10.7",
-    "@atlassian/feature-flags-test-utils": "^0.2.0",
-    "typescript": "~5.4.2"
-  },
-  "platform-feature-flags": {
-    "platform.editor.live-pages-expand-divergence": {
-      "type": "boolean"
-    },
-    "platform.editor.ncs.log-error-stacks": {
-      "type": "boolean"
-    }
-  }
-}
+	"name": "@atlaskit/collab-provider",
+	"version": "9.30.0",
+	"description": "A provider for collaborative editing.",
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org/"
+	},
+	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
+	"author": "Atlassian Pty Ltd",
+	"license": "Apache-2.0",
+	"main": "dist/cjs/index.js",
+	"module": "dist/esm/index.js",
+	"module:es2019": "dist/es2019/index.js",
+	"types": "dist/types/index.d.ts",
+	"typesVersions": {
+		">=4.5 <4.9": {
+			"*": [
+				"dist/types-ts4.5/*",
+				"dist/types-ts4.5/index.d.ts"
+			]
+		}
+	},
+	"sideEffects": false,
+	"atlaskit:src": "src/index.ts",
+	"atlassian": {
+		"team": "Editor: Collaboration",
+		"inPublicMirror": true,
+		"releaseModel": "continuous",
+		"productPushConsumption": [
+			"jira"
+		]
+	},
+	"af:exports": {
+		".": "./src/index.ts",
+		"./socket-io-provider": "./src/socket-io-provider.ts",
+		"./types": "./src/types.ts",
+		"./version-wrapper": "./src/version-wrapper.ts"
+	},
+	"dependencies": {
+		"@atlaskit/analytics-gas-types": "^5.1.0",
+		"@atlaskit/analytics-listeners": "^8.10.0",
+		"@atlaskit/editor-common": "^82.12.0",
+		"@atlaskit/editor-json-transformer": "^8.14.0",
+		"@atlaskit/editor-prosemirror": "4.0.1",
+		"@atlaskit/platform-feature-flags": "^0.2.0",
+		"@atlaskit/prosemirror-collab": "^0.5.0",
+		"@atlaskit/ufo": "^0.2.0",
+		"@atlaskit/util-service-support": "^6.2.0",
+		"@babel/runtime": "^7.0.0",
+		"eventemitter2": "^4.1.0",
+		"lodash": "^4.17.21",
+		"socket.io-client": "^4.7.1"
+	},
+	"techstack": {
+		"@atlassian/frontend": {
+			"tree-shaking": []
+		},
+		"@repo/internal": {
+			"deprecation": "no-deprecated-imports",
+			"design-tokens": [
+				"color"
+			],
+			"styling": [
+				"emotion"
+			]
+		}
+	},
+	"devDependencies": {
+		"@atlaskit/adf-schema": "^37.0.0",
+		"@atlassian/feature-flags-test-utils": "^0.2.0",
+		"typescript": "~5.4.2"
+	},
+	"platform-feature-flags": {
+		"platform.editor.live-pages-expand-divergence": {
+			"type": "boolean"
+		},
+		"platform.editor.ncs.log-error-stacks": {
+			"type": "boolean"
+		}
+	}
+}