@atlaskit/editor-plugin-collab-edit 27.0.5 → 27.0.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 27.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.5
 
 ### Patch Changes

package/dist/cjs/collabEditPlugin.js

@@ -9,13 +9,13 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _utils = require("@atlaskit/editor-common/utils");
 var _JSONTransformer = require("@atlaskit/editor-json-transformer/JSONTransformer-2");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
-var _analytics2 = require("./pm-plugins/analytics");
+var _analytics = require("./pm-plugins/analytics");
 var _collabSendHold = require("./pm-plugins/collabSendHold");
 var _collapseStreamingSteps = require("./pm-plugins/collapseStreamingSteps");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
@@ -254,12 +254,12 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
               return (0, _trackAndFilterSpammingSteps.sanitizeFilteredStep)(step);
             });
             api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
-              action: _analytics.ACTION.STEPS_FILTERED,
-              actionSubject: _analytics.ACTION_SUBJECT.COLLAB,
+              action: _enums.ACTION.STEPS_FILTERED,
+              actionSubject: _enums.ACTION_SUBJECT.COLLAB,
               attributes: {
                 steps: sanitizedSteps
               },
-              eventType: _analytics.EVENT_TYPE.OPERATIONAL
+              eventType: _enums.EVENT_TYPE.OPERATIONAL
             });
           });
         }
@@ -288,7 +288,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
           return sendHold.observe(transaction);
         });
       }
-      var addErrorAnalytics = (0, _analytics2.addSynchronyErrorAnalytics)(props.newEditorState, props.newEditorState.tr, featureFlags, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+      var addErrorAnalytics = (0, _analytics.addSynchronyErrorAnalytics)(props.newEditorState, props.newEditorState.tr, featureFlags, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       var isEmptyDoc = (0, _utils.isEmptyDocument)(props.newEditorState.doc);
       var viewMode = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode;
       executeProviderCode((0, _sendTransaction.sendTransaction)({
@@ -308,12 +308,12 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
           onDataProcessed: function onDataProcessed(data) {
             var _api$analytics3;
             api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
-              action: _analytics.ACTION.ORGANIC_CHANGES_TRACKED,
-              actionSubject: _analytics.ACTION_SUBJECT.COLLAB,
+              action: _enums.ACTION.ORGANIC_CHANGES_TRACKED,
+              actionSubject: _enums.ACTION_SUBJECT.COLLAB,
               attributes: {
                 organicChanges: data
               },
-              eventType: _analytics.EVENT_TYPE.OPERATIONAL
+              eventType: _enums.EVENT_TYPE.OPERATIONAL
             });
           }
         }));

package/dist/cjs/pm-plugins/analytics.js

