@atlaskit/collab-provider 9.28.6 → 9.29.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/collab-provider
 
+## 9.29.0
+
+### Minor Changes
+
+-   [#99579](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99579)
+    [`f222af5687e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f222af5687e9) -
+    Bump adf-schema to 36.3.0 and adf-schema-json to 1.14.0
+
+### Patch Changes
+
+-   [#100426](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100426)
+    [`85703bb445ca`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/85703bb445ca) -
+    clean up feature flag connect-websocket-first (abandoned)
+-   Updated dependencies
+
 ## 9.28.6
 
 ### Patch Changes

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

@@ -10,8 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var defaultNCSFeatureFlags = {
   testFF: false,
   blockViewOnly: false,
-  reconcileOnRecovery: false,
-  connectWebsocketFirst: false
+  reconcileOnRecovery: false
 };
 
 /**
@@ -21,8 +20,7 @@ var productKeys = {
   confluence: {
     testFF: 'confluence.frontend.collab.provider.testFF',
     blockViewOnly: 'confluence.frontend.ncs.block-view-only',
-    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery',
-    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first'
+    reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

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

@@ -9,7 +9,6 @@ exports.createSocketIOSocket = createSocketIOSocket;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _provider = require("./provider");
 var _socket = require("socket.io-client");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
@@ -17,54 +16,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function createSocketIOSocket(url, auth, productInfo) {
   var _URL = new URL(url),
     pathname = _URL.pathname;
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.ncs.try-connect-websocket-first')) {
-    var socket = (0, _socket.io)(url, {
-      reconnectionDelayMax: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: _config.SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['websocket'],
-      path: "/".concat(pathname.split('/')[1], "/socket.io"),
-      auth: auth,
-      extraHeaders: {
-        'x-product': (0, _utils.getProduct)(productInfo),
-        'x-subproduct': (0, _utils.getSubProduct)(productInfo)
-      }
-    });
-    socket.on('connect_error', function (error) {
-      // There is no good documentation about this error, howevert this is how socket.io is emiting the websocket error
-      // see: https://github.com/socketio/engine.io-client/blob/6.0.x/lib/transports/websocket.ts#L116
-      var isWebSocketError = (error.message || '') === 'websocket error';
-
-      // Neither this TransportError type is well documented
-      // see: https://github.com/socketio/engine.io-client/blob/main/lib/transport.ts#L11
-      var isTransportError =
-      // @ts-expect-error
-      error.type === 'TransportError';
-
-      // We are checking both situations as a safe measure
-      if (isWebSocketError || isTransportError) {
-        socket.io.opts.transports = ['polling', 'websocket'];
-      }
-    });
-    return socket;
-  } else {
-    return (0, _socket.io)(url, {
-      reconnectionDelayMax: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: _config.SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['polling', 'websocket'],
-      path: "/".concat(pathname.split('/')[1], "/socket.io"),
-      auth: auth,
-      extraHeaders: {
-        'x-product': (0, _utils.getProduct)(productInfo),
-        'x-subproduct': (0, _utils.getSubProduct)(productInfo)
-      }
-    });
-  }
+  return (0, _socket.io)(url, {
+    reconnectionDelayMax: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
+    reconnectionDelay: _config.SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
+    randomizationFactor: _config.SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
+    closeOnBeforeunload: false,
+    withCredentials: true,
+    transports: ['polling', 'websocket'],
+    path: "/".concat(pathname.split('/')[1], "/socket.io"),
+    auth: auth,
+    extraHeaders: {
+      'x-product': (0, _utils.getProduct)(productInfo),
+      'x-subproduct': (0, _utils.getSubProduct)(productInfo)
+    }
+  });
 }
 function createSocketIOCollabProvider(config) {
   return new _provider.Provider(_objectSpread(_objectSpread({}, config), {}, {

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

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

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

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

@@ -1,60 +1,25 @@
 import { Provider } from './provider';
 import { io } from 'socket.io-client';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getProduct, getSubProduct } from './helpers/utils';
 import { SOCKET_IO_OPTIONS } from './config';
 export function createSocketIOSocket(url, auth, productInfo) {
   const {
     pathname
   } = new URL(url);
-  if (getBooleanFF('platform.editor.ncs.try-connect-websocket-first')) {
-    const socket = io(url, {
-      reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['websocket'],
-      path: `/${pathname.split('/')[1]}/socket.io`,
-      auth,
-      extraHeaders: {
-        'x-product': getProduct(productInfo),
-        'x-subproduct': getSubProduct(productInfo)
-      }
-    });
-    socket.on('connect_error', error => {
-      // There is no good documentation about this error, howevert this is how socket.io is emiting the websocket error
-      // see: https://github.com/socketio/engine.io-client/blob/6.0.x/lib/transports/websocket.ts#L116
-      const isWebSocketError = (error.message || '') === 'websocket error';
-
-      // Neither this TransportError type is well documented
-      // see: https://github.com/socketio/engine.io-client/blob/main/lib/transport.ts#L11
-      const isTransportError =
-      // @ts-expect-error
-      error.type === 'TransportError';
-
-      // We are checking both situations as a safe measure
-      if (isWebSocketError || isTransportError) {
-        socket.io.opts.transports = ['polling', 'websocket'];
-      }
-    });
-    return socket;
-  } else {
-    return io(url, {
-      reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['polling', 'websocket'],
-      path: `/${pathname.split('/')[1]}/socket.io`,
-      auth,
-      extraHeaders: {
-        'x-product': getProduct(productInfo),
-        'x-subproduct': getSubProduct(productInfo)
-      }
-    });
-  }
+  return io(url, {
+    reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
+    reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
+    randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
+    closeOnBeforeunload: false,
+    withCredentials: true,
+    transports: ['polling', 'websocket'],
+    path: `/${pathname.split('/')[1]}/socket.io`,
+    auth,
+    extraHeaders: {
+      'x-product': getProduct(productInfo),
+      'x-subproduct': getSubProduct(productInfo)
+    }
+  });
 }
 export function createSocketIOCollabProvider(config) {
   return new Provider({

package/dist/es2019/version-wrapper.js

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

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

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

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

@@ -3,60 +3,25 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { Provider } from './provider';
 import { io } from 'socket.io-client';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getProduct, getSubProduct } from './helpers/utils';
 import { SOCKET_IO_OPTIONS } from './config';
 export function createSocketIOSocket(url, auth, productInfo) {
   var _URL = new URL(url),
     pathname = _URL.pathname;
-  if (getBooleanFF('platform.editor.ncs.try-connect-websocket-first')) {
-    var socket = io(url, {
-      reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['websocket'],
-      path: "/".concat(pathname.split('/')[1], "/socket.io"),
-      auth: auth,
-      extraHeaders: {
-        'x-product': getProduct(productInfo),
-        'x-subproduct': getSubProduct(productInfo)
-      }
-    });
-    socket.on('connect_error', function (error) {
-      // There is no good documentation about this error, howevert this is how socket.io is emiting the websocket error
-      // see: https://github.com/socketio/engine.io-client/blob/6.0.x/lib/transports/websocket.ts#L116
-      var isWebSocketError = (error.message || '') === 'websocket error';
-
-      // Neither this TransportError type is well documented
-      // see: https://github.com/socketio/engine.io-client/blob/main/lib/transport.ts#L11
-      var isTransportError =
-      // @ts-expect-error
-      error.type === 'TransportError';
-
-      // We are checking both situations as a safe measure
-      if (isWebSocketError || isTransportError) {
-        socket.io.opts.transports = ['polling', 'websocket'];
-      }
-    });
-    return socket;
-  } else {
-    return io(url, {
-      reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
-      reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
-      randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
-      closeOnBeforeunload: false,
-      withCredentials: true,
-      transports: ['polling', 'websocket'],
-      path: "/".concat(pathname.split('/')[1], "/socket.io"),
-      auth: auth,
-      extraHeaders: {
-        'x-product': getProduct(productInfo),
-        'x-subproduct': getSubProduct(productInfo)
-      }
-    });
-  }
+  return io(url, {
+    reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
+    reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
+    randomizationFactor: SOCKET_IO_OPTIONS.RANDOMIZATION_FACTOR,
+    closeOnBeforeunload: false,
+    withCredentials: true,
+    transports: ['polling', 'websocket'],
+    path: "/".concat(pathname.split('/')[1], "/socket.io"),
+    auth: auth,
+    extraHeaders: {
+      'x-product': getProduct(productInfo),
+      'x-subproduct': getSubProduct(productInfo)
+    }
+  });
 }
 export function createSocketIOCollabProvider(config) {
   return new Provider(_objectSpread(_objectSpread({}, config), {}, {

package/dist/esm/version-wrapper.js

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/collab-provider",
-  "version": "9.28.6",
+  "version": "9.29.0",
   "description": "A provider for collaborative editing.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -39,11 +39,11 @@
   "dependencies": {
     "@atlaskit/analytics-gas-types": "^5.1.0",
     "@atlaskit/analytics-listeners": "^8.9.0",
-    "@atlaskit/editor-common": "^80.0.0",
-    "@atlaskit/editor-json-transformer": "^8.12.0",
+    "@atlaskit/editor-common": "^80.1.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.3.0",
+    "@atlaskit/prosemirror-collab": "^0.4.0",
     "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/util-service-support": "^6.2.0",
     "@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
     }
   },
   "devDependencies": {
-    "@atlaskit/adf-schema": "^36.1.0",
+    "@atlaskit/adf-schema": "^36.3.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
     "typescript": "~5.4.2"
@@ -76,9 +76,6 @@
     "platform.editor.live-pages-expand-divergence": {
       "type": "boolean"
     },
-    "platform.editor.ncs.try-connect-websocket-first": {
-      "type": "boolean"
-    },
     "platform.editor.ncs.log-error-stacks": {
       "type": "boolean"
     }