@atlaskit/collab-provider 10.21.0 → 10.22.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/collab-provider
 
+## 10.22.0
+
+### Minor Changes
+
+- [#179240](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179240)
+  [`cf397492aea34`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf397492aea34) -
+  Revert 179240 - to support for custom authentication headers
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.21.1
+
+### Patch Changes
+
+- [#179865](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179865)
+  [`33dc1bfc85993`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33dc1bfc85993) -
+  ED-28407 Offline Editing: Add logic that will mark offline steps as regular steps after 6s of
+  being online. Added as a fallback incase there's issue with the offline storage plugin and it's
+  unable to handle the steps.
+
 ## 10.21.0
 
 ### Minor Changes

package/dist/cjs/channel.js

@@ -636,7 +636,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           };
         }();
       }
-      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper, this.config.customExtraHeaders);
+      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper);
 
       // Due to https://github.com/socketio/socket.io-client/issues/1473,
       // reconnect no longer fired on the socket.

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

@@ -79,6 +79,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "catchUpOutofSync", false);
     (0, _defineProperty2.default)(this, "hasRecovered", false);
     (0, _defineProperty2.default)(this, "numberOfStepCommitsSent", 0);
+    (0, _defineProperty2.default)(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -1001,6 +1002,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      */
     function send(tr, _oldState, newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
     ) {
+      var _this3 = this;
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
@@ -1057,12 +1059,36 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         });
       }
       if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
-        var offlineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
+        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 (offlineSteps) {
+        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 (_this3.getConnected()) {
+                _this3.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 {
+                _this3.timeout = undefined;
+              }
+            }, 6000);
+          }
           return;
+        } else if (this.timeoutExceeded) {
+          this.timeoutExceeded = false;
+          if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
+          }
         }
       }
 

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

@@ -14,7 +14,7 @@ var _utils = require("./helpers/utils");
 var _config = require("./config");
 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; }
-function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper, customExtraHeaders) {
+function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper) {
   var _URL = new URL(url),
     pathname = _URL.pathname;
   var socketIOOptions = _config.SOCKET_IO_OPTIONS;
@@ -31,13 +31,6 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
       socketIOOptions = _config.SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
     }
   }
-
-  // Merge default headers with custom headers, custom headers take precedence
-  var defaultExtraHeaders = {
-    'x-product': (0, _utils.getProduct)(productInfo),
-    'x-subproduct': (0, _utils.getSubProduct)(productInfo)
-  };
-  var extraHeaders = customExtraHeaders ? _objectSpread(_objectSpread({}, defaultExtraHeaders), customExtraHeaders) : defaultExtraHeaders;
   var client = (0, _socket.io)(url, {
     reconnectionDelayMax: socketIOOptions.RECONNECTION_DELAY_MAX,
     reconnectionDelay: socketIOOptions.RECONNECTION_DELAY,
@@ -47,7 +40,10 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
     transports: transports,
     path: "/".concat(pathname.split('/')[1], "/socket.io"),
     auth: auth,
-    extraHeaders: extraHeaders
+    extraHeaders: {
+      'x-product': (0, _utils.getProduct)(productInfo),
+      'x-subproduct': (0, _utils.getSubProduct)(productInfo)
+    }
   });
   return client;
 }

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

package/dist/es2019/channel.js

@@ -448,7 +448,7 @@ export class Channel extends Emitter {
         cb(authData);
       };
     }
-    this.socket = createSocket(`${url}/session/${documentAri}`, auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper, this.config.customExtraHeaders);
+    this.socket = createSocket(`${url}/session/${documentAri}`, auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper);
 
     // Due to https://github.com/socketio/socket.io-client/issues/1473,
     // reconnect no longer fired on the socket.

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

@@ -61,6 +61,7 @@ export class DocumentService {
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
     _defineProperty(this, "numberOfStepCommitsSent", 0);
+    _defineProperty(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -924,12 +925,36 @@ export class DocumentService {
       });
     }
     if (editorExperiment('platform_editor_offline_editing_web', true)) {
-      const offlineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(tr => {
+      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 (offlineSteps) {
+      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/socket-io-provider.js

@@ -3,7 +3,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Provider } from './provider';
 import { getProduct, getSubProduct } from './helpers/utils';
 import { SOCKET_IO_OPTIONS, SOCKET_IO_OPTIONS_WITH_HIGH_JITTER } from './config';
-export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper, customExtraHeaders) {
+export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper) {
   const {
     pathname
   } = new URL(url);
@@ -21,16 +21,6 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       socketIOOptions = SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
     }
   }
-
-  // Merge default headers with custom headers, custom headers take precedence
-  const defaultExtraHeaders = {
-    'x-product': getProduct(productInfo),
-    'x-subproduct': getSubProduct(productInfo)
-  };
-  const extraHeaders = customExtraHeaders ? {
-    ...defaultExtraHeaders,
-    ...customExtraHeaders
-  } : defaultExtraHeaders;
   const client = io(url, {
     reconnectionDelayMax: socketIOOptions.RECONNECTION_DELAY_MAX,
     reconnectionDelay: socketIOOptions.RECONNECTION_DELAY,
@@ -40,7 +30,10 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
     transports,
     path: `/${pathname.split('/')[1]}/socket.io`,
     auth,
-    extraHeaders
+    extraHeaders: {
+      'x-product': getProduct(productInfo),
+      'x-subproduct': getSubProduct(productInfo)
+    }
   });
   return client;
 }