@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAgentEditShimmerNotShownPayload = exports.addSynchronyErrorAnalytics = exports.addSynchronyEntityAnalytics = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
-var _utils = require("@atlaskit/editor-common/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _documentLogger = require("@atlaskit/editor-common/document-logger");
+var _browserExtensions = require("@atlaskit/editor-common/utils/browser-extensions");
 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 addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
   return function (error) {
-    var browserExtensions = (0, _utils.sniffUserBrowserExtensions)({
+    var browserExtensions = (0, _browserExtensions.sniffUserBrowserExtensions)({
       extensions: ['grammarly']
     });
     var payload = {
-      action: _analytics.ACTION.SYNCHRONY_ERROR,
-      actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      action: _enums.ACTION.SYNCHRONY_ERROR,
+      actionSubject: _enums.ACTION_SUBJECT.EDITOR,
+      eventType: _enums.EVENT_TYPE.OPERATIONAL,
       attributes: {
         error: error,
         browserExtensions: browserExtensions
@@ -28,7 +28,7 @@ var addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function a
     if (featureFlags.synchronyErrorDocStructure) {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      payload.attributes.docStructure = (0, _coreUtils.getDocStructure)(state.doc, {
+      payload.attributes.docStructure = (0, _documentLogger.getDocStructure)(state.doc, {
         compact: true
       });
     }
@@ -45,9 +45,9 @@ var addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function a
  */
 var getAgentEditShimmerNotShownPayload = exports.getAgentEditShimmerNotShownPayload = function getAgentEditShimmerNotShownPayload(reason, agentType, error) {
   return {
-    action: _analytics.ACTION.AGENT_EDIT_SHIMMER_NOT_SHOWN,
-    actionSubject: _analytics.ACTION_SUBJECT.COLLAB,
-    eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+    action: _enums.ACTION.AGENT_EDIT_SHIMMER_NOT_SHOWN,
+    actionSubject: _enums.ACTION_SUBJECT.COLLAB,
+    eventType: _enums.EVENT_TYPE.OPERATIONAL,
     attributes: _objectSpread(_objectSpread({
       reason: reason
     }, agentType ? {
@@ -60,9 +60,9 @@ var getAgentEditShimmerNotShownPayload = exports.getAgentEditShimmerNotShownPayl
 var addSynchronyEntityAnalytics = exports.addSynchronyEntityAnalytics = function addSynchronyEntityAnalytics(state, tr) {
   return function (type, editorAnalyticsApi) {
     editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-      action: type === 'error' ? _analytics.ACTION.SYNCHRONY_ENTITY_ERROR : _analytics.ACTION.SYNCHRONY_DISCONNECTED,
-      actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      action: type === 'error' ? _enums.ACTION.SYNCHRONY_ENTITY_ERROR : _enums.ACTION.SYNCHRONY_DISCONNECTED,
+      actionSubject: _enums.ACTION_SUBJECT.EDITOR,
+      eventType: _enums.EVENT_TYPE.OPERATIONAL,
       attributes: {
         // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorOnLine/onLine
         onLine: navigator.onLine,

package/dist/cjs/pm-plugins/main/agent-review-segments.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAgentEditSegments = exports.REVIEW_MOMENT_AGENT_TYPES_CONFIG = void 0;
 var _collabAgentReviewSliceCompare = require("@atlaskit/editor-common/collab-agent-review-slice-compare");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _error = require("@atlaskit/editor-common/monitoring/error");
 var _expVal = require("@atlaskit/platform-feature-experiments/exp-val");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _agentEditRequester = require("./agent-edit-requester");
@@ -174,7 +174,7 @@ var getAgentEditSegments = exports.getAgentEditSegments = function getAgentEditS
           } catch (error) {
             // Degrade gracefully (skip this step's range) but track the error so a silent
             // fall-through does not hide a systemic slicing problem.
-            (0, _monitoring.logException)(error, {
+            (0, _error.logException)(error, {
               location: 'editor-plugin-collab-edit/agent-review-segments/markStepSlice'
             });
           }

package/dist/cjs/pm-plugins/main/agent-shimmer-ranges.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isPositionNeutralStep = exports.getMarkStepRange = exports.getAgentShimmerRanges = exports.getAgentEditChromeRanges = void 0;
 var _collabAgentEditChangedRanges = require("@atlaskit/editor-common/collab-agent-edit-changed-ranges");
 var _collabAgentReviewSliceCompare = require("@atlaskit/editor-common/collab-agent-review-slice-compare");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _error = require("@atlaskit/editor-common/monitoring/error");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
@@ -167,7 +167,7 @@ var deriveAgentShimmerRanges = function deriveAgentShimmerRanges(json, steps, tr
           } catch (error) {
             // Degrade gracefully (no shimmer for this step) but track the error so a silent
             // fall-through does not hide a systemic slicing problem.
-            (0, _monitoring.logException)(error, {
+            (0, _error.logException)(error, {
               location: 'editor-plugin-collab-edit/agent-shimmer-ranges/markStepSlice'
             });
           }

package/dist/cjs/pm-plugins/main/index.js

@@ -7,10 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = void 0;
 var adfCustomSteps = _interopRequireWildcard(require("@atlaskit/adf-schema/steps"));
 var atlaskKitCustomSteps = _interopRequireWildcard(require("@atlaskit/custom-steps"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _fireAnalyticsEvent = require("@atlaskit/editor-common/analytics/fire-analytics-event");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _transformOverride = require("@atlaskit/editor-prosemirror/transform-override");
-var _analytics2 = require("../analytics");
+var _analytics = require("../analytics");
 var _initialize = require("../events/initialize");
 var _pluginKey = require("./plugin-key");
 var _pluginState = require("./plugin-state");
@@ -94,13 +95,13 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
             return false;
           }
           // analytics to track telepointer clicks as they sometimes cause broken selections
-          var fireAnalyticsCallback = (0, _analytics.fireAnalyticsEvent)((_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 || (_pluginInjectionApi$a2 = _pluginInjectionApi$a2.sharedState.currentState()) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.createAnalyticsEvent) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : undefined);
+          var fireAnalyticsCallback = (0, _fireAnalyticsEvent.fireAnalyticsEvent)((_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 || (_pluginInjectionApi$a2 = _pluginInjectionApi$a2.sharedState.currentState()) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.createAnalyticsEvent) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : undefined);
           fireAnalyticsCallback({
             payload: {
-              action: _analytics.ACTION.CLICKED,
-              actionSubject: _analytics.ACTION_SUBJECT.TELEPOINTER,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.TELEPOINTER,
-              eventType: _analytics.EVENT_TYPE.TRACK
+              action: _enums.ACTION.CLICKED,
+              actionSubject: _enums.ACTION_SUBJECT.TELEPOINTER,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.TELEPOINTER,
+              eventType: _enums.EVENT_TYPE.TRACK
             }
           });
         }
@@ -122,15 +123,15 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
     },
     view: function view(_view) {
       var _pluginInjectionApi$a3, _pluginInjectionApi$a6;
-      var addErrorAnalytics = (0, _analytics2.addSynchronyErrorAnalytics)(_view.state, _view.state.tr, featureFlags, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions);
+      var addErrorAnalytics = (0, _analytics.addSynchronyErrorAnalytics)(_view.state, _view.state.tr, featureFlags, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions);
       var onSyncUpError = function onSyncUpError(attributes) {
         var _pluginInjectionApi$a4, _pluginInjectionApi$a5;
-        var fireAnalyticsCallback = (0, _analytics.fireAnalyticsEvent)((_pluginInjectionApi$a4 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 || (_pluginInjectionApi$a5 = _pluginInjectionApi$a5.sharedState.currentState()) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.createAnalyticsEvent) !== null && _pluginInjectionApi$a4 !== void 0 ? _pluginInjectionApi$a4 : undefined);
+        var fireAnalyticsCallback = (0, _fireAnalyticsEvent.fireAnalyticsEvent)((_pluginInjectionApi$a4 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 || (_pluginInjectionApi$a5 = _pluginInjectionApi$a5.sharedState.currentState()) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.createAnalyticsEvent) !== null && _pluginInjectionApi$a4 !== void 0 ? _pluginInjectionApi$a4 : undefined);
         fireAnalyticsCallback({
           payload: {
-            action: _analytics.ACTION.NEW_COLLAB_SYNC_UP_ERROR_NO_STEPS,
-            actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            action: _enums.ACTION.NEW_COLLAB_SYNC_UP_ERROR_NO_STEPS,
+            actionSubject: _enums.ACTION_SUBJECT.EDITOR,
+            eventType: _enums.EVENT_TYPE.OPERATIONAL,
             attributes: attributes
           }
         });

package/dist/cjs/pm-plugins/mergeUnconfirmed.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -29,7 +29,7 @@ function mergeUnconfirmedSteps(steps, api) {
   var mergedSteps = steps.reduce(function (acc, rebaseable) {
     var _api$connectivity;
     var lastStep = acc[acc.length - 1];
-    var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
+    var isOffline = (0, _isOfflineMode.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
     var isOnlineMergeEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
     var isMergingEnabled = isOffline || isOnlineMergeEnabled;
     if (isMergingEnabled && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {

package/dist/cjs/pm-plugins/utils.js

@@ -11,10 +11,10 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _analytics = require("@atlaskit/adf-schema/steps/analytics");
 var _batchAttrsStep = require("@atlaskit/adf-schema/steps/batch-attrs-step");
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
-var _analytics2 = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _collab = require("@atlaskit/editor-common/collab");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
-var _whitespace = require("@atlaskit/editor-common/whitespace");
+var _whitespace = require("@atlaskit/editor-common/whitespace/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
@@ -195,9 +195,9 @@ var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToColla
     var state = editorView.state;
     var tr = state.tr;
     var analyticsPayload = {
-      action: _analytics2.ACTION.MATCHED,
-      actionSubject: _analytics2.ACTION_SUBJECT.SELECTION,
-      eventType: _analytics2.EVENT_TYPE.TRACK
+      action: _enums.ACTION.MATCHED,
+      actionSubject: _enums.ACTION_SUBJECT.SELECTION,
+      eventType: _enums.EVENT_TYPE.TRACK
     };
     tr.setSelection(_state.Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(tr);

package/dist/es2019/collabEditPlugin.js

@@ -1,4 +1,4 @@
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';

package/dist/es2019/pm-plugins/analytics.js

@@ -1,6 +1,6 @@
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { getDocStructure } from '@atlaskit/editor-common/core-utils';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { getDocStructure } from '@atlaskit/editor-common/document-logger';
+import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils/browser-extensions';
 export const addSynchronyErrorAnalytics = (state, tr, featureFlags, editorAnalyticsApi) => {
   return error => {
     const browserExtensions = sniffUserBrowserExtensions({

package/dist/es2019/pm-plugins/main/agent-review-segments.js

@@ -1,5 +1,5 @@
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
-import { logException } from '@atlaskit/editor-common/monitoring';
+import { logException } from '@atlaskit/editor-common/monitoring/error';
 import { expVal } from '@atlaskit/platform-feature-experiments/exp-val';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
 import { getAgentEditRequester } from './agent-edit-requester';

package/dist/es2019/pm-plugins/main/agent-shimmer-ranges.js

@@ -1,6 +1,6 @@
 import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
-import { logException } from '@atlaskit/editor-common/monitoring';
+import { logException } from '@atlaskit/editor-common/monitoring/error';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getCollabState } from '@atlaskit/prosemirror-collab';

package/dist/es2019/pm-plugins/main/index.js

@@ -7,7 +7,8 @@ import * as adfCustomSteps from '@atlaskit/adf-schema/steps';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as atlaskKitCustomSteps from '@atlaskit/custom-steps';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics/fire-analytics-event';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Step } from '@atlaskit/editor-prosemirror/transform-override';
 import { addSynchronyErrorAnalytics } from '../analytics';

package/dist/es2019/pm-plugins/mergeUnconfirmed.js

@@ -1,4 +1,4 @@
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';

package/dist/es2019/pm-plugins/utils.js

@@ -1,10 +1,10 @@
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
 import { BatchAttrsStep } from '@atlaskit/adf-schema/steps/batch-attrs-step';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { TELEPOINTER_DATA_SESSION_ID_ATTR, TELEPOINTER_PULSE_DURING_TR_CLASS, TELEPOINTER_PULSE_DURING_TR_DURATION_MS } from '@atlaskit/editor-common/collab';
 import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
-import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
+import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace/whitespace';
 import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';

package/dist/esm/collabEditPlugin.js

@@ -4,7 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';

package/dist/esm/pm-plugins/analytics.js

@@ -1,9 +1,9 @@
 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 { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { getDocStructure } from '@atlaskit/editor-common/core-utils';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { getDocStructure } from '@atlaskit/editor-common/document-logger';
+import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils/browser-extensions';
 export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
   return function (error) {
     var browserExtensions = sniffUserBrowserExtensions({

package/dist/esm/pm-plugins/main/agent-review-segments.js

@@ -1,5 +1,5 @@
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
-import { logException } from '@atlaskit/editor-common/monitoring';
+import { logException } from '@atlaskit/editor-common/monitoring/error';
 import { expVal } from '@atlaskit/platform-feature-experiments/exp-val';
 import { getCollabState } from '@atlaskit/prosemirror-collab';
 import { getAgentEditRequester } from './agent-edit-requester';

package/dist/esm/pm-plugins/main/agent-shimmer-ranges.js

@@ -1,6 +1,6 @@
 import { getAgentEditChangedRanges } from '@atlaskit/editor-common/collab-agent-edit-changed-ranges';
 import { slicesEqualIgnoringLocalId } from '@atlaskit/editor-common/collab-agent-review-slice-compare';
-import { logException } from '@atlaskit/editor-common/monitoring';
+import { logException } from '@atlaskit/editor-common/monitoring/error';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getCollabState } from '@atlaskit/prosemirror-collab';

package/dist/esm/pm-plugins/main/index.js

@@ -7,7 +7,8 @@ import * as adfCustomSteps from '@atlaskit/adf-schema/steps';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as atlaskKitCustomSteps from '@atlaskit/custom-steps';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics/fire-analytics-event';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Step } from '@atlaskit/editor-prosemirror/transform-override';
 import { addSynchronyErrorAnalytics } from '../analytics';

package/dist/esm/pm-plugins/mergeUnconfirmed.js

@@ -1,4 +1,4 @@
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';

package/dist/esm/pm-plugins/utils.js

@@ -2,10 +2,10 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps/analytics';
 import { BatchAttrsStep } from '@atlaskit/adf-schema/steps/batch-attrs-step';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { TELEPOINTER_DATA_SESSION_ID_ATTR, TELEPOINTER_PULSE_DURING_TR_CLASS, TELEPOINTER_PULSE_DURING_TR_DURATION_MS } from '@atlaskit/editor-common/collab';
 import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
-import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
+import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace/whitespace';
 import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';

package/dist/types/collabEditPluginType.d.ts

@@ -1,9 +1,10 @@
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags/featureFlagsPluginType';
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { CollabEditPluginSharedState, CollabSendableSteps, PrivateCollabEditOptions } from './types';

package/dist/types/pm-plugins/actions.d.ts

@@ -1,4 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types/pm-plugins/analytics.d.ts

@@ -1,6 +1,7 @@
-import type { AnalyticsEventPayload, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { AgentEditShimmerNotShownReason } from '@atlaskit/editor-common/analytics/types/agent-edit-shimmer-events';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics/types/events';
+import type { FeatureFlags } from '@atlaskit/editor-common/types/feature-flags';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const addSynchronyErrorAnalytics: (state: EditorState, tr: Transaction, featureFlags: FeatureFlags, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => (error: Error) => Transaction;
 /**

package/dist/types/pm-plugins/events/handlers.d.ts

@@ -1,7 +1,7 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { CollabEditProvider, CollabEventConflictPayload, CollabEventConnectionData, CollabEventInitData, CollabEventLocalStepData, CollabEventPresenceData, CollabEventRemoteData, CollabEvents, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
+import type { FeatureFlags } from '@atlaskit/editor-common/types/feature-flags';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PrivateCollabEditOptions } from '../../types';
 export type SynchronyEntity = {

package/dist/types/pm-plugins/events/initialize.d.ts

@@ -1,7 +1,8 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { CollabEditProvider } from '@atlaskit/editor-common/collab';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
+import type { FeatureFlags } from '@atlaskit/editor-common/types/feature-flags';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CollabEditPlugin } from '../../collabEditPluginType';
 import type { PrivateCollabEditOptions } from '../../types';

package/dist/types/pm-plugins/events/send-transaction.d.ts

@@ -1,5 +1,5 @@
 import type { CollabEditProvider } from '@atlaskit/editor-common/collab';
-import type { ViewMode } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ViewMode } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 type Props = {
     hideTelecursorOnLoad: boolean;

package/dist/types/pm-plugins/main/index.d.ts

@@ -1,8 +1,9 @@
 import type { CollabEditProvider } from '@atlaskit/editor-common/collab';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { FeatureFlags } from '@atlaskit/editor-common/types/feature-flags';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { CollabEditPlugin } from '../../collabEditPluginType';
 import type { PrivateCollabEditOptions, ProviderCallback } from '../../types';
 import { PluginState } from './plugin-state';

package/dist/types/pm-plugins/mergeUnconfirmed.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import type { CollabEditPlugin } from '../collabEditPluginType';
 /**

package/dist/types/pm-plugins/monitor-organic-changes.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { CollabEditPlugin } from '../collabEditPluginType';
 export type OrganicMetadataAnalytics = {

package/dist/types/pm-plugins/utils.d.ts

@@ -1,4 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { CollabEditOptions, CollabParticipant } from '@atlaskit/editor-common/collab';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "27.0.5",
+	"version": "27.0.6",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"