diff --git a/package-lock.json b/package-lock.json index 63f6fe7c..d9aab94b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,12 +39,11 @@ "@atlassianlabs/guipi-core-components": "^0.1.2", "@atlassianlabs/guipi-core-controller": "^0.1.2", "@atlassianlabs/guipi-jira-components": "^0.1.2", - "@atlassianlabs/jira-metaui-client": "^1.0.11", - "@atlassianlabs/jira-metaui-transformer": "^1.0.11", - "@atlassianlabs/jira-pi-client": "^1.0.11", - "@atlassianlabs/jira-pi-common-models": "^1.0.11", - "@atlassianlabs/jira-pi-meta-models": "^1.0.11", - "@atlassianlabs/pi-client-common": "^1.0.11", + "@atlassianlabs/jira-metaui-client": "^1.1.0", + "@atlassianlabs/jira-metaui-transformer": "^1.1.0", + "@atlassianlabs/jira-pi-client": "^1.1.0", + "@atlassianlabs/jira-pi-meta-models": "^1.1.0", + "@atlassianlabs/pi-client-common": "^1.1.0", "@date-io/date-fns": "^3.0.0", "@devcontainers/cli": "^0.71.0", "@material-ui/core": "^4.9.14", @@ -217,6 +216,150 @@ "vscode": "^1.93.0" } }, + "../pi-clients/packages/jira-metaui-client": { + "name": "@atlassianlabs/jira-metaui-client", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-metaui-transformer": "file:../jira-metaui-transformer", + "@atlassianlabs/jira-pi-client": "file:../jira-pi-client", + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@babel/runtime": ">=7.10.0" + }, + "peerDependencies": { + "axios": "^1.6.0", + "form-data": "^2.5.1" + } + }, + "../pi-clients/packages/jira-metaui-client/dist": { + "name": "@atlassianlabs/jira-metaui-client", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-metaui-transformer": "file:../jira-metaui-transformer", + "@atlassianlabs/jira-pi-client": "file:../jira-pi-client", + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@babel/runtime": ">=7.10.0" + }, + "peerDependencies": { + "axios": "^1.6.0", + "form-data": "^2.5.1" + } + }, + "../pi-clients/packages/jira-metaui-transformer": { + "name": "@atlassianlabs/jira-metaui-transformer", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/jira-metaui-transformer/dist": { + "name": "@atlassianlabs/jira-metaui-transformer", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/jira-pi-client": { + "name": "@atlassianlabs/jira-pi-client", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@atlassianlabs/pi-client-common": "file:../pi-client-common", + "@babel/runtime": ">=7.10.0" + }, + "peerDependencies": { + "axios": "^1.6.0", + "form-data": "^2.5.1" + } + }, + "../pi-clients/packages/jira-pi-client/dist": { + "name": "@atlassianlabs/jira-pi-client", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@atlassianlabs/jira-pi-meta-models": "file:../jira-pi-meta-models", + "@atlassianlabs/pi-client-common": "file:../pi-client-common", + "@babel/runtime": ">=7.10.0" + }, + "peerDependencies": { + "axios": "^1.6.0", + "form-data": "^2.5.1" + } + }, + "../pi-clients/packages/jira-pi-common-models": { + "name": "@atlassianlabs/jira-pi-common-models", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/jira-pi-common-models/dist": { + "name": "@atlassianlabs/jira-pi-common-models", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/jira-pi-meta-models": { + "name": "@atlassianlabs/jira-pi-meta-models", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/jira-pi-meta-models/dist": { + "name": "@atlassianlabs/jira-pi-meta-models", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@atlassianlabs/jira-pi-common-models": "file:../jira-pi-common-models", + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/pi-client-common": { + "name": "@atlassianlabs/pi-client-common", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": ">=7.10.0" + } + }, + "../pi-clients/packages/pi-client-common/dist": { + "name": "@atlassianlabs/pi-client-common", + "version": "1.1.0", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": ">=7.10.0" + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -2225,65 +2368,65 @@ } }, "node_modules/@atlassianlabs/jira-metaui-client": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-metaui-client/-/jira-metaui-client-1.0.11.tgz", - "integrity": "sha512-YfuiD+JaQe7GU+6CUJLu+6j66BuQZzzT4lk3nEygObAudKAr/As05Fr6Zjpu12wiy/9fUwrF5eQrf0Xpa7cnRA==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-metaui-client/-/jira-metaui-client-1.1.0.tgz", + "integrity": "sha512-y+YON4xr5NRyY36pCSqxK041AYxY/czZM3KH2XJ2sJGWLN2dPaj3SzJjqbGu7hii/vxecqBjC60/bmI352y0Nw==", "license": "MIT", "dependencies": { - "@atlassianlabs/jira-metaui-transformer": "^1.0.11", - "@atlassianlabs/jira-pi-client": "^1.0.11", - "@atlassianlabs/jira-pi-common-models": "^1.0.11", - "@atlassianlabs/jira-pi-meta-models": "^1.0.11", + "@atlassianlabs/jira-metaui-transformer": "^1.1.0", + "@atlassianlabs/jira-pi-client": "^1.1.0", + "@atlassianlabs/jira-pi-common-models": "^1.1.0", + "@atlassianlabs/jira-pi-meta-models": "^1.1.0", "@babel/runtime": ">=7.10.0" }, "peerDependencies": { - "axios": "^1.6.0", + "axios": "^1.7.4", "form-data": "^2.5.1" } }, "node_modules/@atlassianlabs/jira-metaui-transformer": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-metaui-transformer/-/jira-metaui-transformer-1.0.11.tgz", - "integrity": "sha512-oewO0sxTTP1WFwbbGijWwgjmzneQIrzzbEd4RF04/UYNGoCH3fo2oyBa1fa9/RQIIjeH20wGYZeO7S8VcHUzkQ==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-metaui-transformer/-/jira-metaui-transformer-1.1.0.tgz", + "integrity": "sha512-26Pq7CzFDDkJT8TxoexiAa2VSKrj74guynmktmK25Za3A4RRrGsA+xsiD9qB2IK+1iE9ZItcZUeRSD/BWPhCMw==", "license": "MIT", "dependencies": { - "@atlassianlabs/jira-pi-common-models": "^1.0.11", - "@atlassianlabs/jira-pi-meta-models": "^1.0.11", + "@atlassianlabs/jira-pi-common-models": "^1.1.0", + "@atlassianlabs/jira-pi-meta-models": "^1.1.0", "@babel/runtime": ">=7.10.0" } }, "node_modules/@atlassianlabs/jira-pi-client": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-client/-/jira-pi-client-1.0.11.tgz", - "integrity": "sha512-Cj1dQTomlb0WOEKHsQ5P2Cl28H+J1+vX1JVtiQKtnb5lgJN/r2jZmO6cact7UmO4/PkB76VwW6+PMS6e6Cndag==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-client/-/jira-pi-client-1.1.0.tgz", + "integrity": "sha512-jL65sNUc8XWYYKYjsZKPY8OEr/XTC0kLgMln6YRzlWLoMkbm419naFOV26pALD2H1UDPDH628qjJgssLvyjFew==", "license": "MIT", "dependencies": { - "@atlassianlabs/jira-pi-common-models": "^1.0.11", - "@atlassianlabs/jira-pi-meta-models": "^1.0.11", - "@atlassianlabs/pi-client-common": "^1.0.11", + "@atlassianlabs/jira-pi-common-models": "^1.1.0", + "@atlassianlabs/jira-pi-meta-models": "^1.1.0", + "@atlassianlabs/pi-client-common": "^1.1.0", "@babel/runtime": ">=7.10.0" }, "peerDependencies": { - "axios": "^1.6.0", + "axios": "^1.7.4", "form-data": "^2.5.1" } }, "node_modules/@atlassianlabs/jira-pi-common-models": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-common-models/-/jira-pi-common-models-1.0.11.tgz", - "integrity": "sha512-tMofrn2b6kv5hpKPUx21RpACNt0TmOz4UaSRzkEcPrTUtED5hqi6dS3iO7CgwYrnxxilEoJXONKeWWl2CksnKA==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-common-models/-/jira-pi-common-models-1.1.0.tgz", + "integrity": "sha512-Qn6331lsMBbC2N3dzRTwgsuyatBCiVl/WaT99YvB37WG3U/LBfA78joJy0O5+4qEiQ6WM7DI8kXFp0IK1SfYcg==", "license": "MIT", "dependencies": { "@babel/runtime": ">=7.10.0" } }, "node_modules/@atlassianlabs/jira-pi-meta-models": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-meta-models/-/jira-pi-meta-models-1.0.11.tgz", - "integrity": "sha512-OOOUvO0+aM5IbnvOj6qj1mJAiqjPTBr2NKhkYCRJEGd+p+cixIR+0WUsFsa7kb2sus13j11vVn3PP7bpGUA3EQ==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/jira-pi-meta-models/-/jira-pi-meta-models-1.1.0.tgz", + "integrity": "sha512-CelzUYBOn7eUpEICjieBPC+jtgdGTuqQNI/+V8KmpJA1QNkDMaFkTeWzfh1bUumBjCT1njRQ7O89hd2Fo8OeWg==", "license": "MIT", "dependencies": { - "@atlassianlabs/jira-pi-common-models": "^1.0.11", + "@atlassianlabs/jira-pi-common-models": "^1.1.0", "@babel/runtime": ">=7.10.0" } }, @@ -2294,9 +2437,9 @@ "license": "BSD-3-Clause" }, "node_modules/@atlassianlabs/pi-client-common": { - "version": "1.0.11", - "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/pi-client-common/-/pi-client-common-1.0.11.tgz", - "integrity": "sha512-9PBYNHg3p3Z+0PNGHb/eStKhlB0/DO6PoyyiKgMSCFFy2IZJRiQ3TPz3sSR3Q7B2OT5pbnit0qNXhgmK++XCvg==", + "version": "1.1.0", + "resolved": "https://packages.atlassian.com/api/npm/npm-remote/@atlassianlabs/pi-client-common/-/pi-client-common-1.1.0.tgz", + "integrity": "sha512-5ScE03Gmz/oI5SSO7xl+W0Wx0CM48U5FGwjV9YqTB2tMiiFToFUiLJwFk80l1pRJH0j7Jpm/6bZd2OQjaMiRGA==", "license": "MIT", "dependencies": { "@babel/runtime": ">=7.10.0" diff --git a/package.json b/package.json index 7a83b3c2..ec20f335 100644 --- a/package.json +++ b/package.json @@ -72,12 +72,10 @@ "devcompile:react": "webpack --mode development --config webpack.react.dev.js", "devcompile:extension": "webpack --mode development --config webpack.extension.dev.js", "release:stable": "scripts/release.sh", - "watch": "concurrently -r \"npm:watch:*\"", "watch:extension": "WATCH=true webpack --mode development --config webpack.react.dev.js --progress --watch", "watch:react": "WATCH=true webpack --mode development --config webpack.extension.dev.js --progress --watch", "dev": "concurrently -r npm:watch:extension npm:watch:react", - "mui:atlascodeSettings:dark": "cross-env PAGETSX=\"config/ConfigPage.tsx\" VIEW=\"atlascodeSettingsV2\" THEME=\"dark\" webpack-dev-server --open --config webpack.mui.webview.js", "mui:atlascodeSettings:light": "cross-env PAGETSX=\"config/ConfigPage.tsx\" VIEW=\"atlascodeSettingsV2\" THEME=\"light\" webpack-dev-server --open --config webpack.mui.webview.js", "mui:atlascodeOnboarding:dark": "cross-env PAGETSX=\"onboarding/OnboardingPage.tsx\" VIEW=\"atlascodeOnboardingV2\" THEME=\"dark\" webpack-dev-server --open --config webpack.mui.webview.js", @@ -1401,12 +1399,12 @@ "@atlassianlabs/guipi-core-components": "^0.1.2", "@atlassianlabs/guipi-core-controller": "^0.1.2", "@atlassianlabs/guipi-jira-components": "^0.1.2", - "@atlassianlabs/jira-metaui-client": "^1.0.11", - "@atlassianlabs/jira-metaui-transformer": "^1.0.11", - "@atlassianlabs/jira-pi-client": "^1.0.11", - "@atlassianlabs/jira-pi-common-models": "^1.0.11", - "@atlassianlabs/jira-pi-meta-models": "^1.0.11", - "@atlassianlabs/pi-client-common": "^1.0.11", + "@atlassianlabs/jira-metaui-client": "^1.1.0", + "@atlassianlabs/jira-metaui-transformer": "^1.1.0", + "@atlassianlabs/jira-pi-client": "^1.1.0", + "@atlassianlabs/jira-pi-common-models": "^1.1.0", + "@atlassianlabs/jira-pi-meta-models": "^1.1.0", + "@atlassianlabs/pi-client-common": "^1.1.0", "@date-io/date-fns": "^3.0.0", "@devcontainers/cli": "^0.71.0", "@material-ui/core": "^4.9.14", diff --git a/src/ipc/issueActions.ts b/src/ipc/issueActions.ts index da532bd2..a8df0823 100644 --- a/src/ipc/issueActions.ts +++ b/src/ipc/issueActions.ts @@ -9,7 +9,7 @@ import { Transition, User, } from '@atlassianlabs/jira-pi-common-models'; -import { FieldValues, IssueLinkTypeSelectOption, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { FieldValues, IssueLinkTypeSelectOption, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import { DetailedSiteInfo } from '../atlclients/authInfo'; import { Branch } from '../typings/git'; import { Action } from './messaging'; diff --git a/src/ipc/issueMessaging.ts b/src/ipc/issueMessaging.ts index cf6ce5e7..d7066010 100644 --- a/src/ipc/issueMessaging.ts +++ b/src/ipc/issueMessaging.ts @@ -6,7 +6,7 @@ import { FieldValues, IssueTypeUI, SelectFieldOptions, -} from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +} from '@atlassianlabs/jira-pi-meta-models'; import { DetailedSiteInfo, emptySiteInfo } from '../atlclients/authInfo'; import { PullRequestData } from '../bitbucket/model'; import { HostErrorMessage, Message } from './messaging'; diff --git a/src/jira/fetchIssue.ts b/src/jira/fetchIssue.ts index 900848d6..2aad24de 100644 --- a/src/jira/fetchIssue.ts +++ b/src/jira/fetchIssue.ts @@ -1,6 +1,6 @@ import { createIssueUI, editIssueUI, EditIssueUI } from '@atlassianlabs/jira-metaui-client'; import { MinimalIssue, minimalIssueFromJsonObject, MinimalORIssueLink } from '@atlassianlabs/jira-pi-common-models'; -import { CreateMetaTransformerResult } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { CreateMetaTransformerResult } from '@atlassianlabs/jira-pi-meta-models'; import { DetailedSiteInfo } from '../atlclients/authInfo'; import { Container } from '../container'; diff --git a/src/jira/settingsManager.ts b/src/jira/settingsManager.ts index d0adf3ae..809de044 100644 --- a/src/jira/settingsManager.ts +++ b/src/jira/settingsManager.ts @@ -1,5 +1,5 @@ import { EpicFieldInfo, getEpicFieldInfo, IssueLinkType } from '@atlassianlabs/jira-pi-common-models'; -import { Fields, readField } from '@atlassianlabs/jira-pi-meta-models/jira-meta'; +import { Fields, readField } from '@atlassianlabs/jira-pi-meta-models'; import { Disposable } from 'vscode'; import { DetailedSiteInfo } from '../atlclients/authInfo'; import { Container } from '../container'; diff --git a/src/webviews/abstractIssueEditorWebview.ts b/src/webviews/abstractIssueEditorWebview.ts index 7d3a39b2..1825b274 100644 --- a/src/webviews/abstractIssueEditorWebview.ts +++ b/src/webviews/abstractIssueEditorWebview.ts @@ -7,7 +7,7 @@ import { IssuePickerIssue, IssuePickerResult, } from '@atlassianlabs/jira-pi-common-models'; -import { ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { ValueType } from '@atlassianlabs/jira-pi-meta-models'; import { showIssue } from '../commands/jira/showIssue'; import { Container } from '../container'; import { FetchQueryAction, isCreateSelectOption, isFetchQueryAndSite, isOpenJiraIssue } from '../ipc/issueActions'; diff --git a/src/webviews/components/issue/AbstractIssueEditorPage.tsx b/src/webviews/components/issue/AbstractIssueEditorPage.tsx index 66d4c692..d594b7c9 100644 --- a/src/webviews/components/issue/AbstractIssueEditorPage.tsx +++ b/src/webviews/components/issue/AbstractIssueEditorPage.tsx @@ -22,7 +22,7 @@ import { SelectFieldUI, UIType, ValueType, -} from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +} from '@atlassianlabs/jira-pi-meta-models'; import { formatDistanceToNow } from 'date-fns'; import debounce from 'lodash.debounce'; import * as React from 'react'; diff --git a/src/webviews/components/issue/AttachmentForm.tsx b/src/webviews/components/issue/AttachmentForm.tsx index 76d5ef79..c017fbeb 100644 --- a/src/webviews/components/issue/AttachmentForm.tsx +++ b/src/webviews/components/issue/AttachmentForm.tsx @@ -2,7 +2,7 @@ import FileIcon from '@atlaskit/icon/glyph/file'; import TrashIcon from '@atlaskit/icon/glyph/trash'; import UploadIcon from '@atlaskit/icon/glyph/upload'; import TableTree from '@atlaskit/table-tree'; -import { FieldUI } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { FieldUI } from '@atlassianlabs/jira-pi-meta-models'; import filesize from 'filesize'; import React, { useEffect, useReducer } from 'react'; import { FileWithPath, useDropzone } from 'react-dropzone'; diff --git a/src/webviews/components/issue/CreateIssuePage.tsx b/src/webviews/components/issue/CreateIssuePage.tsx index f43e4556..5eef7731 100644 --- a/src/webviews/components/issue/CreateIssuePage.tsx +++ b/src/webviews/components/issue/CreateIssuePage.tsx @@ -9,7 +9,7 @@ import { } from './AbstractIssueEditorPage'; import { CreateIssueData, emptyCreateIssueData, isIssueCreated } from '../../../ipc/issueMessaging'; import { DetailedSiteInfo, emptySiteInfo } from '../../../atlclients/authInfo'; -import { FieldUI, UIType, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { FieldUI, UIType, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import Form, { Field, FormFooter } from '@atlaskit/form'; import Page, { Grid, GridColumn } from '@atlaskit/page'; import Select, { components } from '@atlaskit/select'; diff --git a/src/webviews/components/issue/CreateIssueProblems.tsx b/src/webviews/components/issue/CreateIssueProblems.tsx index 34b0a5a3..ec9d4576 100644 --- a/src/webviews/components/issue/CreateIssueProblems.tsx +++ b/src/webviews/components/issue/CreateIssueProblems.tsx @@ -1,6 +1,6 @@ import Page, { Grid, GridColumn } from '@atlaskit/page'; import { emptyProject, Project } from '@atlassianlabs/jira-pi-common-models'; -import { CreateMetaTransformerProblems } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { CreateMetaTransformerProblems } from '@atlassianlabs/jira-pi-meta-models'; import * as React from 'react'; import { IssueProblemsData } from '../../../ipc/issueMessaging'; import { Action, HostErrorMessage } from '../../../ipc/messaging'; diff --git a/src/webviews/components/issue/InlineIssueLinkEditor.tsx b/src/webviews/components/issue/InlineIssueLinkEditor.tsx index 3772d663..eb4fdb1f 100644 --- a/src/webviews/components/issue/InlineIssueLinkEditor.tsx +++ b/src/webviews/components/issue/InlineIssueLinkEditor.tsx @@ -1,7 +1,7 @@ import Select, { AsyncSelect } from '@atlaskit/select'; import Spinner from '@atlaskit/spinner'; import { IssuePickerIssue } from '@atlassianlabs/jira-pi-common-models'; -import { IssueLinkTypeSelectOption, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { IssueLinkTypeSelectOption, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import * as React from 'react'; import * as SelectFieldHelper from '../selectFieldHelper'; diff --git a/src/webviews/components/issue/JiraIssuePage.tsx b/src/webviews/components/issue/JiraIssuePage.tsx index 904a9238..e5b90533 100644 --- a/src/webviews/components/issue/JiraIssuePage.tsx +++ b/src/webviews/components/issue/JiraIssuePage.tsx @@ -13,7 +13,7 @@ import Page, { Grid, GridColumn } from '@atlaskit/page'; import Tooltip from '@atlaskit/tooltip'; import WidthDetector from '@atlaskit/width-detector'; import { Comment as JiraComment, CommentVisibility, Transition } from '@atlassianlabs/jira-pi-common-models'; -import { FieldUI, InputFieldUI, UIType, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { FieldUI, InputFieldUI, UIType, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import { formatDistanceToNow, parseISO } from 'date-fns'; import * as React from 'react'; // NOTE: for now we have to use react-collapsible and NOT Panel because panel uses display:none diff --git a/src/webviews/components/issue/WatchesForm.tsx b/src/webviews/components/issue/WatchesForm.tsx index 3243748d..6d9f1ed7 100644 --- a/src/webviews/components/issue/WatchesForm.tsx +++ b/src/webviews/components/issue/WatchesForm.tsx @@ -4,7 +4,7 @@ import WatchIcon from '@atlaskit/icon/glyph/watch'; import WatchFilledIcon from '@atlaskit/icon/glyph/watch-filled'; import { AsyncSelect } from '@atlaskit/select'; import { User, Watches } from '@atlassianlabs/jira-pi-common-models'; -import { ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { ValueType } from '@atlassianlabs/jira-pi-meta-models'; import debounce from 'lodash.debounce'; import * as React from 'react'; import * as SelectFieldHelper from '../selectFieldHelper'; diff --git a/src/webviews/components/selectFieldHelper.tsx b/src/webviews/components/selectFieldHelper.tsx index 52f15df1..96ffb6a6 100644 --- a/src/webviews/components/selectFieldHelper.tsx +++ b/src/webviews/components/selectFieldHelper.tsx @@ -1,7 +1,7 @@ import Avatar from '@atlaskit/avatar'; import Lozenge from '@atlaskit/lozenge'; import { components } from '@atlaskit/select'; -import { SelectFieldUI, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { SelectFieldUI, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import * as React from 'react'; import { colorToLozengeAppearanceMap } from './colors'; diff --git a/src/webviews/createIssueWebview.ts b/src/webviews/createIssueWebview.ts index fb70a444..0af0692f 100644 --- a/src/webviews/createIssueWebview.ts +++ b/src/webviews/createIssueWebview.ts @@ -8,12 +8,7 @@ import { isScreensForSite, isSetIssueType, } from '../ipc/issueActions'; -import { - CreateMetaTransformerResult, - FieldValues, - IssueTypeUI, - ValueType, -} from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { CreateMetaTransformerResult, FieldValues, IssueTypeUI, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import { DetailedSiteInfo, Product, ProductJira, emptySiteInfo } from '../atlclients/authInfo'; import { IssueType, Project, emptyIssueType } from '@atlassianlabs/jira-pi-common-models'; import { Position, Uri, ViewColumn, commands } from 'vscode'; diff --git a/src/webviews/jiraIssueWebview.ts b/src/webviews/jiraIssueWebview.ts index 4074a299..71c63a44 100644 --- a/src/webviews/jiraIssueWebview.ts +++ b/src/webviews/jiraIssueWebview.ts @@ -10,7 +10,7 @@ import { readSearchResults, User, } from '@atlassianlabs/jira-pi-common-models'; -import { FieldValues, ValueType } from '@atlassianlabs/jira-pi-meta-models/ui-meta'; +import { FieldValues, ValueType } from '@atlassianlabs/jira-pi-meta-models'; import FormData from 'form-data'; import * as fs from 'fs'; import { commands, env } from 'vscode';