@atlaskit/collab-provider 9.22.6 → 9.22.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/collab-provider
 
+## 9.22.7
+
+### Patch Changes
+
+- [#71133](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/71133) [`22d7f6ed1f02`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/22d7f6ed1f02) - revert prosemirror-collab unfork
+
 ## 9.22.6
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -30,6 +30,9 @@
         {
             "path": "../../editor-json-transformer/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../prosemirror-collab/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../../data/ufo-external/afm-cc/tsconfig.json"
         },

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

@@ -11,7 +11,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _const = require("../helpers/const");
-var _prosemirrorCollab = require("prosemirror-collab");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _performance = require("../analytics/performance");
@@ -129,7 +129,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return (0, _prosemirrorCollab.getVersion)(state) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+      return (0, _prosemirrorCollab.getVersion)(state);
     });
     (0, _defineProperty2.default)(this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var _this$getState2, _this$analyticsHelper5, _this$analyticsHelper4, state, adfDocument, currentState, measure, _this$analyticsHelper6, _this$analyticsHelper7, _measure;
@@ -148,7 +148,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             currentState = {
               content: adfDocument,
               title: _this.metadataService.getTitle(),
-              stepVersion: (0, _prosemirrorCollab.getVersion)(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+              stepVersion: (0, _prosemirrorCollab.getVersion)(state)
             };
             measure = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendActionEvent(_const.EVENT_ACTION.GET_CURRENT_STATE, _const.EVENT_STATUS.SUCCESS, {
@@ -472,7 +472,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 tries: count,
                 maxRetries: _const.ACK_MAX_TRY,
                 clientId: _this.clientId,
-                version: (0, _prosemirrorCollab.getVersion)(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+                version: (0, _prosemirrorCollab.getVersion)(state)
               });
             }
             unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(function (step) {

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

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
-import { getVersion, sendableSteps } from 'prosemirror-collab';
+import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -95,7 +95,7 @@ export class DocumentService {
         (_this$analyticsHelper3 = this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 ? void 0 : _this$analyticsHelper3.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return getVersion(state) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+      return getVersion(state);
     });
     _defineProperty(this, "getCurrentState", async () => {
       try {
@@ -112,9 +112,8 @@ export class DocumentService {
         const currentState = {
           content: adfDocument,
           title: this.metadataService.getTitle(),
-          stepVersion: getVersion(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+          stepVersion: getVersion(state)
         };
-
         const measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, this.analyticsHelper);
         (_this$analyticsHelper5 = this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.SUCCESS, {
           latency: measure === null || measure === void 0 ? void 0 : measure.duration
@@ -397,10 +396,9 @@ export class DocumentService {
                   tries: count,
                   maxRetries: ACK_MAX_TRY,
                   clientId: this.clientId,
-                  version: getVersion(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+                  version: getVersion(state)
                 });
               }
-
               const unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(step => getStepUGCFreeDetails(step));
               const error = new CantSyncUpError("Can't sync up with Collab Service: unable to send unconfirmed steps and max retry reached", {
                 unconfirmedStepsInfo: unconfirmedStepsInfoUGCRemoved ? JSON.stringify(unconfirmedStepsInfoUGCRemoved) : 'Unable to generate UGC removed step info'

package/dist/es2019/version-wrapper.js

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

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

@@ -6,7 +6,7 @@ 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 _regeneratorRuntime from "@babel/runtime/regenerator";
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
-import { getVersion, sendableSteps } from 'prosemirror-collab';
+import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -122,7 +122,7 @@ export var DocumentService = /*#__PURE__*/function () {
         (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return getVersion(state) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+      return getVersion(state);
     });
     _defineProperty(this, "getCurrentState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var _this$getState2, _this$analyticsHelper5, _this$analyticsHelper4, state, adfDocument, currentState, measure, _this$analyticsHelper6, _this$analyticsHelper7, _measure;
@@ -141,7 +141,7 @@ export var DocumentService = /*#__PURE__*/function () {
             currentState = {
               content: adfDocument,
               title: _this.metadataService.getTitle(),
-              stepVersion: getVersion(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+              stepVersion: getVersion(state)
             };
             measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.SUCCESS, {
@@ -465,7 +465,7 @@ export var DocumentService = /*#__PURE__*/function () {
                 tries: count,
                 maxRetries: ACK_MAX_TRY,
                 clientId: _this.clientId,
-                version: getVersion(state) || 0 // To mimic the default value customisation introduced in the prosemirror-collab fork
+                version: getVersion(state)
               });
             }
             unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(function (step) {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "9.22.6";
+export var version = "9.22.7";
 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": "9.22.6",
+  "version": "9.22.7",
   "description": "A provider for collaborative editing.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -39,12 +39,12 @@
     "@atlaskit/editor-common": "^77.3.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
+    "@atlaskit/prosemirror-collab": "^0.2.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",
-    "prosemirror-collab": "1.3.1",
     "socket.io-client": "^4.7.1"
   },
   "techstack": {