@atlaskit/editor-plugin-collab-edit 3.3.0 → 3.4.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.4.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
+
+## 3.4.0
+
+### Minor Changes
+
+- [#139139](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139139)
+  [`7f6b665d778dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f6b665d778dd) -
+  [https://product-fabric.atlassian.net/browse/ED-27499](ED-27499) - the new
+  `@atlassian/confluence-presets` package with Confluence `full-page` preset is created
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.3.0
 
 ### Minor Changes

package/dist/cjs/collabEditPlugin.js

@@ -13,8 +13,8 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _analytics2 = require("./pm-plugins/analytics");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
 var _main = require("./pm-plugins/main");
@@ -206,7 +206,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         plugin: function plugin() {
           return (0, _prosemirrorCollab.collab)({
             clientID: userId,
-            transformUnconfirmed: (0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps') ? function (steps) {
+            transformUnconfirmed: (0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true) ? function (steps) {
               return (0, _mergeUnconfirmed.mergeUnconfirmedSteps)(steps, api);
             } : undefined
           });
@@ -252,7 +252,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: _trackLastOrganicChange.createPlugin
       });
-      if ((0, _platformFeatureFlags.fg)('platform_editor_offline_conflict_resolution')) {
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
         plugins.push({
           name: 'trackLastRemoteConflictPlugin',
           plugin: _trackReconnectionConflict.createPlugin

package/dist/es2019/collabEditPlugin.js

@@ -2,8 +2,8 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
 import { createPlugin } from './pm-plugins/main';
@@ -160,7 +160,7 @@ export const collabEditPlugin = ({
         name: 'pmCollab',
         plugin: () => collab({
           clientID: userId,
-          transformUnconfirmed: fg('platform_editor_merge_unconfirmed_steps') ? steps => mergeUnconfirmedSteps(steps, api) : undefined
+          transformUnconfirmed: editorExperiment('platform_editor_offline_editing_web', true) ? steps => mergeUnconfirmedSteps(steps, api) : undefined
         })
       }, {
         name: 'nativeCollabProviderPlugin',
@@ -198,7 +198,7 @@ export const collabEditPlugin = ({
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
-      if (fg('platform_editor_offline_conflict_resolution')) {
+      if (editorExperiment('platform_editor_offline_editing_web', true)) {
         plugins.push({
           name: 'trackLastRemoteConflictPlugin',
           plugin: createTrackReconnectionConflictPlugin

package/dist/esm/collabEditPlugin.js

@@ -8,8 +8,8 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
 import { createPlugin } from './pm-plugins/main';
@@ -199,7 +199,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         plugin: function plugin() {
           return collab({
             clientID: userId,
-            transformUnconfirmed: fg('platform_editor_merge_unconfirmed_steps') ? function (steps) {
+            transformUnconfirmed: editorExperiment('platform_editor_offline_editing_web', true) ? function (steps) {
               return mergeUnconfirmedSteps(steps, api);
             } : undefined
           });
@@ -245,7 +245,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
-      if (fg('platform_editor_offline_conflict_resolution')) {
+      if (editorExperiment('platform_editor_offline_editing_web', true)) {
         plugins.push({
           name: 'trackLastRemoteConflictPlugin',
           plugin: createTrackReconnectionConflictPlugin

package/dist/types/collabEditPluginType.d.ts

@@ -13,8 +13,9 @@ export type CollabEditPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<ConnectivityPlugin>
 ];
+export type CollabEditPluginOptions = PrivateCollabEditOptions;
 export type CollabEditPlugin = NextEditorPlugin<'collabEdit', {
-    pluginConfiguration: PrivateCollabEditOptions;
+    pluginConfiguration: CollabEditPluginOptions;
     dependencies: CollabEditPluginDependencies;
     sharedState: CollabEditPluginSharedState;
     actions: {

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { collabEditPlugin } from './collabEditPlugin';
-export type { CollabEditPlugin } from './collabEditPluginType';
+export type { CollabEditPlugin, CollabEditPluginOptions } from './collabEditPluginType';
 export type { CollabInitializedMetadata, CollabEditPluginSharedState, ReadOnlyParticipants, PrivateCollabEditOptions, CollabSendableSteps, } from './types';

package/dist/types-ts4.5/collabEditPluginType.d.ts

@@ -13,8 +13,9 @@ export type CollabEditPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<ConnectivityPlugin>
 ];
+export type CollabEditPluginOptions = PrivateCollabEditOptions;
 export type CollabEditPlugin = NextEditorPlugin<'collabEdit', {
-    pluginConfiguration: PrivateCollabEditOptions;
+    pluginConfiguration: CollabEditPluginOptions;
     dependencies: CollabEditPluginDependencies;
     sharedState: CollabEditPluginSharedState;
     actions: {

package/dist/types-ts4.5/index.d.ts

@@ -1,3 +1,3 @@
 export { collabEditPlugin } from './collabEditPlugin';
-export type { CollabEditPlugin } from './collabEditPluginType';
+export type { CollabEditPlugin, CollabEditPluginOptions } from './collabEditPluginType';
 export type { CollabInitializedMetadata, CollabEditPluginSharedState, ReadOnlyParticipants, PrivateCollabEditOptions, CollabSendableSteps, } from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "3.3.0",
+	"version": "3.4.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,16 +33,17 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^103.6.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
+		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.16.0",
+		"@atlaskit/tmp-editor-statsig": "^4.8.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
@@ -53,9 +54,9 @@
 	"devDependencies": {
 		"@af/integration-testing": "^0.5.0",
 		"@af/visual-regression": "^1.3.0",
-		"@atlaskit/editor-plugin-mentions": "^4.3.0",
-		"@atlaskit/editor-plugin-text-formatting": "^2.1.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.3.0",
+		"@atlaskit/editor-plugin-mentions": "^4.4.0",
+		"@atlaskit/editor-plugin-text-formatting": "^2.2.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.4.0",
 		"@atlaskit/editor-plugin-unsupported-content": "^2.1.0",
 		"@atlaskit/editor-test-helpers": "^22.1.0",
 		"@atlaskit/ssr": "^0.4.0",
@@ -106,12 +107,6 @@
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_merge_unconfirmed_steps": {
-			"type": "boolean"
-		},
-		"platform_editor_offline_conflict_resolution": {
-			"type": "boolean"
-		},
 		"platform_editor_selection_without_left_shift": {
 			"type": "boolean"
 		},