@atlaskit/editor-plugin-collab-edit 18.1.0 → 18.1.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 18.1.2
+
+### Patch Changes
+
+- [`962e8dc0188bf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/962e8dc0188bf) -
+  Clean up `platform_editor_offline_editing_web` with `isEnabled: true` for Confluence, keeping
+  offline editing and recovery behavior enabled. Remove the retired experiment from the editor
+  Statsig configuration; consumers must stop querying or overriding this experiment.
+- Updated dependencies
+
+## 18.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 18.1.0
 
 ### Minor Changes

package/dist/cjs/collabEditPlugin.js

@@ -16,7 +16,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _analytics2 = require("./pm-plugins/analytics");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
 var _filterAnalytics = require("./pm-plugins/filterAnalytics");
@@ -207,10 +206,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
       var transformUnconfirmed = function transformUnconfirmed(steps) {
         var transformed = (0, _filterAnalytics.filterAnalyticsSteps)(steps);
-        if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) || (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-          return (0, _mergeUnconfirmed.mergeUnconfirmedSteps)(transformed, api);
-        }
-        return transformed;
+        return (0, _mergeUnconfirmed.mergeUnconfirmedSteps)(transformed, api);
       };
       var plugins = [].concat((0, _toConsumableArray2.default)(useNativePlugin ? [{
         name: 'pmCollab',
@@ -261,12 +257,10 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: _trackLastOrganicChange.createPlugin
       });
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true)) {
-        plugins.push({
-          name: 'trackLastRemoteConflictPlugin',
-          plugin: _trackReconnectionConflict.createPlugin
-        });
-      }
+      plugins.push({
+        name: 'trackLastRemoteConflictPlugin',
+        plugin: _trackReconnectionConflict.createPlugin
+      });
       return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {

package/dist/cjs/pm-plugins/track-step-metrics.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateNcsSessionStepMetrics = exports.updateNcsActiveSessions = exports.getNcsSessionStepMetrics = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ncsStepMetrics = require("@atlaskit/editor-common/ncs-step-metrics");
-var _frontendUtilities = require("@atlaskit/frontend-utilities");
+var _StorageClient = require("@atlaskit/frontend-utilities/StorageClient");
 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; }
-var storageClient = new _frontendUtilities.StorageClient(_ncsStepMetrics.NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
+var storageClient = new _StorageClient.StorageClient(_ncsStepMetrics.NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**
  * Gets the current step session metrics for a given session ID

package/dist/es2019/collabEditPlugin.js

@@ -5,7 +5,6 @@ import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/trans
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
 import { filterAnalyticsSteps } from './pm-plugins/filterAnalytics';
@@ -162,10 +161,7 @@ export const collabEditPlugin = ({
       } = options || {};
       const transformUnconfirmed = steps => {
         const transformed = filterAnalyticsSteps(steps);
-        if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-          return mergeUnconfirmedSteps(transformed, api);
-        }
-        return transformed;
+        return mergeUnconfirmedSteps(transformed, api);
       };
       const plugins = [...(useNativePlugin ? [{
         name: 'pmCollab',
@@ -209,12 +205,10 @@ export const collabEditPlugin = ({
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
-      if (editorExperiment('platform_editor_offline_editing_web', true)) {
-        plugins.push({
-          name: 'trackLastRemoteConflictPlugin',
-          plugin: createTrackReconnectionConflictPlugin
-        });
-      }
+      plugins.push({
+        name: 'trackLastRemoteConflictPlugin',
+        plugin: createTrackReconnectionConflictPlugin
+      });
       return plugins;
     },
     onEditorViewStateUpdated(props) {

package/dist/es2019/pm-plugins/track-step-metrics.js

@@ -1,5 +1,5 @@
 import { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
-import { StorageClient } from '@atlaskit/frontend-utilities';
+import { StorageClient } from '@atlaskit/frontend-utilities/StorageClient';
 const storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**

package/dist/esm/collabEditPlugin.js

@@ -11,7 +11,6 @@ import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/trans
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
 import { filterAnalyticsSteps } from './pm-plugins/filterAnalytics';
@@ -200,10 +199,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
       var transformUnconfirmed = function transformUnconfirmed(steps) {
         var transformed = filterAnalyticsSteps(steps);
-        if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
-          return mergeUnconfirmedSteps(transformed, api);
-        }
-        return transformed;
+        return mergeUnconfirmedSteps(transformed, api);
       };
       var plugins = [].concat(_toConsumableArray(useNativePlugin ? [{
         name: 'pmCollab',
@@ -254,12 +250,10 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
-      if (editorExperiment('platform_editor_offline_editing_web', true)) {
-        plugins.push({
-          name: 'trackLastRemoteConflictPlugin',
-          plugin: createTrackReconnectionConflictPlugin
-        });
-      }
+      plugins.push({
+        name: 'trackLastRemoteConflictPlugin',
+        plugin: createTrackReconnectionConflictPlugin
+      });
       return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {

package/dist/esm/pm-plugins/track-step-metrics.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
-import { StorageClient } from '@atlaskit/frontend-utilities';
+import { StorageClient } from '@atlaskit/frontend-utilities/StorageClient';
 var storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "18.1.0",
+	"version": "18.1.2",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,13 +32,13 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^186.0.0",
+		"@atlaskit/tmp-editor-statsig": "^188.0.0",
 		"@atlaskit/tokens": "^16.12.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.4.0",
+		"@atlaskit/editor-common": "^121.5.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0"
 	},