package/dist/es2019/version-wrapper.js

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

package/dist/esm/channel.js

@@ -629,7 +629,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
           };
         }();
       }
-      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper, this.config.customExtraHeaders);
+      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper);
 
       // Due to https://github.com/socketio/socket.io-client/issues/1473,
       // reconnect no longer fired on the socket.

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

@@ -72,6 +72,7 @@ export var DocumentService = /*#__PURE__*/function () {
     _defineProperty(this, "catchUpOutofSync", false);
     _defineProperty(this, "hasRecovered", false);
     _defineProperty(this, "numberOfStepCommitsSent", 0);
+    _defineProperty(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -994,6 +995,7 @@ export var DocumentService = /*#__PURE__*/function () {
      */
     function send(tr, _oldState, newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
     ) {
+      var _this3 = this;
       var unconfirmedStepsData = sendableSteps(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
@@ -1050,12 +1052,36 @@ export var DocumentService = /*#__PURE__*/function () {
         });
       }
       if (editorExperiment('platform_editor_offline_editing_web', true)) {
-        var offlineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
+        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 (offlineSteps) {
+        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 (_this3.getConnected()) {
+                _this3.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 {
+                _this3.timeout = undefined;
+              }
+            }, 6000);
+          }
           return;
+        } else if (this.timeoutExceeded) {
+          this.timeoutExceeded = false;
+          if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
+          }
         }
       }
 

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

@@ -6,7 +6,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Provider } from './provider';
 import { getProduct, getSubProduct } from './helpers/utils';
 import { SOCKET_IO_OPTIONS, SOCKET_IO_OPTIONS_WITH_HIGH_JITTER } from './config';
-export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper, customExtraHeaders) {
+export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsHelper) {
   var _URL = new URL(url),
     pathname = _URL.pathname;
   var socketIOOptions = SOCKET_IO_OPTIONS;
@@ -23,13 +23,6 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       socketIOOptions = SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
     }
   }
-
-  // Merge default headers with custom headers, custom headers take precedence
-  var defaultExtraHeaders = {
-    'x-product': getProduct(productInfo),
-    'x-subproduct': getSubProduct(productInfo)
-  };
-  var extraHeaders = customExtraHeaders ? _objectSpread(_objectSpread({}, defaultExtraHeaders), customExtraHeaders) : defaultExtraHeaders;
   var client = io(url, {
     reconnectionDelayMax: socketIOOptions.RECONNECTION_DELAY_MAX,
     reconnectionDelay: socketIOOptions.RECONNECTION_DELAY,
@@ -39,7 +32,10 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
     transports: transports,
     path: "/".concat(pathname.split('/')[1], "/socket.io"),
     auth: auth,
-    extraHeaders: extraHeaders
+    extraHeaders: {
+      'x-product': getProduct(productInfo),
+      'x-subproduct': getSubProduct(productInfo)
+    }
   });
   return client;
 }

package/dist/esm/version-wrapper.js

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

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

