@atlaskit/editor-plugin-block-type 3.14.7 → 3.14.9

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-block-type
 
+## 3.14.9
+
+### Patch Changes
+
+- [#141778](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141778)
+  [`1c6f578277694`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c6f578277694) -
+  ED-24870 & ED-24864 - Add the logic to gate the nested media in quotes functionality behind the
+  nest-media-and-codeblock-in-quote experiment. Also adjust the logic so the nested expands are now
+  behind the nested-expand-in-expand experiment.
+
+## 3.14.8
+
+### Patch Changes
+
+- [#140915](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140915)
+  [`eaccad51157d6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eaccad51157d6) -
+  [ux] Migrate new icons including color, highlight and task on Editor primary toolbar
+- [#141594](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141594)
+  [`3f6b2eb7bd493`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f6b2eb7bd493) -
+  [ux] [ED-24867] This change moves nesting codeblocks and media in blockquotes via insertion
+  methods behind an experiment gate.
+
 ## 3.14.7
 
 ### Patch Changes

package/dist/cjs/plugin/index.js

@@ -105,7 +105,6 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
   var _api$primaryToolbar;
   var options = _ref3.config,
     api = _ref3.api;
-  // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
   var isNestingInQuoteSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nest_in_quotes_adf_change') || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
   var primaryToolbarComponent = function primaryToolbarComponent(_ref4) {
     var popupsMountPoint = _ref4.popupsMountPoint,

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

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = exports.createPlugin = void 0;
+exports.pluginKey = exports.handleBlockQuoteDND = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockTypes = require("../block-types");
 var _commands = require("../commands");
 var _consts = require("../consts");
@@ -145,7 +146,44 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
           altKeyLocation = 0;
         }
         return false;
+      },
+      handleDrop: function handleDrop(view, event, slice, moved) {
+        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
+};
+var handleBlockQuoteDND = exports.handleBlockQuoteDND = function handleBlockQuoteDND(view, event, slice) {
+  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
+  if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
+    var sliceContainsCodeBlockOrMedia = false;
+    slice.content.forEach(function (node) {
+      if (node.type === view.state.schema.nodes.codeBlock) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaSingle) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaGroup) {
+        sliceContainsCodeBlockOrMedia = true;
+      }
+    });
+    if (sliceContainsCodeBlockOrMedia) {
+      var state = view.state;
+      var schema = state.schema;
+      var dropPos = view.posAtCoords({
+        left: event.clientX,
+        top: event.clientY
+      });
+      if (!dropPos) {
+        return false;
+      }
+      var resolvedPos = state.doc.resolve(dropPos.pos);
+      var dropLocationNodeType = resolvedPos.node().type;
+      var dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
+      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
+        event.preventDefault();
+        return true;
+      }
+    }
+  }
+  return false;
 };

package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -11,10 +11,9 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _textStyleEditorTextStyle = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-style--editor-text-style"));
 var _text = _interopRequireDefault(require("@atlaskit/icon/core/text"));
+var _textStyle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/text-style"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockTypes = require("../../block-types");
 var _styled = require("./styled");
 /**
@@ -47,17 +46,12 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (
-    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
-    (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ? (0, _react2.jsx)(_text.default, {
+    }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_text.default, {
       label: labelTextStyles,
       spacing: "spacious",
-      color: "currentColor"
-    }) : (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
       color: "currentColor",
-      spacing: "spacious",
-      label: labelTextStyles
-    })), (0, _react2.jsx)("span", {
+      LEGACY_fallbackIcon: _textStyle.default
+    }), (0, _react2.jsx)("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: _styles.expandIconContainerStyle
     }, (0, _react2.jsx)(_chevronDown.default, {

package/dist/es2019/plugin/index.js

@@ -90,7 +90,6 @@ const blockTypePlugin = ({
   api
 }) => {
   var _api$primaryToolbar;
-  // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
   const isNestingInQuoteSchemaChanged = fg('platform_editor_nest_in_quotes_adf_change') || fg('editor_nest_media_and_codeblock_in_quotes_jira');
   const primaryToolbarComponent = ({
     popupsMountPoint,

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

@@ -2,6 +2,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
 import { HEADING_KEYS } from '../consts';
@@ -133,7 +134,48 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph) => {
           altKeyLocation = 0;
         }
         return false;
+      },
+      handleDrop(view, event, slice, moved) {
+        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
+};
+export const handleBlockQuoteDND = (view, event, slice) => {
+  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
+  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
+    let sliceContainsCodeBlockOrMedia = false;
+    slice.content.forEach(node => {
+      if (node.type === view.state.schema.nodes.codeBlock) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaSingle) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaGroup) {
+        sliceContainsCodeBlockOrMedia = true;
+      }
+    });
+    if (sliceContainsCodeBlockOrMedia) {
+      const {
+        state
+      } = view;
+      const {
+        schema
+      } = state;
+      const dropPos = view.posAtCoords({
+        left: event.clientX,
+        top: event.clientY
+      });
+      if (!dropPos) {
+        return false;
+      }
+      const resolvedPos = state.doc.resolve(dropPos.pos);
+      const dropLocationNodeType = resolvedPos.node().type;
+      const dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
+      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
+        event.preventDefault();
+        return true;
+      }
+    }
+  }
+  return false;
 };

package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -10,10 +10,9 @@ import { FormattedMessage } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
 import TextIcon from '@atlaskit/icon/core/text';
+import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { NORMAL_TEXT } from '../../block-types';
 import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
 export const BlockTypeButton = props => {
@@ -39,17 +38,12 @@ export const BlockTypeButton = props => {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, jsx(React.Fragment, null, props.isSmall && (
-    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
-    fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
+    }, jsx(React.Fragment, null, props.isSmall && jsx(TextIcon, {
       label: labelTextStyles,
       spacing: "spacious",
-      color: "currentColor"
-    }) : jsx(TextStyleIcon, {
       color: "currentColor",
-      spacing: "spacious",
-      label: labelTextStyles
-    })), jsx("span", {
+      LEGACY_fallbackIcon: TextStyleIconLegacy
+    }), jsx("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: expandIconContainerStyle
     }, jsx(ChevronDownIcon, {

package/dist/esm/plugin/index.js

@@ -92,7 +92,6 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
   var _api$primaryToolbar;
   var options = _ref3.config,
     api = _ref3.api;
-  // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
   var isNestingInQuoteSchemaChanged = fg('platform_editor_nest_in_quotes_adf_change') || fg('editor_nest_media_and_codeblock_in_quotes_jira');
   var primaryToolbarComponent = function primaryToolbarComponent(_ref4) {
     var popupsMountPoint = _ref4.popupsMountPoint,

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

@@ -5,6 +5,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
 import { HEADING_KEYS } from '../consts';
@@ -138,7 +139,44 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
           altKeyLocation = 0;
         }
         return false;
+      },
+      handleDrop: function handleDrop(view, event, slice, moved) {
+        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
+};
+export var handleBlockQuoteDND = function handleBlockQuoteDND(view, event, slice) {
+  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
+  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
+    var sliceContainsCodeBlockOrMedia = false;
+    slice.content.forEach(function (node) {
+      if (node.type === view.state.schema.nodes.codeBlock) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaSingle) {
+        sliceContainsCodeBlockOrMedia = true;
+      } else if (node.type === view.state.schema.nodes.mediaGroup) {
+        sliceContainsCodeBlockOrMedia = true;
+      }
+    });
+    if (sliceContainsCodeBlockOrMedia) {
+      var state = view.state;
+      var schema = state.schema;
+      var dropPos = view.posAtCoords({
+        left: event.clientX,
+        top: event.clientY
+      });
+      if (!dropPos) {
+        return false;
+      }
+      var resolvedPos = state.doc.resolve(dropPos.pos);
+      var dropLocationNodeType = resolvedPos.node().type;
+      var dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
+      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
+        event.preventDefault();
+        return true;
+      }
+    }
+  }
+  return false;
 };

package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -10,10 +10,9 @@ import { FormattedMessage } from 'react-intl-next';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
 import TextIcon from '@atlaskit/icon/core/text';
+import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { NORMAL_TEXT } from '../../block-types';
 import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
 export var BlockTypeButton = function BlockTypeButton(props) {
@@ -39,17 +38,12 @@ export var BlockTypeButton = function BlockTypeButton(props) {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, jsx(React.Fragment, null, props.isSmall && (
-    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
-    fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
+    }, jsx(React.Fragment, null, props.isSmall && jsx(TextIcon, {
       label: labelTextStyles,
       spacing: "spacious",
-      color: "currentColor"
-    }) : jsx(TextStyleIcon, {
       color: "currentColor",
-      spacing: "spacious",
-      label: labelTextStyles
-    })), jsx("span", {
+      LEGACY_fallbackIcon: TextStyleIconLegacy
+    }), jsx("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: expandIconContainerStyle
     }, jsx(ChevronDownIcon, {

package/dist/types/plugin/index.d.ts

@@ -1,6 +1,5 @@
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextBlockTypes } from './block-types';
 import type { InputMethod } from './commands/block-type';
@@ -8,11 +7,7 @@ import type { BlockTypeState } from './pm-plugins/main';
 import type { BlockTypePluginOptions } from './types';
 export type BlockTypePlugin = NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<PrimaryToolbarPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>
-    ];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<PrimaryToolbarPlugin>];
     sharedState: BlockTypeState | undefined;
     actions: {
         insertBlockQuote: (inputMethod: InputMethod) => Command;

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

@@ -1,6 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockTypePlugin } from '../index';
 import type { BlockType } from '../types';
 export type BlockTypeState = {
@@ -16,3 +18,4 @@ export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlug
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
 }>;
+export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

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

@@ -1,6 +1,5 @@
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextBlockTypes } from './block-types';
 import type { InputMethod } from './commands/block-type';
@@ -10,8 +9,7 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<PrimaryToolbarPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>
+        OptionalPlugin<PrimaryToolbarPlugin>
     ];
     sharedState: BlockTypeState | undefined;
     actions: {

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

@@ -1,6 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockTypePlugin } from '../index';
 import type { BlockType } from '../types';
 export type BlockTypeState = {
@@ -16,3 +18,4 @@ export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlug
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
 }>;
+export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "3.14.7",
+	"version": "3.14.9",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,18 +34,18 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^89.0.0",
+		"@atlaskit/editor-common": "^89.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.16.0",
+		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "*",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -56,7 +56,6 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/analytics-next": "^10.1.0",
-		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
 		"@atlaskit/ssr": "*",