@atlaskit/editor-plugin-code-block 3.3.12 → 3.3.14

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.3.14
+
+### Patch Changes
+
+- [#138118](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138118)
+  [`5e4d9eb1aefe4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e4d9eb1aefe4) -
+  NOISSUE: Upgrades editor React peer dependencies to v18
+- Updated dependencies
+
+## 3.3.13
+
+### Patch Changes
+
+- [#136871](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136871)
+  [`87a30d5cb3ffb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/87a30d5cb3ffb) -
+  ED-24814 - Addressing a bug where changing the language on a wrapped code block caused the wrapped
+  decorator to disappear. Required changing the sequence in which we update the keys on the wrapped
+  states WeakMap. Due to the amount of changes, it has all be placed behind a bug fix feature gate
+  (editor_code_block_wrapping_language_change_bug) and the original feature gate
+  (editor_support_code_block_wrapping).
+
 ## 3.3.12
 
 ### Patch Changes

package/dist/cjs/nodeviews/code-block.js

@@ -16,6 +16,8 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
 var _mainState = require("../pm-plugins/main-state");
 var _classNames = require("../ui/class-names");
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 var MATCH_NEWLINES = new RegExp('\n', 'g');
 var toDOM = function toDOM(node, contentEditable, formattedAriaLabel) {
   return ['div', {
@@ -167,7 +169,9 @@ var CodeBlockView = exports.CodeBlockView = /*#__PURE__*/function () {
       }
       if (node !== this.node) {
         if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-          (0, _codeBlock.transferCodeBlockWrappedValue)(this.node, node);
+          if (!(0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+            (0, _codeBlock.transferCodeBlockWrappedValue)(this.node, node);
+          }
         }
         if (node.attrs.language !== this.node.attrs.language) {
           this.contentDOM.setAttribute('data-language', node.attrs.language || '');

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

@@ -8,8 +8,11 @@ exports.validateWordWrappedDecorators = exports.updateDecorationSetWithWordWrapp
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _classNames = require("../ui/class-names");
 var _utils = require("../utils");
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 var DECORATION_WIDGET_TYPE = exports.DECORATION_WIDGET_TYPE = 'decorationWidgetType';
 var DECORATION_WRAPPED_BLOCK_NODE_TYPE = exports.DECORATION_WRAPPED_BLOCK_NODE_TYPE = 'decorationNodeType';
 
@@ -26,9 +29,8 @@ var generateInitialDecorations = exports.generateInitialDecorations = function g
 /**
  * Update all the decorations used by the code block.
  */
-var updateCodeBlockDecorations = exports.updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, state, decorationSet) {
+var updateCodeBlockDecorations = exports.updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  var codeBlockNodes = (0, _utils.getAllCodeBlockNodesInDoc)(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -129,8 +131,14 @@ var validateWordWrappedDecorators = exports.validateWordWrappedDecorators = func
   codeBlockNodes.forEach(function (node) {
     var isCodeBlockWrappedInState = (0, _codeBlock.isCodeBlockWordWrapEnabled)(node.node);
     var isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if ((0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _browser = require("@atlaskit/editor-common/browser");
+var _codeBlock = require("@atlaskit/editor-common/code-block");
 var _messages = require("@atlaskit/editor-common/messages");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -14,14 +15,14 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
-var _codeBlock = require("../nodeviews/code-block");
+var _codeBlock2 = require("../nodeviews/code-block");
 var _pluginKey = require("../plugin-key");
 var _classNames = require("../ui/class-names");
 var _utils = require("../utils");
 var _actions2 = require("./actions");
 var _decorators = require("./decorators");
 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; }
+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; } /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 var createPlugin = exports.createPlugin = function createPlugin(_ref) {
   var _ref$useLongPressSele = _ref.useLongPressSelection,
     useLongPressSelection = _ref$useLongPressSele === void 0 ? false : _ref$useLongPressSele,
@@ -97,7 +98,11 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           var updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if ((0, _platformFeatureFlags.fg)('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = (0, _decorators.updateCodeBlockDecorations)(tr, newState, updatedDecorationSet);
+            var codeBlockNodes = (0, _utils.getAllCodeBlockNodesInDoc)(newState);
+            if ((0, _platformFeatureFlags.fg)('editor_code_block_wrapping_language_change_bug')) {
+              (0, _codeBlock.updateCodeBlockWrappedStateNodeKeys)(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = (0, _decorators.updateCodeBlockDecorations)(tr, codeBlockNodes, updatedDecorationSet);
           }
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: _node ? _node.pos : null,
@@ -139,7 +144,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
           var _getIntl = getIntl(),
             formatMessage = _getIntl.formatMessage;
           var formattedAriaLabel = formatMessage(_messages.blockTypeMessages.codeblock);
-          return (0, _codeBlock.codeBlockNodeView)(node, view, getPos, formattedAriaLabel, api);
+          return (0, _codeBlock2.codeBlockNodeView)(node, view, getPos, formattedAriaLabel, api);
         }
       },
       handleClickOn: (0, _selection.createSelectionClickHandler)(['codeBlock'], function (target) {

package/dist/es2019/nodeviews/code-block.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import rafSchedule from 'raf-schd';
 import { browser } from '@atlaskit/editor-common/browser';
 import { codeBlockWrappedStates, defaultWordWrapState, transferCodeBlockWrappedValue } from '@atlaskit/editor-common/code-block';
@@ -144,7 +145,9 @@ export class CodeBlockView {
     }
     if (node !== this.node) {
       if (fg('editor_support_code_block_wrapping')) {
-        transferCodeBlockWrappedValue(this.node, node);
+        if (!fg('editor_code_block_wrapping_language_change_bug')) {
+          transferCodeBlockWrappedValue(this.node, node);
+        }
       }
       if (node.attrs.language !== this.node.attrs.language) {
         this.contentDOM.setAttribute('data-language', node.attrs.language || '');

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

@@ -1,5 +1,7 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from '../utils';
 export const DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -16,9 +18,8 @@ export const generateInitialDecorations = state => {
 /**
  * Update all the decorations used by the code block.
  */
-export const updateCodeBlockDecorations = (tr, state, decorationSet) => {
+export const updateCodeBlockDecorations = (tr, codeBlockNodes, decorationSet) => {
   let updatedDecorationSet = decorationSet;
-  const codeBlockNodes = getAllCodeBlockNodesInDoc(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -119,8 +120,14 @@ export const validateWordWrappedDecorators = (tr, codeBlockNodes, decorationSet)
   codeBlockNodes.forEach(node => {
     const isCodeBlockWrappedInState = isCodeBlockWordWrapEnabled(node.node);
     const isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if (fg('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -1,4 +1,7 @@
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 import { browser } from '@atlaskit/editor-common/browser';
+import { updateCodeBlockWrappedStateNodeKeys } from '@atlaskit/editor-common/code-block';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
@@ -9,7 +12,7 @@ import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '.
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { pluginKey } from '../plugin-key';
 import { codeBlockClassNames } from '../ui/class-names';
-import { findCodeBlock } from '../utils';
+import { findCodeBlock, getAllCodeBlockNodesInDoc } from '../utils';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 export const createPlugin = ({
@@ -85,7 +88,11 @@ export const createPlugin = ({
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           let updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if (fg('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = updateCodeBlockDecorations(tr, newState, updatedDecorationSet);
+            const codeBlockNodes = getAllCodeBlockNodesInDoc(newState);
+            if (fg('editor_code_block_wrapping_language_change_bug')) {
+              updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = updateCodeBlockDecorations(tr, codeBlockNodes, updatedDecorationSet);
           }
           const newPluginState = {
             ...pluginState,

package/dist/esm/nodeviews/code-block.js

@@ -1,6 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import rafSchedule from 'raf-schd';
 import { browser } from '@atlaskit/editor-common/browser';
 import { codeBlockWrappedStates, defaultWordWrapState, transferCodeBlockWrappedValue } from '@atlaskit/editor-common/code-block';
@@ -160,7 +161,9 @@ export var CodeBlockView = /*#__PURE__*/function () {
       }
       if (node !== this.node) {
         if (fg('editor_support_code_block_wrapping')) {
-          transferCodeBlockWrappedValue(this.node, node);
+          if (!fg('editor_code_block_wrapping_language_change_bug')) {
+            transferCodeBlockWrappedValue(this.node, node);
+          }
         }
         if (node.attrs.language !== this.node.attrs.language) {
           this.contentDOM.setAttribute('data-language', node.attrs.language || '');

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

@@ -1,6 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import { isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { codeBlockClassNames } from '../ui/class-names';
 import { getAllCodeBlockNodesInDoc } from '../utils';
 export var DECORATION_WIDGET_TYPE = 'decorationWidgetType';
@@ -19,9 +21,8 @@ export var generateInitialDecorations = function generateInitialDecorations(stat
 /**
  * Update all the decorations used by the code block.
  */
-export var updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, state, decorationSet) {
+export var updateCodeBlockDecorations = function updateCodeBlockDecorations(tr, codeBlockNodes, decorationSet) {
   var updatedDecorationSet = decorationSet;
-  var codeBlockNodes = getAllCodeBlockNodesInDoc(state);
 
   // All the line numbers decorators are refreshed on doc change.
   updatedDecorationSet = updateDecorationSetWithLineNumberDecorators(tr, codeBlockNodes, updatedDecorationSet);
@@ -122,8 +123,14 @@ export var validateWordWrappedDecorators = function validateWordWrappedDecorator
   codeBlockNodes.forEach(function (node) {
     var isCodeBlockWrappedInState = isCodeBlockWordWrapEnabled(node.node);
     var isCodeBlockWrappedByDecorator = getWordWrapDecoratorsFromNodePos(node.pos, decorationSet).length !== 0;
-    if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
-      updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+    if (fg('editor_code_block_wrapping_language_change_bug')) {
+      if (isCodeBlockWrappedInState !== isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
+    } else {
+      if (isCodeBlockWrappedInState && !isCodeBlockWrappedByDecorator) {
+        updatedDecorationSet = updateDecorationSetWithWordWrappedDecorator(decorationSet, tr, node);
+      }
     }
   });
   return updatedDecorationSet;

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

@@ -1,7 +1,10 @@
 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; }
+/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+
 import { browser } from '@atlaskit/editor-common/browser';
+import { updateCodeBlockWrappedStateNodeKeys } from '@atlaskit/editor-common/code-block';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
@@ -12,7 +15,7 @@ import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '.
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { pluginKey } from '../plugin-key';
 import { codeBlockClassNames } from '../ui/class-names';
-import { findCodeBlock } from '../utils';
+import { findCodeBlock, getAllCodeBlockNodesInDoc } from '../utils';
 import { ACTIONS } from './actions';
 import { generateInitialDecorations, updateCodeBlockDecorations, updateDecorationSetWithWordWrappedDecorator } from './decorators';
 export var createPlugin = function createPlugin(_ref) {
@@ -90,7 +93,11 @@ export var createPlugin = function createPlugin(_ref) {
           // specifically used for updating word wrap node decorators (does not cover drag & drop, validateWordWrappedDecorators does).
           var updatedDecorationSet = pluginState.decorations.map(tr.mapping, tr.doc);
           if (fg('editor_support_code_block_wrapping')) {
-            updatedDecorationSet = updateCodeBlockDecorations(tr, newState, updatedDecorationSet);
+            var codeBlockNodes = getAllCodeBlockNodesInDoc(newState);
+            if (fg('editor_code_block_wrapping_language_change_bug')) {
+              updateCodeBlockWrappedStateNodeKeys(codeBlockNodes, _oldState);
+            }
+            updatedDecorationSet = updateCodeBlockDecorations(tr, codeBlockNodes, updatedDecorationSet);
           }
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: _node ? _node.pos : null,

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

@@ -11,7 +11,7 @@ export declare const generateInitialDecorations: (state: EditorState) => Decorat
 /**
  * Update all the decorations used by the code block.
  */
-export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, state: EditorState, decorationSet: DecorationSet) => DecorationSet;
+export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, codeBlockNodes: NodeWithPos[], decorationSet: DecorationSet) => DecorationSet;
 /**
  * Update the decorations set with the line number decorators.
  */

package/dist/types-ts4.5/pm-plugins/decorators.d.ts

@@ -11,7 +11,7 @@ export declare const generateInitialDecorations: (state: EditorState) => Decorat
 /**
  * Update all the decorations used by the code block.
  */
-export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, state: EditorState, decorationSet: DecorationSet) => DecorationSet;
+export declare const updateCodeBlockDecorations: (tr: ReadonlyTransaction, codeBlockNodes: NodeWithPos[], decorationSet: DecorationSet) => DecorationSet;
 /**
  * Update the decorations set with the line number decorators.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.3.12",
+	"version": "3.3.14",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -10,7 +10,7 @@
 	"atlassian": {
 		"team": "Editor: Core Experiences",
 		"singleton": true,
-		"runReact18": false
+		"runReact18": true
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"main": "dist/cjs/index.js",
@@ -33,20 +33,20 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^88.8.0",
+		"@atlaskit/editor-common": "^88.12.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
-		"@atlaskit/icon": "^22.15.0",
+		"@atlaskit/icon": "^22.16.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@babel/runtime": "^7.0.0",
 		"raf-schd": "^4.0.3"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0",
+		"react": "^16.8.0 || ^17.0.0 || ~18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
@@ -97,6 +97,9 @@
 		"code_block_auto_insertion_bug_fix": {
 			"type": "boolean"
 		},
+		"editor_code_block_wrapping_language_change_bug": {
+			"type": "boolean"
+		},
 		"platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
 			"type": "boolean"
 		}