@atlaskit/editor-plugin-card 15.0.0 → 16.0.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-plugin-card
 
+## 16.0.1
+
+### Patch Changes
+
+- [`3e5cf48f0f52f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3e5cf48f0f52f) -
+  Replace `cc_dnd_smart_link_changeboard_po_template_gate` feature gate with
+  `cc_dnd_smart_link_changeboard_po_template` experiment using `expValNoExposure`.
+- Updated dependencies
+
+## 16.0.0
+
+### Major Changes
+
+- [`901c87a57486e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/901c87a57486e) -
+  Removed `react-intl-next` alias and replaced all usages with `react-intl` directly.
+
+  What changed: The `react-intl-next` npm alias (which resolved to `react-intl@^5`) has been
+  removed. All imports now reference `react-intl` directly, and `peerDependencies` have been updated
+  to `"^5.25.1 || ^6.0.0 || ^7.0.0"`.
+
+  How consumer should update their code: Ensure `react-intl` is installed at a version satisfying
+  `^5.25.1 || ^6.0.0 || ^7.0.0`. If your application was using `react-intl-next` as an npm alias, it
+  can be safely removed. Replace any remaining `react-intl-next` imports with `react-intl`.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 15.0.0
 
 ### Patch Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -21,6 +21,7 @@ var _smartCard = require("@atlaskit/smart-card");
 var _ssr = require("@atlaskit/smart-card/ssr");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _actions = require("../pm-plugins/actions");
 var _utils = require("../pm-plugins/utils");
 var _toolbar = require("../ui/toolbar");
@@ -202,7 +203,7 @@ function InlineCardNodeView(props) {
     isPageSSRed = props.isPageSSRed,
     provider = props.provider,
     CompetitorPrompt = props.CompetitorPrompt;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, (0, _platformFeatureFlags.fg)('cc_dnd_smart_link_changeboard_po_template_gate') ? ['editorViewMode', 'card'] : ['editorViewMode'], (0, _platformFeatureFlags.fg)('cc_dnd_smart_link_changeboard_po_template_gate') ? selectorWithCard : selectorWithoutCard),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, (0, _expVal.expValNoExposure)('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && (0, _platformFeatureFlags.fg)('cc_drag_and_drop_smart_link_from_content_to_tree') ? ['editorViewMode', 'card'] : ['editorViewMode'], (0, _expVal.expValNoExposure)('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && (0, _platformFeatureFlags.fg)('cc_drag_and_drop_smart_link_from_content_to_tree') ? selectorWithCard : selectorWithoutCard),
     mode = _useSharedPluginState.mode,
     resolvedInlineSmartLinks = _useSharedPluginState.resolvedInlineSmartLinks;
   var url = node.attrs.url;

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

@@ -15,6 +15,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _linkingCommon = require("@atlaskit/linking-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _inlineCard = require("../nodeviews/inlineCard");
 var _lazyBlockCard = require("../nodeviews/lazy-block-card");
 var _lazyEmbedCard = require("../nodeviews/lazy-embed-card");
@@ -124,7 +125,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
           var newState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
 
           // Track the first resolved inline smart link for PO spotlight DOM targeting
-          if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && (0, _platformFeatureFlags.fg)('cc_dnd_smart_link_changeboard_po_template_gate')) {
+          if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && (0, _expVal.expValNoExposure)('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && (0, _platformFeatureFlags.fg)('cc_drag_and_drop_smart_link_from_content_to_tree')) {
             var resolvedRequest = pluginState.requests.find(function (req) {
               return req.url === meta.url;
             });

package/dist/cjs/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -78,7 +78,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           icon: icon,
           tooltipContent: tooltipContent,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.linkToolbarMessages.editLink)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -94,7 +94,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           tooltipContent: intl.formatMessage(_messages.linkToolbarMessages.editDatasourceStandaloneTooltip),
           onClick: onEditDatasource,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.linkToolbarMessages.editDatasourceStandalone)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -118,7 +118,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           disabled: false,
           ariaHasPopup: true,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownTriggerTitle)), !areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -142,14 +142,14 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           key: "edit.link",
           onClick: onEditLink,
           testId: "edit-dropdown-edit-link-item"
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownEditLinkTitle)), (0, _react2.jsx)(_menu.ButtonItem, {
           key: "edit.datasource",
           onClick: onEditDatasource,
           testId: "edit-dropdown-edit-datasource-item"
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownEditDatasourceTitle))));

