@atlaskit/logo 19.6.2 → 19.7.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/logo
 
+## 19.7.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.7.0
+
+### Minor Changes
+
+- [`46af0313b8e7a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/46af0313b8e7a) -
+  We are testing rebranded logos behind a feature flag. If this change is successful it will be
+  available in a later release.
+
 ## 19.6.2
 
 ### Patch Changes

package/Wrapper/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/wrapper.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/wrapper.d.ts"
       ]

package/atlas-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/legacy-logos/atlas/icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/legacy-logos/atlas/icon.d.ts"
       ]

package/atlassian-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/atlassian-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/atlassian-icon.d.ts"
       ]

package/bitbucket-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/bitbucket-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/bitbucket-icon.d.ts"
       ]

package/confluence-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/confluence-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/confluence-icon.d.ts"
       ]

package/constants/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/constants.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/constants.d.ts"
       ]

package/dist/cjs/index.js

@@ -744,7 +744,7 @@ var JiraProductDiscoveryLogo = exports.JiraProductDiscoveryLogo = (0, _logoConfi
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var JiraServiceManagementIcon = exports.JiraServiceManagementIcon = (0, _logoConfig.createFeatureFlaggedComponent)(_jiraServiceManagement2.JiraServiceManagementIcon, _jiraServiceManagement.JiraServiceManagementIcon);
+var JiraServiceManagementIcon = exports.JiraServiceManagementIcon = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_jiraServiceManagement2.JiraServiceManagementIcon, _jiraServiceManagement.JiraServiceManagementIcon);
 
 /**
  * __Jira service management logo__
@@ -755,7 +755,7 @@ var JiraServiceManagementIcon = exports.JiraServiceManagementIcon = (0, _logoCon
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var JiraServiceManagementLogo = exports.JiraServiceManagementLogo = (0, _logoConfig.createFeatureFlaggedComponent)(_jiraServiceManagement2.JiraServiceManagementLogo, _jiraServiceManagement.JiraServiceManagementLogoCS);
+var JiraServiceManagementLogo = exports.JiraServiceManagementLogo = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_jiraServiceManagement2.JiraServiceManagementLogo, _jiraServiceManagement.JiraServiceManagementLogoCS);
 
 /**
  * __Loom icon__
@@ -826,7 +826,7 @@ var LoomBlurpleIcon = exports.LoomBlurpleIcon = (0, _logoConfig.tempSizeWrapper)
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var OpsgenieIcon = exports.OpsgenieIcon = (0, _logoConfig.createFeatureFlaggedComponent)(_opsgenie2.OpsgenieIcon, _opsgenie.OpsgenieIcon);
+var OpsgenieIcon = exports.OpsgenieIcon = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_opsgenie2.OpsgenieIcon, _opsgenie.OpsgenieIcon);
 /**
  * __Opsgenie logo__
  *
@@ -836,7 +836,7 @@ var OpsgenieIcon = exports.OpsgenieIcon = (0, _logoConfig.createFeatureFlaggedCo
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var OpsgenieLogo = exports.OpsgenieLogo = (0, _logoConfig.createFeatureFlaggedComponent)(_opsgenie2.OpsgenieLogo, _opsgenie.OpsgenieLogoCS);
+var OpsgenieLogo = exports.OpsgenieLogo = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_opsgenie2.OpsgenieLogo, _opsgenie.OpsgenieLogoCS);
 
 /**
  * __Statuspage icon__
@@ -847,7 +847,7 @@ var OpsgenieLogo = exports.OpsgenieLogo = (0, _logoConfig.createFeatureFlaggedCo
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var StatuspageIcon = exports.StatuspageIcon = (0, _logoConfig.createFeatureFlaggedComponent)(_statuspage2.StatuspageIcon, _statuspage.StatuspageIcon);
+var StatuspageIcon = exports.StatuspageIcon = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_statuspage2.StatuspageIcon, _statuspage.StatuspageIcon);
 /**
  * __Statuspage logo__
  *
@@ -857,7 +857,7 @@ var StatuspageIcon = exports.StatuspageIcon = (0, _logoConfig.createFeatureFlagg
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var StatuspageLogo = exports.StatuspageLogo = (0, _logoConfig.createFeatureFlaggedComponent)(_statuspage2.StatuspageLogo, _statuspage.StatuspageLogoCS);
+var StatuspageLogo = exports.StatuspageLogo = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_statuspage2.StatuspageLogo, _statuspage.StatuspageLogoCS);
 /**
  * __Trello icon__
  *
@@ -887,7 +887,7 @@ var TrelloLogo = exports.TrelloLogo = (0, _logoConfig.createFeatureFlaggedCompon
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var RovoIcon = exports.RovoIcon = (0, _logoConfig.createFeatureFlaggedComponent)(_rovo2.RovoIcon, _rovo.RovoIcon);
+var RovoIcon = exports.RovoIcon = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_rovo2.RovoIcon, _rovo.RovoIcon);
 /**
  * __Rovo logo__
  *
@@ -897,7 +897,7 @@ var RovoIcon = exports.RovoIcon = (0, _logoConfig.createFeatureFlaggedComponent)
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-var RovoLogo = exports.RovoLogo = (0, _logoConfig.createFeatureFlaggedComponent)(_rovo2.RovoLogo, _rovo.RovoLogoCS);
+var RovoLogo = exports.RovoLogo = (0, _logoConfig.createFeatureFlaggedServiceCollectionComponent)(_rovo2.RovoLogo, _rovo.RovoLogoCS);
 
 /**
  * __Guard icon__

package/dist/cjs/logo-config.js

@@ -4,13 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tempSizeWrapper = exports.logoDocsSchema = exports.createFeatureFlaggedComponent = exports.SHARED_LOGOS = exports.PROGRAM_LOGO_DOCS_ORDER = exports.NEW_ONLY_LOGOS = exports.LEGACY_ONLY_LOGOS = exports.APP_LOGO_DOCS_ORDER = void 0;
+exports.tempSizeWrapper = exports.logoDocsSchema = exports.createFeatureFlaggedServiceCollectionComponent = exports.createFeatureFlaggedComponent = exports.SHARED_LOGOS = exports.PROGRAM_LOGO_DOCS_ORDER = exports.NEW_ONLY_LOGOS = exports.LEGACY_ONLY_LOGOS = exports.APP_LOGO_DOCS_ORDER = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _excluded = ["size", "shouldUseNewLogoDesign"],
-  _excluded2 = ["size"];
+  _excluded2 = ["size", "shouldUseNewLogoDesign"],
+  _excluded3 = ["size"];
 /**
  * Creates a feature flagged component that renders the legacy logo or the new logo
  * based on the platform-logo-rebrand feature flag.
@@ -39,14 +40,41 @@ var createFeatureFlaggedComponent = exports.createFeatureFlaggedComponent = func
 };
 
 /**
- * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
+ * Creates a feature flagged component that renders the legacy logo or the new logo
+ * based on the platform-logo-rebrand-servco or platform-logo-rebrand feature flag.
  *
- * @param NewComponent - The new logo or icon component.
+ * @param LegacyComponent - The legacy logo component.
+ * @param NewComponent - The new logo component.
+ * @returns A feature flagged component that renders the legacy logo or the new logo.
  */
-var tempSizeWrapper = exports.tempSizeWrapper = function tempSizeWrapper(NewComponent) {
+var createFeatureFlaggedServiceCollectionComponent = exports.createFeatureFlaggedServiceCollectionComponent = function createFeatureFlaggedServiceCollectionComponent(LegacyComponent, NewComponent) {
+  // Note: textColor and iconColor aren't supported on all new logos
+  // These props will be deprecated in the future
   return function (_ref2) {
     var size = _ref2.size,
+      shouldUseNewLogoDesign = _ref2.shouldUseNewLogoDesign,
       props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+    if ((0, _platformFeatureFlags.fg)('platform-logo-rebrand-servco') || (0, _platformFeatureFlags.fg)('platform-logo-rebrand') || shouldUseNewLogoDesign) {
+      // Size defaults need to be set, as the temp library had different defaults
+      return /*#__PURE__*/_react.default.createElement(NewComponent, (0, _extends2.default)({
+        size: size || 'medium'
+      }, props));
+    }
+    return /*#__PURE__*/_react.default.createElement(LegacyComponent, (0, _extends2.default)({
+      size: size
+    }, props));
+  };
+};
+
+/**
+ * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
+ *
+ * @param NewComponent - The new logo or icon component.
+ */
+var tempSizeWrapper = exports.tempSizeWrapper = function tempSizeWrapper(NewComponent) {
+  return function (_ref3) {
+    var size = _ref3.size,
+      props = (0, _objectWithoutProperties2.default)(_ref3, _excluded3);
     return /*#__PURE__*/_react.default.createElement(NewComponent, (0, _extends2.default)({
       size: size || 'medium'
     }, props));

package/dist/es2019/index.js

@@ -57,7 +57,7 @@ export { AtlassianAccessIcon, AtlassianAccessLogo } from './legacy-logos/atlassi
 export { JiraWorkManagementLogo, JiraWorkManagementIcon } from './legacy-logos/jira-work-management';
 export { AtlassianIcon, AtlassianLogo } from './legacy-logos/atlassian';
 export { JiraSoftwareIcon, JiraSoftwareLogo } from './legacy-logos/jira-software';
-import { createFeatureFlaggedComponent, tempSizeWrapper } from './logo-config';
+import { createFeatureFlaggedComponent, createFeatureFlaggedServiceCollectionComponent, tempSizeWrapper } from './logo-config';
 
 /**
  * __Admin icon__
@@ -664,7 +664,7 @@ export const JiraProductDiscoveryLogo = createFeatureFlaggedComponent(LegacyJPDL
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const JiraServiceManagementIcon = createFeatureFlaggedComponent(LegacyJSMIcon, NewJSMIcon);
+export const JiraServiceManagementIcon = createFeatureFlaggedServiceCollectionComponent(LegacyJSMIcon, NewJSMIcon);
 
 /**
  * __Jira service management logo__
@@ -675,7 +675,7 @@ export const JiraServiceManagementIcon = createFeatureFlaggedComponent(LegacyJSM
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const JiraServiceManagementLogo = createFeatureFlaggedComponent(LegacyJSMLogo, NewJSMLogo);
+export const JiraServiceManagementLogo = createFeatureFlaggedServiceCollectionComponent(LegacyJSMLogo, NewJSMLogo);
 
 /**
  * __Loom icon__
@@ -746,7 +746,7 @@ export const LoomBlurpleIcon = tempSizeWrapper(NewLoomInternalIcon);
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const OpsgenieIcon = createFeatureFlaggedComponent(LegacyOpsgenieIcon, NewOpsgenieIcon);
+export const OpsgenieIcon = createFeatureFlaggedServiceCollectionComponent(LegacyOpsgenieIcon, NewOpsgenieIcon);
 /**
  * __Opsgenie logo__
  *
@@ -756,7 +756,7 @@ export const OpsgenieIcon = createFeatureFlaggedComponent(LegacyOpsgenieIcon, Ne
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const OpsgenieLogo = createFeatureFlaggedComponent(LegacyOpsgenieLogo, NewOpsgenieLogo);
+export const OpsgenieLogo = createFeatureFlaggedServiceCollectionComponent(LegacyOpsgenieLogo, NewOpsgenieLogo);
 
 /**
  * __Statuspage icon__
@@ -767,7 +767,7 @@ export const OpsgenieLogo = createFeatureFlaggedComponent(LegacyOpsgenieLogo, Ne
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const StatuspageIcon = createFeatureFlaggedComponent(LegacyStatuspageIcon, NewStatuspageIcon);
+export const StatuspageIcon = createFeatureFlaggedServiceCollectionComponent(LegacyStatuspageIcon, NewStatuspageIcon);
 /**
  * __Statuspage logo__
  *
@@ -777,7 +777,7 @@ export const StatuspageIcon = createFeatureFlaggedComponent(LegacyStatuspageIcon
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const StatuspageLogo = createFeatureFlaggedComponent(LegacyStatuspageLogo, NewStatuspageLogo);
+export const StatuspageLogo = createFeatureFlaggedServiceCollectionComponent(LegacyStatuspageLogo, NewStatuspageLogo);
 /**
  * __Trello icon__
  *
@@ -807,7 +807,7 @@ export const TrelloLogo = createFeatureFlaggedComponent(LegacyTrelloLogo, NewTre
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const RovoIcon = createFeatureFlaggedComponent(LegacyRovoIcon, NewRovoIcon);
+export const RovoIcon = createFeatureFlaggedServiceCollectionComponent(LegacyRovoIcon, NewRovoIcon);
 /**
  * __Rovo logo__
  *
@@ -817,7 +817,7 @@ export const RovoIcon = createFeatureFlaggedComponent(LegacyRovoIcon, NewRovoIco
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export const RovoLogo = createFeatureFlaggedComponent(LegacyRovoLogo, NewRovoLogo);
+export const RovoLogo = createFeatureFlaggedServiceCollectionComponent(LegacyRovoLogo, NewRovoLogo);
 
 /**
  * __Guard icon__

package/dist/es2019/logo-config.js

@@ -29,6 +29,34 @@ export const createFeatureFlaggedComponent = (LegacyComponent, NewComponent) =>
   };
 };
 
+/**
+ * Creates a feature flagged component that renders the legacy logo or the new logo
+ * based on the platform-logo-rebrand-servco or platform-logo-rebrand feature flag.
+ *
+ * @param LegacyComponent - The legacy logo component.
+ * @param NewComponent - The new logo component.
+ * @returns A feature flagged component that renders the legacy logo or the new logo.
+ */
+export const createFeatureFlaggedServiceCollectionComponent = (LegacyComponent, NewComponent) => {
+  // Note: textColor and iconColor aren't supported on all new logos
+  // These props will be deprecated in the future
+  return ({
+    size,
+    shouldUseNewLogoDesign,
+    ...props
+  }) => {
+    if (fg('platform-logo-rebrand-servco') || fg('platform-logo-rebrand') || shouldUseNewLogoDesign) {
+      // Size defaults need to be set, as the temp library had different defaults
+      return /*#__PURE__*/React.createElement(NewComponent, _extends({
+        size: size || 'medium'
+      }, props));
+    }
+    return /*#__PURE__*/React.createElement(LegacyComponent, _extends({
+      size: size
+    }, props));
+  };
+};
+
 /**
  * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
  *

package/dist/esm/index.js

@@ -57,7 +57,7 @@ export { AtlassianAccessIcon, AtlassianAccessLogo } from './legacy-logos/atlassi
 export { JiraWorkManagementLogo, JiraWorkManagementIcon } from './legacy-logos/jira-work-management';
 export { AtlassianIcon, AtlassianLogo } from './legacy-logos/atlassian';
 export { JiraSoftwareIcon, JiraSoftwareLogo } from './legacy-logos/jira-software';
-import { createFeatureFlaggedComponent, tempSizeWrapper } from './logo-config';
+import { createFeatureFlaggedComponent, createFeatureFlaggedServiceCollectionComponent, tempSizeWrapper } from './logo-config';
 
 /**
  * __Admin icon__
@@ -664,7 +664,7 @@ export var JiraProductDiscoveryLogo = createFeatureFlaggedComponent(LegacyJPDLog
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var JiraServiceManagementIcon = createFeatureFlaggedComponent(LegacyJSMIcon, NewJSMIcon);
+export var JiraServiceManagementIcon = createFeatureFlaggedServiceCollectionComponent(LegacyJSMIcon, NewJSMIcon);
 
 /**
  * __Jira service management logo__
@@ -675,7 +675,7 @@ export var JiraServiceManagementIcon = createFeatureFlaggedComponent(LegacyJSMIc
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var JiraServiceManagementLogo = createFeatureFlaggedComponent(LegacyJSMLogo, NewJSMLogo);
+export var JiraServiceManagementLogo = createFeatureFlaggedServiceCollectionComponent(LegacyJSMLogo, NewJSMLogo);
 
 /**
  * __Loom icon__
@@ -746,7 +746,7 @@ export var LoomBlurpleIcon = tempSizeWrapper(NewLoomInternalIcon);
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var OpsgenieIcon = createFeatureFlaggedComponent(LegacyOpsgenieIcon, NewOpsgenieIcon);
+export var OpsgenieIcon = createFeatureFlaggedServiceCollectionComponent(LegacyOpsgenieIcon, NewOpsgenieIcon);
 /**
  * __Opsgenie logo__
  *
@@ -756,7 +756,7 @@ export var OpsgenieIcon = createFeatureFlaggedComponent(LegacyOpsgenieIcon, NewO
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var OpsgenieLogo = createFeatureFlaggedComponent(LegacyOpsgenieLogo, NewOpsgenieLogo);
+export var OpsgenieLogo = createFeatureFlaggedServiceCollectionComponent(LegacyOpsgenieLogo, NewOpsgenieLogo);
 
 /**
  * __Statuspage icon__
@@ -767,7 +767,7 @@ export var OpsgenieLogo = createFeatureFlaggedComponent(LegacyOpsgenieLogo, NewO
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var StatuspageIcon = createFeatureFlaggedComponent(LegacyStatuspageIcon, NewStatuspageIcon);
+export var StatuspageIcon = createFeatureFlaggedServiceCollectionComponent(LegacyStatuspageIcon, NewStatuspageIcon);
 /**
  * __Statuspage logo__
  *
@@ -777,7 +777,7 @@ export var StatuspageIcon = createFeatureFlaggedComponent(LegacyStatuspageIcon,
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var StatuspageLogo = createFeatureFlaggedComponent(LegacyStatuspageLogo, NewStatuspageLogo);
+export var StatuspageLogo = createFeatureFlaggedServiceCollectionComponent(LegacyStatuspageLogo, NewStatuspageLogo);
 /**
  * __Trello icon__
  *
@@ -807,7 +807,7 @@ export var TrelloLogo = createFeatureFlaggedComponent(LegacyTrelloLogo, NewTrell
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var RovoIcon = createFeatureFlaggedComponent(LegacyRovoIcon, NewRovoIcon);
+export var RovoIcon = createFeatureFlaggedServiceCollectionComponent(LegacyRovoIcon, NewRovoIcon);
 /**
  * __Rovo logo__
  *
@@ -817,7 +817,7 @@ export var RovoIcon = createFeatureFlaggedComponent(LegacyRovoIcon, NewRovoIcon)
  * - [Code](https://atlassian.design/components/logo/code)
  * - [Usage](https://atlassian.design/components/logo/usage)
  */
-export var RovoLogo = createFeatureFlaggedComponent(LegacyRovoLogo, NewRovoLogo);
+export var RovoLogo = createFeatureFlaggedServiceCollectionComponent(LegacyRovoLogo, NewRovoLogo);
 
 /**
  * __Guard icon__

package/dist/esm/logo-config.js

@@ -1,7 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["size", "shouldUseNewLogoDesign"],
-  _excluded2 = ["size"];
+  _excluded2 = ["size", "shouldUseNewLogoDesign"],
+  _excluded3 = ["size"];
 import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 /**
@@ -32,14 +33,41 @@ export var createFeatureFlaggedComponent = function createFeatureFlaggedComponen
 };
 
 /**
- * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
+ * Creates a feature flagged component that renders the legacy logo or the new logo
+ * based on the platform-logo-rebrand-servco or platform-logo-rebrand feature flag.
  *
- * @param NewComponent - The new logo or icon component.
+ * @param LegacyComponent - The legacy logo component.
+ * @param NewComponent - The new logo component.
+ * @returns A feature flagged component that renders the legacy logo or the new logo.
  */
-export var tempSizeWrapper = function tempSizeWrapper(NewComponent) {
+export var createFeatureFlaggedServiceCollectionComponent = function createFeatureFlaggedServiceCollectionComponent(LegacyComponent, NewComponent) {
+  // Note: textColor and iconColor aren't supported on all new logos
+  // These props will be deprecated in the future
   return function (_ref2) {
     var size = _ref2.size,
+      shouldUseNewLogoDesign = _ref2.shouldUseNewLogoDesign,
       props = _objectWithoutProperties(_ref2, _excluded2);
+    if (fg('platform-logo-rebrand-servco') || fg('platform-logo-rebrand') || shouldUseNewLogoDesign) {
+      // Size defaults need to be set, as the temp library had different defaults
+      return /*#__PURE__*/React.createElement(NewComponent, _extends({
+        size: size || 'medium'
+      }, props));
+    }
+    return /*#__PURE__*/React.createElement(LegacyComponent, _extends({
+      size: size
+    }, props));
+  };
+};
+
+/**
+ * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
+ *
+ * @param NewComponent - The new logo or icon component.
+ */
+export var tempSizeWrapper = function tempSizeWrapper(NewComponent) {
+  return function (_ref3) {
+    var size = _ref3.size,
+      props = _objectWithoutProperties(_ref3, _excluded3);
     return /*#__PURE__*/React.createElement(NewComponent, _extends({
       size: size || 'medium'
     }, props));

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export { AtlasIcon, AtlasLogo } from './legacy-logos/atlas';
 export { AtlassianMarketplaceIcon, AtlassianMarketplaceLogo, } from './legacy-logos/atlassian-marketplace';
 export { AtlassianAccessIcon, AtlassianAccessLogo } from './legacy-logos/atlassian-access';

package/dist/types/logo-config.d.ts

@@ -10,6 +10,15 @@ import { type LogoProps } from './types';
  * @returns A feature flagged component that renders the legacy logo or the new logo.
  */
 export declare const createFeatureFlaggedComponent: (LegacyComponent: React.ComponentType<LogoProps>, NewComponent: React.ComponentType<TempLogoProps> | React.ComponentType<TempIconProps>) => ({ size, shouldUseNewLogoDesign, ...props }: LogoProps) => React.JSX.Element;
+/**
+ * Creates a feature flagged component that renders the legacy logo or the new logo
+ * based on the platform-logo-rebrand-servco or platform-logo-rebrand feature flag.
+ *
+ * @param LegacyComponent - The legacy logo component.
+ * @param NewComponent - The new logo component.
+ * @returns A feature flagged component that renders the legacy logo or the new logo.
+ */
+export declare const createFeatureFlaggedServiceCollectionComponent: (LegacyComponent: React.ComponentType<LogoProps>, NewComponent: React.ComponentType<TempLogoProps> | React.ComponentType<TempIconProps>) => ({ size, shouldUseNewLogoDesign, ...props }: LogoProps) => React.JSX.Element;
 /**
  * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
  *

package/dist/types/types.d.ts

@@ -2,7 +2,7 @@ type Appearance = 'brand' | 'neutral' | 'inverse';
 type Size = 'xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
 type BaseLogoProps = {
     /**
-     * The size of the icon, uses the same sizing scheme as in `@atlaskit/icon`.
+     * The size of the icon.
      */
     size?: Size;
     /**

package/dist/types/wrapper.d.ts

@@ -2,7 +2,6 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-/// <reference types="react" />
 import { type WrapperProps } from './constants';
 /**
  * __Wrapper__

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export { AtlasIcon, AtlasLogo } from './legacy-logos/atlas';
 export { AtlassianMarketplaceIcon, AtlassianMarketplaceLogo, } from './legacy-logos/atlassian-marketplace';
 export { AtlassianAccessIcon, AtlassianAccessLogo } from './legacy-logos/atlassian-access';

package/dist/types-ts4.5/logo-config.d.ts

@@ -10,6 +10,15 @@ import { type LogoProps } from './types';
  * @returns A feature flagged component that renders the legacy logo or the new logo.
  */
 export declare const createFeatureFlaggedComponent: (LegacyComponent: React.ComponentType<LogoProps>, NewComponent: React.ComponentType<TempLogoProps> | React.ComponentType<TempIconProps>) => ({ size, shouldUseNewLogoDesign, ...props }: LogoProps) => React.JSX.Element;
+/**
+ * Creates a feature flagged component that renders the legacy logo or the new logo
+ * based on the platform-logo-rebrand-servco or platform-logo-rebrand feature flag.
+ *
+ * @param LegacyComponent - The legacy logo component.
+ * @param NewComponent - The new logo component.
+ * @returns A feature flagged component that renders the legacy logo or the new logo.
+ */
+export declare const createFeatureFlaggedServiceCollectionComponent: (LegacyComponent: React.ComponentType<LogoProps>, NewComponent: React.ComponentType<TempLogoProps> | React.ComponentType<TempIconProps>) => ({ size, shouldUseNewLogoDesign, ...props }: LogoProps) => React.JSX.Element;
 /**
  * Creates a wrapper around the new logo or icon component to ensure it receives the correct default (medium) size prop.
  *

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

@@ -2,7 +2,7 @@ type Appearance = 'brand' | 'neutral' | 'inverse';
 type Size = 'xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
 type BaseLogoProps = {
     /**
-     * The size of the icon, uses the same sizing scheme as in `@atlaskit/icon`.
+     * The size of the icon.
      */
     size?: Size;
     /**

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @jsxRuntime classic
  * @jsx jsx

package/jira-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/jira-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/jira-icon.d.ts"
       ]

package/jira-service-management-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/jira-service-management-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/jira-service-management-icon.d.ts"
       ]

package/jira-software-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/legacy-logos/jira-software/icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/legacy-logos/jira-software/icon.d.ts"
       ]

package/opsgenie-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/opsgenie.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/opsgenie.d.ts"
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/logo",
-	"version": "19.6.2",
+	"version": "19.7.1",
 	"description": "A logo is a visual representation of a brand or app. It can be a word, an image, or a combination of both.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,8 +30,8 @@
 		"@atlaskit/ds-lib": "^5.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/temp-nav-app-icons": "^0.10.0",
-		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tokens": "^6.0.0",
+		"@atlaskit/theme": "^20.0.0",
+		"@atlaskit/tokens": "^6.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3"
 	},
@@ -45,15 +45,15 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/code": "^17.2.0",
 		"@atlaskit/docs": "^11.0.0",
-		"@atlaskit/form": "^12.0.0",
+		"@atlaskit/form": "^12.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/lozenge": "^13.0.0",
-		"@atlaskit/primitives": "^14.11.0",
-		"@atlaskit/section-message": "^8.5.0",
+		"@atlaskit/primitives": "^14.12.0",
+		"@atlaskit/section-message": "^8.6.0",
 		"@atlaskit/select": "^21.2.0",
 		"@atlaskit/ssr": "workspace:^",
 		"@atlassian/codegen": "^0.1.0",
-		"@atlassian/ssr-tests": "^0.2.0",
+		"@atlassian/ssr-tests": "^0.3.0",
 		"@testing-library/react": "^13.4.0",
 		"fs-extra": "^4.0.2",
 		"jscodeshift": "^17.0.0",
@@ -110,6 +110,9 @@
 	"platform-feature-flags": {
 		"platform-logo-rebrand": {
 			"type": "boolean"
+		},
+		"platform-logo-rebrand-servco": {
+			"type": "boolean"
 		}
 	},
 	"homepage": "https://atlassian.design/components/logo/"

package/raw-icons/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/raw-icons.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/raw-icons.d.ts"
       ]

package/statuspage-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/statuspage-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/statuspage-icon.d.ts"
       ]

package/trello-icon/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/exports/trello-icon.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/exports/trello-icon.d.ts"
       ]