@atlaskit/collab-provider 10.14.0 → 10.14.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/collab-provider
 
+## 10.14.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.14.1
+
+### Patch Changes
+
+- [#140813](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140813)
+  [`c4756a5c1a4ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c4756a5c1a4ae) -
+  Migrating offline editing feature gates to a new experiment "platform_editor_offline_editing_web"
+- Updated dependencies
+
 ## 10.14.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -44,6 +44,9 @@
         {
             "path": "../../../react-ufo/atlaskit/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../../data/ufo-external/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

@@ -44,6 +44,9 @@
 		{
 			"path": "../../../react-ufo/atlaskit/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../data/ufo-external/afm-jira/tsconfig.json"
 		},

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

@@ -11,11 +11,11 @@ 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 _throttle = _interopRequireDefault(require("lodash/throttle"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _const = require("../helpers/const");
 var _performance = require("../analytics/performance");
 var _internalErrors = require("../errors/internal-errors");
@@ -764,7 +764,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      */
     function notifyReconnectionConflict(steps) {
       var _this$getState7, _getCollabState;
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_offline_conflict_resolution')) {
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', false)) {
         return;
       }
       var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
@@ -902,7 +902,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
       // Don't send any steps before we're ready.
-      if ((0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps')) {
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
         if (!unconfirmedStepsData || !this.getConnected()) {
           return;
         }
@@ -945,7 +945,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // If we are going to commit unconfirmed steps
       // we need to lock them to ensure they don't get
       // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
-      if ((0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps')) {
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
         unconfirmedStepsData.origins.forEach(function (origin) {
           if (origin instanceof _state.Transaction) {
             return origin.setMeta('mergeIsLocked', true);

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

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

@@ -1,10 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import throttle from 'lodash/throttle';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
@@ -651,7 +651,7 @@ export class DocumentService {
    */
   notifyReconnectionConflict(steps) {
     var _this$getState7, _getCollabState;
-    if (!fg('platform_editor_offline_conflict_resolution')) {
+    if (editorExperiment('platform_editor_offline_editing_web', false)) {
       return;
     }
     const state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
@@ -776,7 +776,7 @@ export class DocumentService {
     const version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
     // Don't send any steps before we're ready.
-    if (fg('platform_editor_merge_unconfirmed_steps')) {
+    if (editorExperiment('platform_editor_offline_editing_web', true)) {
       if (!unconfirmedStepsData || !this.getConnected()) {
         return;
       }
@@ -819,7 +819,7 @@ export class DocumentService {
     // If we are going to commit unconfirmed steps
     // we need to lock them to ensure they don't get
     // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
-    if (fg('platform_editor_merge_unconfirmed_steps')) {
+    if (editorExperiment('platform_editor_offline_editing_web', true)) {
       unconfirmedStepsData.origins.forEach(origin => {
         if (origin instanceof Transaction) {
           return origin.setMeta('mergeIsLocked', true);

package/dist/es2019/version-wrapper.js

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

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

@@ -6,11 +6,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _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 throttle from 'lodash/throttle';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
@@ -757,7 +757,7 @@ export var DocumentService = /*#__PURE__*/function () {
      */
     function notifyReconnectionConflict(steps) {
       var _this$getState7, _getCollabState;
-      if (!fg('platform_editor_offline_conflict_resolution')) {
+      if (editorExperiment('platform_editor_offline_editing_web', false)) {
         return;
       }
       var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
@@ -895,7 +895,7 @@ export var DocumentService = /*#__PURE__*/function () {
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
       // Don't send any steps before we're ready.
-      if (fg('platform_editor_merge_unconfirmed_steps')) {
+      if (editorExperiment('platform_editor_offline_editing_web', true)) {
         if (!unconfirmedStepsData || !this.getConnected()) {
           return;
         }
@@ -938,7 +938,7 @@ export var DocumentService = /*#__PURE__*/function () {
       // If we are going to commit unconfirmed steps
       // we need to lock them to ensure they don't get
       // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
-      if (fg('platform_editor_merge_unconfirmed_steps')) {
+      if (editorExperiment('platform_editor_offline_editing_web', true)) {
         unconfirmedStepsData.origins.forEach(function (origin) {
           if (origin instanceof Transaction) {
             return origin.setMeta('mergeIsLocked', true);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.14.0";
+export var version = "10.14.2";
 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": "10.14.0",
+	"version": "10.14.2",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,13 +35,14 @@
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^9.0.0",
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^104.0.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/feature-gate-js-client": "^5.0.0",
+		"@atlaskit/feature-gate-js-client": "^5.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.16.0",
-		"@atlaskit/react-ufo": "^3.4.0",
+		"@atlaskit/react-ufo": "^3.9.0",
+		"@atlaskit/tmp-editor-statsig": "^4.16.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/util-service-support": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -74,12 +75,6 @@
 		"platform.editor.live-pages-expand-divergence": {
 			"type": "boolean"
 		},
-		"platform_editor_merge_unconfirmed_steps": {
-			"type": "boolean"
-		},
-		"platform_editor_offline_conflict_resolution": {
-			"type": "boolean"
-		},
 		"platform_collab_provider_tracingheaders": {
 			"type": "boolean"
 		},