package/dist/cjs/ui/EditToolbarButton/index.js

@@ -9,7 +9,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -103,7 +103,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           testId: "edit-link",
           onClick: onEditLink,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.linkToolbarMessages.editLink)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -119,7 +119,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           tooltipContent: intl.formatMessage(_messages.linkToolbarMessages.editDatasourceStandaloneTooltip),
           onClick: onEditDatasource,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.linkToolbarMessages.editDatasourceStandalone)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -143,7 +143,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           disabled: false,
           ariaHasPopup: true,
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownTriggerTitle)), !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
@@ -167,14 +167,14 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           key: "edit.link",
           onClick: onEditLink,
           testId: "edit-dropdown-edit-link-item"
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownEditLinkTitle)), (0, _react2.jsx)(_menu.ButtonItem, {
           key: "edit.datasource",
           onClick: onEditDatasource,
           testId: "edit-dropdown-edit-datasource-item"
-        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, (0, _react2.jsx)(_reactIntl.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         , _messages.cardMessages.editDropdownEditDatasourceTitle))));

package/dist/cjs/ui/InlineCardOverlay/index.js

@@ -13,7 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _messages = require("@atlaskit/editor-common/messages");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize"));
@@ -221,7 +221,7 @@ var InlineCardOverlay = function InlineCardOverlay(_ref) {
       observer.disconnect();
     };
   }, [isVisible, setVisibility]);
-  var intl = (0, _reactIntlNext.useIntl)();
+  var intl = (0, _reactIntl.useIntl)();
   var label = intl.formatMessage(_messages.cardMessages.inlineOverlay);
   return (
     // Ignored via go/ees005

package/dist/cjs/ui/LayoutButton/index.js

@@ -8,7 +8,7 @@ exports.default = exports.LayoutButton = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -130,5 +130,5 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
     intl: intl
   });
 };
-var _default_1 = (0, _reactIntlNext.injectIntl)(LayoutButtonWrapper);
+var _default_1 = (0, _reactIntl.injectIntl)(LayoutButtonWrapper);
 var _default = exports.default = _default_1;

package/dist/es2019/nodeviews/inlineCard.js

