From 8e6e4cd51561e10076d4d93cb0c37205d22519de Mon Sep 17 00:00:00 2001 From: Josh Kay Date: Wed, 28 Feb 2024 11:45:23 +1300 Subject: [PATCH 01/14] removed the last page of the jenkoins workflow --- app/jenkins-for-jira-ui/src/App.tsx | 4 - .../ConnectionComplete.styles.tsx | 11 -- .../ConnectionComplete.test.tsx | 79 ------------- .../ConnectionComplete/ConnectionComplete.tsx | 107 ------------------ .../components/JenkinsSetup/JenkinsSetup.tsx | 23 +--- 5 files changed, 6 insertions(+), 218 deletions(-) delete mode 100644 app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.styles.tsx delete mode 100644 app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.test.tsx delete mode 100644 app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx diff --git a/app/jenkins-for-jira-ui/src/App.tsx b/app/jenkins-for-jira-ui/src/App.tsx index cc3e1567..18498822 100644 --- a/app/jenkins-for-jira-ui/src/App.tsx +++ b/app/jenkins-for-jira-ui/src/App.tsx @@ -19,7 +19,6 @@ import { fetchFeatureFlagFromBackend } from './api/fetchFeatureFlagFromBackend'; import { ServerManagement } from './components/ServerManagement/ServerManagement'; import { ServerNameForm } from './components/ServerNameForm/ServerNameForm'; import { JenkinsSetup } from './components/JenkinsSetup/JenkinsSetup'; -import { ConnectionComplete } from './components/ConnectionComplete/ConnectionComplete'; import { GlobalPage } from './components/GlobalPage/GlobalPage'; import { fetchModuleKey } from './api/fetchModuleKey'; import { ConnectionWizard } from './components/ConnectionWizard/ConnectionWizard'; @@ -150,9 +149,6 @@ const App: React.FC = () => { - - - diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.styles.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.styles.tsx deleted file mode 100644 index 4f9cc72a..00000000 --- a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.styles.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import { css } from '@emotion/css'; -import { token } from '@atlaskit/tokens'; - -export const connectionCompleteConfirmation = css` - font-size: 16px; - margin-bottom: ${token('space.300')}; -`; - -export const connectionCompleteContent = css` - margin-bottom: ${token('space.300')}; -`; diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.test.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.test.tsx deleted file mode 100644 index 67534b1a..00000000 --- a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.test.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import React from 'react'; -import { - render, screen, act -} from '@testing-library/react'; -import { useParams } from 'react-router'; -import { ConnectionComplete } from './ConnectionComplete'; -import * as getJenkinsServerWithSecretModule from '../../api/getJenkinsServerWithSecret'; -import * as fetchGlobalPageUrlModule from '../../api/fetchGlobalPageUrl'; - -jest.mock('../../api/getJenkinsServerWithSecret'); -jest.mock('../../api/fetchGlobalPageUrl'); - -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), - useParams: jest.fn(), - useHistory: jest.fn() -})); - -afterAll(() => { - jest.restoreAllMocks(); -}); - -describe('ConnectionComplete Component', () => { - beforeEach(() => { - jest.clearAllMocks(); - }); - - it('should only display loader and title during loading state', async () => { - const mockParams = { id: '12345678', admin: 'is-admin' }; - (useParams as jest.Mock).mockReturnValue(mockParams); - - render(); - - expect(screen.getByTestId('loading-spinner')).toBeInTheDocument(); - expect(screen.getByText('Connect Jenkins to Jira')).toBeInTheDocument(); - expect(screen.queryByText('Server name:')).toBeNull(); - }); - - it('should render server name and connection confirmation for Jenkins admin', async () => { - const mockParams = { id: '12345678', admin: 'is-admin' }; - (useParams as jest.Mock).mockReturnValue(mockParams); - - (getJenkinsServerWithSecretModule.getJenkinsServerWithSecret as jest.Mock).mockResolvedValueOnce({ - name: 'Mocked Server', - secret: 'mocked-secret' - }); - - await act(async () => { - render(); - }); - - expect(screen.getByText(/Server name:/i)).toBeInTheDocument(); - expect(screen.getByText(/Server name:/i)).toHaveTextContent('Mocked Server'); - expect(screen.getByText('Connection complete')).toBeInTheDocument(); - expect(screen.getByText('Your Jenkins server is now connected.')).toBeInTheDocument(); - expect(screen.queryByText('Your Jenkins admin will complete this connection and let you know when it’s ready.')).not.toBeInTheDocument(); - }); - - it('should render server name and connection confirmation for non Jenkins admin', async () => { - jest.spyOn(fetchGlobalPageUrlModule, 'fetchGlobalPageUrl').mockResolvedValueOnce('https://somesite.atlassian.net/blah'); - const mockParams = { id: '12345678', admin: 'requires-jenkins-admin' }; - (useParams as jest.Mock).mockReturnValue(mockParams); - - (getJenkinsServerWithSecretModule.getJenkinsServerWithSecret as jest.Mock).mockResolvedValueOnce({ - name: 'Mocked Server', - secret: 'mocked-secret' - }); - - await act(async () => { - render(); - }); - - expect(screen.getByText(/Server name:/i)).toBeInTheDocument(); - expect(screen.getByText(/Server name:/i)).toHaveTextContent('Mocked Server'); - expect(screen.getByText('Connection complete')).toBeInTheDocument(); - expect(screen.getByText('Your Jenkins admin will complete this connection and let you know when it’s ready.')).toBeInTheDocument(); - expect(screen.queryByText('Your Jenkins server is now connected.')).not.toBeInTheDocument(); - }); -}); diff --git a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx b/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx deleted file mode 100644 index c3bff257..00000000 --- a/app/jenkins-for-jira-ui/src/components/ConnectionComplete/ConnectionComplete.tsx +++ /dev/null @@ -1,107 +0,0 @@ -import React, { useCallback, useEffect, useState } from 'react'; -import { useHistory, useParams } from 'react-router'; -import { cx } from '@emotion/css'; -import Spinner from '@atlaskit/spinner'; -import Button from '@atlaskit/button/standard-button'; -import { router } from '@forge/bridge'; -import { connectionFlowContainer, connectionFlowInnerContainer } from '../../GlobalStyles.styles'; -import { ConnectionFlowHeader, ConnectionFlowServerNameSubHeader } from '../ConnectionWizard/ConnectionFlowHeader'; -import { getJenkinsServerWithSecret } from '../../api/getJenkinsServerWithSecret'; -import { loadingContainer } from '../JenkinsSetup/JenkinsSetup.styles'; -import { serverNameFormOuterContainer } from '../ServerNameForm/ServerNameForm.styles'; -import { connectionCompleteConfirmation, connectionCompleteContent } from './ConnectionComplete.styles'; -import { AnalyticsEventTypes, AnalyticsScreenEventsEnum } from '../../common/analytics/analytics-events'; -import { AnalyticsClient } from '../../common/analytics/analytics-client'; -import { fetchGlobalPageUrl } from '../../api/fetchGlobalPageUrl'; -import { ParamTypes } from '../../common/types'; - -const analyticsClient = new AnalyticsClient(); - -const ConnectionComplete = () => { - const history = useHistory(); - const { path } = useParams(); - const { admin: isJenkinsAdmin, id: uuid } = useParams(); - const [serverName, setServerName] = useState(''); - const [globalPageUrl, setGlobalPageUrl] = useState(''); - - const getServer = useCallback(async () => { - try { - const { name } = await getJenkinsServerWithSecret(uuid); - setServerName(name); - } catch (e) { - console.error('No Jenkins server found.'); - } - }, [uuid]); - - useEffect(() => { - analyticsClient.sendAnalytics( - AnalyticsEventTypes.ScreenEvent, - AnalyticsScreenEventsEnum.ConnectionCompleteScreenName - ); - - const fetchData = async () => { - try { - const url = await fetchGlobalPageUrl(); - setGlobalPageUrl(url); - await getServer(); - } catch (error) { - console.error('Error fetching data:', error); - } - }; - - fetchData(); - }, [uuid, getServer, isJenkinsAdmin]); - - const handleNavigateToConnectionServerManagementScreen = (e: React.MouseEvent) => { - e.preventDefault(); - console.log('path', path); - - if (path === 'global') { - router.navigate(globalPageUrl); - } - - history.push('/'); - }; - - return ( -
- - - {!serverName ? ( -
- -
- ) : ( - <> - -
-
-

Connection complete

- - {isJenkinsAdmin === 'is-admin' - ?

Your Jenkins server is now connected.

- :

- Your Jenkins admin will complete this connection and - let you know when it’s ready. -

- } - -

- To use this connection, choose what data this server sends to Jira in server management. -

- - -
-
- - )} -
- ); -}; - -export { ConnectionComplete }; diff --git a/app/jenkins-for-jira-ui/src/components/JenkinsSetup/JenkinsSetup.tsx b/app/jenkins-for-jira-ui/src/components/JenkinsSetup/JenkinsSetup.tsx index 80a61d42..ad69c186 100644 --- a/app/jenkins-for-jira-ui/src/components/JenkinsSetup/JenkinsSetup.tsx +++ b/app/jenkins-for-jira-ui/src/components/JenkinsSetup/JenkinsSetup.tsx @@ -320,26 +320,15 @@ const JenkinsSetup = (): JSX.Element => { ); }; - const handleNavigateToConnectionCompleteScreen = (e: React.MouseEvent) => { + const handleNavigateToConnectionServerManagementScreen = (e: React.MouseEvent) => { e.preventDefault(); + console.log('path', path); - let pathParam = ''; - - if (showMyJenkinsAdmin) { - pathParam = 'requires-jenkins-admin'; - } else { - pathParam = 'is-admin'; + if (path === 'global') { + router.navigate(globalPageUrl); } - if (connectionSettings) { - if (path === 'admin') { - history.push('/'); - } else { - router.navigate(globalPageUrl); - } - } else { - history.push(`/connection-complete/${uuid}/${pathParam}/${path}`); - } + history.push('/'); }; const isFetchingData = !serverName || !webhookUrl || !secret; @@ -403,7 +392,7 @@ const JenkinsSetup = (): JSX.Element => { + analyticsScreenEventNameEnum={AnalyticsScreenEventsEnum.ServerManagementScreenName}/> ); diff --git a/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.tsx b/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.tsx index 33281707..747390d8 100644 --- a/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.tsx +++ b/app/jenkins-for-jira-ui/src/components/SharePage/SharePage.tsx @@ -14,7 +14,6 @@ import { JenkinsModal } from '../JenkinsServerList/ConnectedServer/JenkinsModal' import { shareModalInstruction } from '../ServerManagement/ServerManagement.styles'; import { fetchGlobalPageUrl } from '../../api/fetchGlobalPageUrl'; -import { CONFIG_PAGE } from '../../common/constants'; const analyticsClient = new AnalyticsClient(); @@ -28,13 +27,7 @@ export const getSiteNameFromUrl = (url: string): string => { } }; -const getSharePageMessage = (globalPageUrl: string, moduleKey?: string): string => { - const versionRequirementMessage = moduleKey === CONFIG_PAGE - ? ` -Not a member of this Jira site? You can follow the instructions here instead: - -https://support.atlassian.com/jira-cloud-administration/docs/how-jenkins-for-jira-works/` : ''; - +const getSharePageMessage = (globalPageUrl: string): string => { return `Hi there, Jenkins for Jira is now installed and connected on ${getSiteNameFromUrl(globalPageUrl)}. @@ -44,19 +37,20 @@ To set up what build and deployment events Jenkins send to Jira, follow the set ${globalPageUrl} You'll need to follow the set up guide for each connected server. -${versionRequirementMessage}`; + +Not a member of this Jira site? You can follow the instructions here instead: + +https://support.atlassian.com/jira-cloud-administration/docs/how-jenkins-for-jira-works/`; }; type SharePageProps = { analyticsScreenEventNameEnum: AnalyticsScreenEventsEnum; buttonAppearance?: string; - moduleKey?: string; }; export const SharePage = ({ analyticsScreenEventNameEnum, - buttonAppearance, - moduleKey + buttonAppearance }:SharePageProps): JSX.Element => { const textAreaRef = useRef(null); const [isCopiedToClipboard, setIsCopiedToClipboard] = useState(false); @@ -77,8 +71,8 @@ export const SharePage = ({ }; await fetchData(); - setSharePageMessage(getSharePageMessage(globalPageUrl, moduleKey)); - }, [globalPageUrl, moduleKey]); + setSharePageMessage(getSharePageMessage(globalPageUrl)); + }, [globalPageUrl]); useEffect(() => { constructSharePageMessage(); From 5e46bea78bb81e117881d18572a8d022052d348d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 05:06:34 +0000 Subject: [PATCH 14/14] Update dependency @atlaskit/progress-tracker to v8.5.7 --- app/jenkins-for-jira-ui/package-lock.json | 92 +++++++++++++++++++++-- app/jenkins-for-jira-ui/package.json | 2 +- app/jenkins-for-jira-ui/yarn.lock | 65 +++++++++++++--- 3 files changed, 141 insertions(+), 18 deletions(-) diff --git a/app/jenkins-for-jira-ui/package-lock.json b/app/jenkins-for-jira-ui/package-lock.json index 244e7a45..9be54253 100644 --- a/app/jenkins-for-jira-ui/package-lock.json +++ b/app/jenkins-for-jira-ui/package-lock.json @@ -21,7 +21,7 @@ "@atlaskit/logo": "13.14.8", "@atlaskit/modal-dialog": "12.6.10", "@atlaskit/page-header": "10.4.4", - "@atlaskit/progress-tracker": "8.5.2", + "@atlaskit/progress-tracker": "8.5.7", "@atlaskit/spinner": "15.5.3", "@atlaskit/tabs": "^13.4.9", "@atlaskit/textarea": "^5.0.0", @@ -1176,14 +1176,14 @@ } }, "node_modules/@atlaskit/progress-tracker": { - "version": "8.5.2", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/progress-tracker/-/progress-tracker-8.5.2.tgz", - "integrity": "sha512-/z4vYfIuSMsINTG3dQgHYP2xY90utEeHvUEKuBNMRQTNRvc8DAtnyDMV04uhU5oj64DXrVvLbhDHQYuzThxUjQ==", - "license": "Apache-2.0", + "version": "8.5.7", + "resolved": "https://registry.npmjs.org/@atlaskit/progress-tracker/-/progress-tracker-8.5.7.tgz", + "integrity": "sha512-pYRw5pxyurHQu1ujhXpimIqWJmJ0MQ6t+0Gq+6n1vxnYbS2PKQhnruW+l7D+Pk/u1Y7uefnhYngVjpGYw1UDrQ==", "dependencies": { - "@atlaskit/ds-explorations": "^2.1.0", - "@atlaskit/theme": "^12.5.0", - "@atlaskit/tokens": "^1.4.0", + "@atlaskit/ds-explorations": "^3.2.0", + "@atlaskit/primitives": "^3.0.0", + "@atlaskit/theme": "^12.6.0", + "@atlaskit/tokens": "^1.38.0", "@babel/runtime": "^7.0.0", "@emotion/react": "^11.7.1", "react-transition-group": "^4.4.1" @@ -1192,6 +1192,82 @@ "react": "^16.8.0" } }, + "node_modules/@atlaskit/progress-tracker/node_modules/@atlaskit/analytics-next": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-9.2.0.tgz", + "integrity": "sha512-hvJUNlPDY+xN7JwU75wDqYmxlZsCt9f1clziAtdWXdOupuQx2tqbYv4bTjLMzgmF0WfT6lKQZaiuUnqKkrUAIg==", + "dependencies": { + "@atlaskit/analytics-next-stable-react-context": "1.0.1", + "@atlaskit/platform-feature-flags": "^0.2.2", + "@babel/runtime": "^7.0.0", + "prop-types": "^15.5.10", + "use-memo-one": "^1.1.1" + }, + "peerDependencies": { + "react": "^16.8.0" + } + }, + "node_modules/@atlaskit/progress-tracker/node_modules/@atlaskit/app-provider": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@atlaskit/app-provider/-/app-provider-1.0.0.tgz", + "integrity": "sha512-E66w1xufC6JljFPuZMe//7jRWnWqbY/4KXXDrVLXYdR2/yXQC19PHDUVtn7XsLKnOzUd16cABNdOAk/6qYYmDw==", + "dependencies": { + "@atlaskit/tokens": "^1.35.0", + "@babel/runtime": "^7.0.0", + "bind-event-listener": "^2.1.1" + }, + "peerDependencies": { + "react": "^16.8.0" + } + }, + "node_modules/@atlaskit/progress-tracker/node_modules/@atlaskit/ds-explorations": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@atlaskit/ds-explorations/-/ds-explorations-3.2.3.tgz", + "integrity": "sha512-eafVFI5x/1WEMCzdKrCOO0Ez64y7now7aqnyEGd5t48VmQtgiyi6y0mCFvov/jKeuREfQm0OkFZYppzRHZkBiQ==", + "dependencies": { + "@atlaskit/tokens": "^1.38.0", + "@babel/runtime": "^7.0.0", + "@emotion/react": "^11.7.1", + "tiny-invariant": "^1.2.0" + }, + "peerDependencies": { + "react": "^16.8.0" + } + }, + "node_modules/@atlaskit/progress-tracker/node_modules/@atlaskit/primitives": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@atlaskit/primitives/-/primitives-3.1.0.tgz", + "integrity": "sha512-De09LVe4kGArFEQD5v3P2aaS39WH8pREE7H7VS+zwjUJBqNV+eHh3s/bCrGwbxW3JIX35gyh0xkZ0SNrwsgKvg==", + "dependencies": { + "@atlaskit/analytics-next": "^9.2.0", + "@atlaskit/app-provider": "^1.0.0", + "@atlaskit/ds-lib": "^2.2.0", + "@atlaskit/interaction-context": "^2.1.0", + "@atlaskit/tokens": "^1.38.0", + "@babel/runtime": "^7.0.0", + "@emotion/react": "^11.7.1", + "@emotion/serialize": "^1.1.0", + "bind-event-listener": "^2.1.1", + "tiny-invariant": "^1.2.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/@atlaskit/progress-tracker/node_modules/@atlaskit/theme": { + "version": "12.6.4", + "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-12.6.4.tgz", + "integrity": "sha512-ellfZGqUiUMvCu+PnHCO20x7cqFG5fiL6h+eweHtXv/QbZlRsbD+IKJFxCnQuy4wP9BRMeNypr6QBMxYGzFVUg==", + "dependencies": { + "@atlaskit/codemod-utils": "^4.2.0", + "@atlaskit/ds-lib": "^2.2.0", + "@atlaskit/tokens": "^1.37.0", + "@babel/runtime": "^7.0.0" + }, + "peerDependencies": { + "react": "^16.8.0" + } + }, "node_modules/@atlaskit/spinner": { "version": "15.5.3", "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/spinner/-/spinner-15.5.3.tgz", diff --git a/app/jenkins-for-jira-ui/package.json b/app/jenkins-for-jira-ui/package.json index 73e61490..ae0846f8 100644 --- a/app/jenkins-for-jira-ui/package.json +++ b/app/jenkins-for-jira-ui/package.json @@ -20,7 +20,7 @@ "@atlaskit/logo": "13.14.8", "@atlaskit/modal-dialog": "12.6.10", "@atlaskit/page-header": "10.4.4", - "@atlaskit/progress-tracker": "8.5.2", + "@atlaskit/progress-tracker": "8.5.7", "@atlaskit/spinner": "15.5.3", "@atlaskit/tabs": "^13.4.9", "@atlaskit/textarea": "^5.0.0", diff --git a/app/jenkins-for-jira-ui/yarn.lock b/app/jenkins-for-jira-ui/yarn.lock index 0d96cffa..5a2171e6 100644 --- a/app/jenkins-for-jira-ui/yarn.lock +++ b/app/jenkins-for-jira-ui/yarn.lock @@ -165,6 +165,17 @@ prop-types "^15.5.10" use-memo-one "^1.1.1" +"@atlaskit/analytics-next@^9.2.0": + version "9.2.0" + resolved "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-9.2.0.tgz" + integrity sha512-hvJUNlPDY+xN7JwU75wDqYmxlZsCt9f1clziAtdWXdOupuQx2tqbYv4bTjLMzgmF0WfT6lKQZaiuUnqKkrUAIg== + dependencies: + "@atlaskit/analytics-next-stable-react-context" "1.0.1" + "@atlaskit/platform-feature-flags" "^0.2.2" + "@babel/runtime" "^7.0.0" + prop-types "^15.5.10" + use-memo-one "^1.1.1" + "@atlaskit/app-provider@^0.4.0": version "0.4.0" resolved "https://registry.npmjs.org/@atlaskit/app-provider/-/app-provider-0.4.0.tgz" @@ -174,6 +185,15 @@ "@babel/runtime" "^7.0.0" bind-event-listener "^2.1.1" +"@atlaskit/app-provider@^1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/@atlaskit/app-provider/-/app-provider-1.0.0.tgz" + integrity sha512-E66w1xufC6JljFPuZMe//7jRWnWqbY/4KXXDrVLXYdR2/yXQC19PHDUVtn7XsLKnOzUd16cABNdOAk/6qYYmDw== + dependencies: + "@atlaskit/tokens" "^1.35.0" + "@babel/runtime" "^7.0.0" + bind-event-listener "^2.1.1" + "@atlaskit/avatar@20.5.10": version "20.5.10" resolved "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/avatar/-/avatar-20.5.10.tgz" @@ -305,7 +325,7 @@ "@emotion/react" "^11.7.1" bind-event-listener "^2.1.1" -"@atlaskit/ds-explorations@^2.1.0", "@atlaskit/ds-explorations@^2.2.0": +"@atlaskit/ds-explorations@^2.2.0": version "2.2.8" resolved "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/ds-explorations/-/ds-explorations-2.2.8.tgz" integrity sha512-KF9NpkapyPvVv2DA70ures668Iy9ID3ByOTXbZrW+BOfdsCRa1PCQI0R/l9HZjfoz/kFNC9pQsk+A1btkRj1JQ== @@ -325,6 +345,16 @@ "@emotion/react" "^11.7.1" tiny-invariant "^1.2.0" +"@atlaskit/ds-explorations@^3.2.0": + version "3.2.3" + resolved "https://registry.npmjs.org/@atlaskit/ds-explorations/-/ds-explorations-3.2.3.tgz" + integrity sha512-eafVFI5x/1WEMCzdKrCOO0Ez64y7now7aqnyEGd5t48VmQtgiyi6y0mCFvov/jKeuREfQm0OkFZYppzRHZkBiQ== + dependencies: + "@atlaskit/tokens" "^1.38.0" + "@babel/runtime" "^7.0.0" + "@emotion/react" "^11.7.1" + tiny-invariant "^1.2.0" + "@atlaskit/ds-lib@^2.1.0", "@atlaskit/ds-lib@^2.2.0": version "2.2.3" resolved "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/ds-lib/-/ds-lib-2.2.3.tgz" @@ -568,14 +598,31 @@ bind-event-listener "^2.1.1" tiny-invariant "^1.2.0" -"@atlaskit/progress-tracker@8.5.2": - version "8.5.2" - resolved "https://packages.atlassian.com/api/npm/npm-remote/@atlaskit/progress-tracker/-/progress-tracker-8.5.2.tgz" - integrity sha512-/z4vYfIuSMsINTG3dQgHYP2xY90utEeHvUEKuBNMRQTNRvc8DAtnyDMV04uhU5oj64DXrVvLbhDHQYuzThxUjQ== +"@atlaskit/primitives@^3.0.0": + version "3.1.0" + resolved "https://registry.npmjs.org/@atlaskit/primitives/-/primitives-3.1.0.tgz" + integrity sha512-De09LVe4kGArFEQD5v3P2aaS39WH8pREE7H7VS+zwjUJBqNV+eHh3s/bCrGwbxW3JIX35gyh0xkZ0SNrwsgKvg== dependencies: - "@atlaskit/ds-explorations" "^2.1.0" - "@atlaskit/theme" "^12.5.0" - "@atlaskit/tokens" "^1.4.0" + "@atlaskit/analytics-next" "^9.2.0" + "@atlaskit/app-provider" "^1.0.0" + "@atlaskit/ds-lib" "^2.2.0" + "@atlaskit/interaction-context" "^2.1.0" + "@atlaskit/tokens" "^1.38.0" + "@babel/runtime" "^7.0.0" + "@emotion/react" "^11.7.1" + "@emotion/serialize" "^1.1.0" + bind-event-listener "^2.1.1" + tiny-invariant "^1.2.0" + +"@atlaskit/progress-tracker@8.5.7": + version "8.5.7" + resolved "https://registry.npmjs.org/@atlaskit/progress-tracker/-/progress-tracker-8.5.7.tgz" + integrity sha512-pYRw5pxyurHQu1ujhXpimIqWJmJ0MQ6t+0Gq+6n1vxnYbS2PKQhnruW+l7D+Pk/u1Y7uefnhYngVjpGYw1UDrQ== + dependencies: + "@atlaskit/ds-explorations" "^3.2.0" + "@atlaskit/primitives" "^3.0.0" + "@atlaskit/theme" "^12.6.0" + "@atlaskit/tokens" "^1.38.0" "@babel/runtime" "^7.0.0" "@emotion/react" "^11.7.1" react-transition-group "^4.4.1" @@ -681,7 +728,7 @@ "@babel/traverse" "^7.15.0" "@babel/types" "^7.15.0" -"@atlaskit/tokens@^1.11.0", "@atlaskit/tokens@^1.13.0", "@atlaskit/tokens@^1.14.0", "@atlaskit/tokens@^1.18.0", "@atlaskit/tokens@^1.21.0", "@atlaskit/tokens@^1.25.0", "@atlaskit/tokens@^1.26.0", "@atlaskit/tokens@^1.28.0", "@atlaskit/tokens@^1.28.1", "@atlaskit/tokens@^1.29.0", "@atlaskit/tokens@^1.33.0", "@atlaskit/tokens@^1.35.0", "@atlaskit/tokens@^1.38.0", "@atlaskit/tokens@^1.4.0", "@atlaskit/tokens@^1.5.0": +"@atlaskit/tokens@^1.11.0", "@atlaskit/tokens@^1.13.0", "@atlaskit/tokens@^1.14.0", "@atlaskit/tokens@^1.18.0", "@atlaskit/tokens@^1.21.0", "@atlaskit/tokens@^1.25.0", "@atlaskit/tokens@^1.26.0", "@atlaskit/tokens@^1.28.0", "@atlaskit/tokens@^1.28.1", "@atlaskit/tokens@^1.29.0", "@atlaskit/tokens@^1.33.0", "@atlaskit/tokens@^1.35.0", "@atlaskit/tokens@^1.38.0", "@atlaskit/tokens@^1.5.0": version "1.38.0" resolved "https://registry.npmjs.org/@atlaskit/tokens/-/tokens-1.38.0.tgz" integrity sha512-XMpvGxnZZTkjSWFJT+pLXsMYbTMNJUzS9WF5Ga06Rv+LybxRCoPGaI4EGJHdOYrnGqZR0ub7BBQXATkx1dupiA==