@@ -37,6 +37,8 @@ export declare class DocumentService implements DocumentServiceInterface {
     private hasRecovered;
     private numberOfStepCommitsSent;
     private commitStepService;
+    private timeout;
+    private timeoutExceeded;
     private clientId?;
     onErrorHandled: (error: InternalError) => void;
     /**

package/dist/types/document/getConflictChanges.d.ts

@@ -1,7 +1,7 @@
-import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ConflictChanges } from '@atlaskit/editor-common/collab';
-import { Rebaseable } from '@atlaskit/prosemirror-collab';
+import { type Rebaseable } from '@atlaskit/prosemirror-collab';
 interface Options {
     localSteps: readonly Rebaseable[];
     remoteSteps: ProseMirrorStep[];

package/dist/types/helpers/utils.d.ts

@@ -4,7 +4,7 @@ import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/trans
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { StepJson } from '@atlaskit/editor-common/collab';
 import { type JSONDocNode } from '@atlaskit/editor-json-transformer';
-import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
+import { type Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import { CustomError } from '../errors/custom-errors';
 export declare const createLogger: (prefix: string, color?: string) => (msg: string, data?: any) => void;
 export declare function sleep(ms: number): Promise<unknown>;

package/dist/types/participants/participants-helper.d.ts

@@ -1,6 +1,6 @@
 import type { ProviderParticipant } from '@atlaskit/editor-common/collab';
 import type { PresencePayload } from '../types';
-import { ParticipantsState } from './participants-state';
+import { type ParticipantsState } from './participants-state';
 export declare const PARTICIPANT_UPDATE_INTERVAL: number;
 export type ParticipantsMap = Map<string, ProviderParticipant>;
 type UserType = Pick<ProviderParticipant, 'name' | 'avatar' | 'userId' | 'email' | 'isGuest'>;

package/dist/types/socket-io-provider.d.ts

@@ -2,5 +2,5 @@ import type { Socket } from 'socket.io-client';
 import { Provider } from './provider';
 import type AnalyticsHelper from './analytics/analytics-helper';
 import type { Config, ProductInformation, InitAndAuthData, AuthCallback } from './types';
-export declare function createSocketIOSocket(url: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper, customExtraHeaders?: Record<string, string>): Socket;
+export declare function createSocketIOSocket(url: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper): Socket;
 export declare function createSocketIOCollabProvider(config: Omit<Config, 'createSocket'>): Provider;

package/dist/types/types.d.ts

@@ -29,7 +29,7 @@ export interface Config {
     lifecycle?: Lifecycle;
     storage?: Storage;
     need404?: boolean;
-    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper, customExtraHeaders?: Record<string, string>) => SocketIOSocket;
+    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper) => SocketIOSocket;
     batchProps?: BatchProps;
     fetchAnonymousAsset?: FetchAnonymousAsset;
     /**
@@ -96,7 +96,6 @@ export interface Config {
      * This activity can be updated later on by the participants-service.
      */
     presenceActivity?: PresenceActivity;
-    customExtraHeaders?: Record<string, string>;
 }
 export interface InitAndAuthData {
     initialized: boolean;

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

@@ -37,6 +37,8 @@ export declare class DocumentService implements DocumentServiceInterface {
     private hasRecovered;
     private numberOfStepCommitsSent;
     private commitStepService;
+    private timeout;
+    private timeoutExceeded;
     private clientId?;
     onErrorHandled: (error: InternalError) => void;
     /**

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

@@ -1,7 +1,7 @@
-import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ConflictChanges } from '@atlaskit/editor-common/collab';
-import { Rebaseable } from '@atlaskit/prosemirror-collab';
+import { type Rebaseable } from '@atlaskit/prosemirror-collab';
 interface Options {
     localSteps: readonly Rebaseable[];
     remoteSteps: ProseMirrorStep[];

package/dist/types-ts4.5/helpers/utils.d.ts

@@ -4,7 +4,7 @@ import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/trans
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { StepJson } from '@atlaskit/editor-common/collab';
 import { type JSONDocNode } from '@atlaskit/editor-json-transformer';
-import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
+import { type Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import { CustomError } from '../errors/custom-errors';
 export declare const createLogger: (prefix: string, color?: string) => (msg: string, data?: any) => void;
 export declare function sleep(ms: number): Promise<unknown>;

package/dist/types-ts4.5/participants/participants-helper.d.ts

@@ -1,6 +1,6 @@
 import type { ProviderParticipant } from '@atlaskit/editor-common/collab';
 import type { PresencePayload } from '../types';
-import { ParticipantsState } from './participants-state';
+import { type ParticipantsState } from './participants-state';
 export declare const PARTICIPANT_UPDATE_INTERVAL: number;
 export type ParticipantsMap = Map<string, ProviderParticipant>;
 type UserType = Pick<ProviderParticipant, 'name' | 'avatar' | 'userId' | 'email' | 'isGuest'>;

package/dist/types-ts4.5/socket-io-provider.d.ts

@@ -2,5 +2,5 @@ import type { Socket } from 'socket.io-client';
 import { Provider } from './provider';
 import type AnalyticsHelper from './analytics/analytics-helper';
 import type { Config, ProductInformation, InitAndAuthData, AuthCallback } from './types';
-export declare function createSocketIOSocket(url: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper, customExtraHeaders?: Record<string, string>): Socket;
+export declare function createSocketIOSocket(url: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper): Socket;
 export declare function createSocketIOCollabProvider(config: Omit<Config, 'createSocket'>): Provider;

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

@@ -29,7 +29,7 @@ export interface Config {
     lifecycle?: Lifecycle;
     storage?: Storage;
     need404?: boolean;
-    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper, customExtraHeaders?: Record<string, string>) => SocketIOSocket;
+    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation, isPresenceOnly?: boolean, analyticsHelper?: AnalyticsHelper) => SocketIOSocket;
     batchProps?: BatchProps;
     fetchAnonymousAsset?: FetchAnonymousAsset;
     /**
@@ -96,7 +96,6 @@ export interface Config {
      * This activity can be updated later on by the participants-service.
      */
     presenceActivity?: PresenceActivity;
-    customExtraHeaders?: Record<string, string>;
 }
 export interface InitAndAuthData {
     initialized: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.21.0",
+	"version": "10.22.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,14 +36,14 @@
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/anonymous-assets": "^0.0.2",
-		"@atlaskit/editor-common": "^107.4.0",
+		"@atlaskit/editor-common": "^107.6.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.17.0",
 		"@atlaskit/react-ufo": "^3.14.0",
-		"@atlaskit/tmp-editor-statsig": "^8.6.0",
+		"@atlaskit/tmp-editor-statsig": "^8.7.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/util-service-support": "^6.3.0",
 		"@babel/runtime": "^7.0.0",