@@ -12,6 +12,7 @@ import { Card as SmartCard } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import { visitCardLinkAnalytics } from '../ui/toolbar';
@@ -203,7 +204,7 @@ export function InlineCardNodeView(props) {
   const {
     mode,
     resolvedInlineSmartLinks
-  } = useSharedPluginStateWithSelector(pluginInjectionApi, fg('cc_dnd_smart_link_changeboard_po_template_gate') ? ['editorViewMode', 'card'] : ['editorViewMode'], fg('cc_dnd_smart_link_changeboard_po_template_gate') ? selectorWithCard : selectorWithoutCard);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree') ? ['editorViewMode', 'card'] : ['editorViewMode'], expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree') ? selectorWithCard : selectorWithoutCard);
   const url = node.attrs.url;
   const CompetitorPromptComponent = CompetitorPrompt && url ? /*#__PURE__*/React.createElement(CompetitorPrompt, {
     sourceUrl: url,

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

@@ -6,6 +6,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { InlineCardNodeView } from '../nodeviews/inlineCard';
 import { lazyBlockCardView } from '../nodeviews/lazy-block-card';
 import { lazyEmbedCardView } from '../nodeviews/lazy-embed-card';
@@ -115,7 +116,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
         const newState = reducer(pluginStateWithUpdatedPos, meta);
 
         // Track the first resolved inline smart link for PO spotlight DOM targeting
-        if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && fg('cc_dnd_smart_link_changeboard_po_template_gate')) {
+        if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree')) {
           const resolvedRequest = pluginState.requests.find(req => req.url === meta.url);
           if ((resolvedRequest === null || resolvedRequest === void 0 ? void 0 : resolvedRequest.appearance) === 'inline') {
             var _newState$resolvedInl, _newState$resolvedInl2;

package/dist/es2019/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -6,7 +6,7 @@ import { useCallback, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage } from 'react-intl';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';

package/dist/es2019/ui/EditToolbarButton/index.js

@@ -6,7 +6,7 @@ import { useCallback, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage } from 'react-intl';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';

package/dist/es2019/ui/InlineCardOverlay/index.js

@@ -10,7 +10,7 @@ import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import CustomizeIcon from '@atlaskit/icon/core/customize';

package/dist/es2019/ui/LayoutButton/index.js

@@ -5,7 +5,7 @@
 import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { injectIntl } from 'react-intl-next';
+import { injectIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';

package/dist/esm/nodeviews/inlineCard.js

@@ -12,6 +12,7 @@ import { Card as SmartCard } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import { visitCardLinkAnalytics } from '../ui/toolbar';
@@ -190,7 +191,7 @@ export function InlineCardNodeView(props) {
     isPageSSRed = props.isPageSSRed,
     provider = props.provider,
     CompetitorPrompt = props.CompetitorPrompt;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, fg('cc_dnd_smart_link_changeboard_po_template_gate') ? ['editorViewMode', 'card'] : ['editorViewMode'], fg('cc_dnd_smart_link_changeboard_po_template_gate') ? selectorWithCard : selectorWithoutCard),
+  var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree') ? ['editorViewMode', 'card'] : ['editorViewMode'], expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree') ? selectorWithCard : selectorWithoutCard),
     mode = _useSharedPluginState.mode,
     resolvedInlineSmartLinks = _useSharedPluginState.resolvedInlineSmartLinks;
   var url = node.attrs.url;

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

@@ -10,6 +10,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { InlineCardNodeView } from '../nodeviews/inlineCard';
 import { lazyBlockCardView } from '../nodeviews/lazy-block-card';
 import { lazyEmbedCardView } from '../nodeviews/lazy-embed-card';
@@ -117,7 +118,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
           var newState = reducer(pluginStateWithUpdatedPos, meta);
 
           // Track the first resolved inline smart link for PO spotlight DOM targeting
-          if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && fg('cc_dnd_smart_link_changeboard_po_template_gate')) {
+          if (meta.type === 'RESOLVE' && pluginState !== null && pluginState !== void 0 && (_pluginState$requests = pluginState.requests) !== null && _pluginState$requests !== void 0 && _pluginState$requests.length && expValNoExposure('cc_dnd_smart_link_changeboard_po_template', 'isEnabled', false) && fg('cc_drag_and_drop_smart_link_from_content_to_tree')) {
             var resolvedRequest = pluginState.requests.find(function (req) {
               return req.url === meta.url;
             });

package/dist/esm/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -7,7 +7,7 @@ import { useCallback, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage } from 'react-intl';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';

package/dist/esm/ui/EditToolbarButton/index.js

@@ -9,7 +9,7 @@ import { useCallback, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage } from 'react-intl';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';

package/dist/esm/ui/InlineCardOverlay/index.js

@@ -14,7 +14,7 @@ import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import CustomizeIcon from '@atlaskit/icon/core/customize';

package/dist/esm/ui/LayoutButton/index.js

@@ -8,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { injectIntl } from 'react-intl-next';
+import { injectIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';

package/dist/types/ui/DatasourceAppearanceButton.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types/ui/DatasourceDropdownOption.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NewCoreIconProps } from '@atlaskit/icon';
 interface Props {

package/dist/types/ui/EditToolbarButton/types.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';

package/dist/types/ui/HyperlinkToolbarAppearance.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';

package/dist/types/ui/LayoutButton/index.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentType, FC } from 'react';
 import { jsx } from '@emotion/react';
-import type { WithIntlProps, WrappedComponentProps } from 'react-intl-next';
+import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
 import type { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
 export declare const LayoutButton: ({ onLayoutChange, layout, intl: { formatMessage }, mountPoint, boundariesElement, scrollableElement, targetElement, testId, }: LayoutButtonProps) => jsx.JSX.Element | null;
 declare const _default_1: FC<WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps>> & {

package/dist/types/ui/LayoutButton/types.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../../index';

package/dist/types/ui/LinkToolbarAppearance.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';

package/dist/types/ui/OpenPreviewButton/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types/ui/toolbar.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';

package/dist/types-ts4.5/ui/DatasourceAppearanceButton.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types-ts4.5/ui/DatasourceDropdownOption.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NewCoreIconProps } from '@atlaskit/icon';
 interface Props {

package/dist/types-ts4.5/ui/EditToolbarButton/types.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';

package/dist/types-ts4.5/ui/HyperlinkToolbarAppearance.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';

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

@@ -1,6 +1,6 @@
 import type { ComponentType, FC } from 'react';
 import { jsx } from '@emotion/react';
-import type { WithIntlProps, WrappedComponentProps } from 'react-intl-next';
+import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
 import type { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
 export declare const LayoutButton: ({ onLayoutChange, layout, intl: { formatMessage }, mountPoint, boundariesElement, scrollableElement, targetElement, testId, }: LayoutButtonProps) => jsx.JSX.Element | null;
 declare const _default_1: FC<WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps>> & {

package/dist/types-ts4.5/ui/LayoutButton/types.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../../index';

package/dist/types-ts4.5/ui/LinkToolbarAppearance.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types-ts4.5/ui/toolbar.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "15.0.0",
+	"version": "16.0.1",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,17 @@
 		"@atlaskit/adf-schema": "^52.5.0",
 		"@atlaskit/analytics-next": "^11.2.0",
 		"@atlaskit/custom-steps": "^0.16.0",
-		"@atlaskit/editor-plugin-analytics": "^9.0.0",
-		"@atlaskit/editor-plugin-base": "^10.0.0",
-		"@atlaskit/editor-plugin-connectivity": "^9.0.0",
-		"@atlaskit/editor-plugin-decorations": "^9.0.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^9.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^11.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^8.0.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^11.0.0",
-		"@atlaskit/editor-plugin-grid": "^9.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^6.0.0",
-		"@atlaskit/editor-plugin-width": "^10.0.0",
+		"@atlaskit/editor-plugin-analytics": "^10.0.0",
+		"@atlaskit/editor-plugin-base": "^11.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^10.0.0",
+		"@atlaskit/editor-plugin-decorations": "^10.0.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^10.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^12.0.0",
+		"@atlaskit/editor-plugin-feature-flags": "^9.0.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^12.0.0",
+		"@atlaskit/editor-plugin-grid": "^10.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^7.0.0",
+		"@atlaskit/editor-plugin-width": "^11.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-smart-link-draggable": "^0.5.0",
@@ -60,8 +60,8 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/smart-card": "^44.0.0",
-		"@atlaskit/tmp-editor-statsig": "^62.4.0",
+		"@atlaskit/smart-card": "^44.1.0",
+		"@atlaskit/tmp-editor-statsig": "^62.7.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -71,10 +71,10 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^113.0.0",
+		"@atlaskit/editor-common": "^114.1.0",
 		"@atlaskit/link-provider": "^4.3.0",
 		"react": "^18.2.0",
-		"react-intl-next": "npm:react-intl@^5.18.1"
+		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {
@@ -113,9 +113,6 @@
 		"cc_drag_and_drop_smart_link_from_content_to_tree": {
 			"type": "boolean"
 		},
-		"cc_dnd_smart_link_changeboard_po_template_gate": {
-			"type": "boolean"
-		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
 		},
@@ -137,5 +134,8 @@
 			"checkDevDependencies": true
 		}
 	},
-	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/e6f3220b-0ca2-445a-a4c5-78cff6ca2a34"
+	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/e6f3220b-0ca2-445a-a4c5-78cff6ca2a34",
+	"devDependencies": {
+		"react-intl": "^6.6.2"
+	}
 }

package/report.api.md

@@ -222,7 +222,7 @@ type UpdateMetadata = {
 {
 	"@atlaskit/link-provider": "^1.6.2",
 	"react": "^16.8.0",
-	"react-intl-next": "npm:react-intl@^5.18.1"
+	"react-intl": "npm:react-intl@^5.18.1"
 }
 ```