@atlaskit/prosemirror-collab 1.1.20 → 1.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/index.js +4 -12
  3. package/dist/es2019/index.js +4 -12
  4. package/dist/esm/index.js +4 -12
  5. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # @atlaskit/prosemirror-collab
2
2
 
3
+ ## 1.1.21
4
+
5
+ ### Patch Changes
6
+
7
+ - [`962e8dc0188bf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/962e8dc0188bf) -
8
+ Clean up `platform_editor_offline_editing_web` with `isEnabled: true` for Confluence, keeping
9
+ offline editing and recovery behavior enabled. Remove the retired experiment from the editor
10
+ Statsig configuration; consumers must stop querying or overriding this experiment.
11
+ - Updated dependencies
12
+
3
13
  ## 1.1.20
4
14
 
5
15
  ### Patch Changes
package/dist/cjs/index.js CHANGED
@@ -16,8 +16,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
16
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
17
17
  var _uuid = require("uuid");
18
18
  var _state = require("@atlaskit/editor-prosemirror/state");
19
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
20
- var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
21
19
  var _movedContent = require("./movedContent");
22
20
  // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
23
21
  var Rebaseable = exports.Rebaseable = /*#__PURE__*/(0, _createClass2.default)(function Rebaseable(step, inverted, origin) {
@@ -36,7 +34,7 @@ function rebaseSteps(steps, over, transform) {
36
34
  var result = [];
37
35
  for (var _i2 = 0, mapFrom = steps.length; _i2 < steps.length; _i2++) {
38
36
  var mapped = steps[_i2].step.map(transform.mapping.slice(mapFrom));
39
- var movedStep = (0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) ? (0, _movedContent.mapStep)(steps, transform, _i2, mapped) : undefined;
37
+ var movedStep = (0, _movedContent.mapStep)(steps, transform, _i2, mapped);
40
38
  mapFrom--;
41
39
  if (mapped && !transform.maybeStep(mapped).failed) {
42
40
  // Open ticket for setMirror https://github.com/ProseMirror/prosemirror/issues/869
@@ -46,10 +44,8 @@ function rebaseSteps(steps, over, transform) {
46
44
  }
47
45
 
48
46
  // If the step is a "move" step - apply the additional step
49
- if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true)) {
50
- if (movedStep && !transform.maybeStep(movedStep).failed) {
51
- result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
52
- }
47
+ if (movedStep && !transform.maybeStep(movedStep).failed) {
48
+ result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
53
49
  }
54
50
  }
55
51
  return result;
@@ -107,11 +103,7 @@ function collab() {
107
103
  apply: function apply(tr, collab) {
108
104
  var newState = tr.getMeta(collabKey);
109
105
  if (newState) {
110
- if ((0, _editorExperiment.editorExperiment)('platform_editor_offline_editing_web', true) || (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
111
- return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
112
- } else {
113
- return newState;
114
- }
106
+ return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
115
107
  }
116
108
  if (tr.docChanged) {
117
109
  return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
package/dist/es2019/index.js CHANGED
@@ -1,8 +1,6 @@
1
1
  // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
2
2
  import { v4 as uuidv4 } from 'uuid';
3
3
  import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
4
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
5
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
6
4
  import { mapStep } from './movedContent';
7
5
  export class Rebaseable {
8
6
  constructor(step, inverted, origin) {
@@ -21,7 +19,7 @@ export function rebaseSteps(steps, over, transform) {
21
19
  const result = [];
22
20
  for (let i = 0, mapFrom = steps.length; i < steps.length; i++) {
23
21
  const mapped = steps[i].step.map(transform.mapping.slice(mapFrom));
24
- const movedStep = editorExperiment('platform_editor_offline_editing_web', true) ? mapStep(steps, transform, i, mapped) : undefined;
22
+ const movedStep = mapStep(steps, transform, i, mapped);
25
23
  mapFrom--;
26
24
  if (mapped && !transform.maybeStep(mapped).failed) {
27
25
  // Open ticket for setMirror https://github.com/ProseMirror/prosemirror/issues/869
@@ -31,10 +29,8 @@ export function rebaseSteps(steps, over, transform) {
31
29
  }
32
30
 
33
31
  // If the step is a "move" step - apply the additional step
34
- if (editorExperiment('platform_editor_offline_editing_web', true)) {
35
- if (movedStep && !transform.maybeStep(movedStep).failed) {
36
- result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
37
- }
32
+ if (movedStep && !transform.maybeStep(movedStep).failed) {
33
+ result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
38
34
  }
39
35
  }
40
36
  return result;
@@ -88,11 +84,7 @@ export function collab(config = {}) {
88
84
  apply(tr, collab) {
89
85
  const newState = tr.getMeta(collabKey);
90
86
  if (newState) {
91
- if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
92
- return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
93
- } else {
94
- return newState;
95
- }
87
+ return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
96
88
  }
97
89
  if (tr.docChanged) {
98
90
  return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
package/dist/esm/index.js CHANGED
@@ -3,8 +3,6 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
3
  // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
4
4
  import { v4 as uuidv4 } from 'uuid';
5
5
  import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
6
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
8
6
  import { mapStep } from './movedContent';
9
7
  export var Rebaseable = /*#__PURE__*/_createClass(function Rebaseable(step, inverted, origin) {
10
8
  _classCallCheck(this, Rebaseable);
@@ -22,7 +20,7 @@ export function rebaseSteps(steps, over, transform) {
22
20
  var result = [];
23
21
  for (var _i2 = 0, mapFrom = steps.length; _i2 < steps.length; _i2++) {
24
22
  var mapped = steps[_i2].step.map(transform.mapping.slice(mapFrom));
25
- var movedStep = editorExperiment('platform_editor_offline_editing_web', true) ? mapStep(steps, transform, _i2, mapped) : undefined;
23
+ var movedStep = mapStep(steps, transform, _i2, mapped);
26
24
  mapFrom--;
27
25
  if (mapped && !transform.maybeStep(mapped).failed) {
28
26
  // Open ticket for setMirror https://github.com/ProseMirror/prosemirror/issues/869
@@ -32,10 +30,8 @@ export function rebaseSteps(steps, over, transform) {
32
30
  }
33
31
 
34
32
  // If the step is a "move" step - apply the additional step
35
- if (editorExperiment('platform_editor_offline_editing_web', true)) {
36
- if (movedStep && !transform.maybeStep(movedStep).failed) {
37
- result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
38
- }
33
+ if (movedStep && !transform.maybeStep(movedStep).failed) {
34
+ result.push(new Rebaseable(movedStep, movedStep.invert(transform.docs[transform.docs.length - 1]), transform));
39
35
  }
40
36
  }
41
37
  return result;
@@ -93,11 +89,7 @@ export function collab() {
93
89
  apply: function apply(tr, collab) {
94
90
  var newState = tr.getMeta(collabKey);
95
91
  if (newState) {
96
- if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
97
- return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
98
- } else {
99
- return newState;
100
- }
92
+ return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
101
93
  }
102
94
  if (tr.docChanged) {
103
95
  return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/prosemirror-collab",
3
- "version": "1.1.20",
3
+ "version": "1.1.21",
4
4
  "description": "Collaborative editing for ProseMirror - Atlassian Fork",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -21,7 +21,7 @@
21
21
  "dependencies": {
22
22
  "@atlaskit/adf-schema": "^57.4.0",
23
23
  "@atlaskit/editor-prosemirror": "^8.0.0",
24
- "@atlaskit/tmp-editor-statsig": "^187.0.0",
24
+ "@atlaskit/tmp-editor-statsig": "^188.0.0",
25
25
  "@babel/runtime": "^7.0.0",
26
26
  "uuid": "^11.1.1"
27
27
  },