From 9aad0403319f454528c261dd8ae9e98d85fa877e Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Fri, 3 May 2024 16:32:43 -0700
Subject: [PATCH] Correct imports to api module

---
 extensions/vscode/src/bus.ts                              | 7 ++++++-
 extensions/vscode/src/events.ts                           | 2 +-
 extensions/vscode/src/extension.ts                        | 3 ++-
 extensions/vscode/src/multiStepInputs/initWorkspace.ts    | 6 +++++-
 extensions/vscode/src/multiStepInputs/newConfig.ts        | 6 +++++-
 extensions/vscode/src/multiStepInputs/newDeployment.ts    | 2 +-
 .../vscode/src/types/messages/hostToWebviewMessages.ts    | 2 +-
 extensions/vscode/src/utils/files.ts                      | 2 +-
 extensions/vscode/src/views/homeView.ts                   | 2 +-
 extensions/vscode/src/views/logs.ts                       | 2 +-
 .../webviews/homeView/src/components/EasyDeploy.vue       | 8 +++++---
 .../homeView/src/components/views/ProjectFiles.vue        | 2 +-
 extensions/vscode/webviews/homeView/src/stores/home.ts    | 2 +-
 packages/api/README.md                                    | 2 +-
 14 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/extensions/vscode/src/bus.ts b/extensions/vscode/src/bus.ts
index 53ffbd0af..6fb772d06 100644
--- a/extensions/vscode/src/bus.ts
+++ b/extensions/vscode/src/bus.ts
@@ -1,7 +1,12 @@
 // Copyright (C) 2024 by Posit Software, PBC.
 
 import { Omnibus, args } from "@hypersphere/omnibus";
-import { Account, Configuration, Deployment, PreDeployment } from "src/api";
+import {
+  Account,
+  Configuration,
+  Deployment,
+  PreDeployment,
+} from "@publishing-client/api";
 
 export const bus = Omnibus.builder()
   // activeDeploymentChanged: triggered if deployment name or value has changed
diff --git a/extensions/vscode/src/events.ts b/extensions/vscode/src/events.ts
index 0018107f3..d591bcf80 100644
--- a/extensions/vscode/src/events.ts
+++ b/extensions/vscode/src/events.ts
@@ -7,7 +7,7 @@ import { Disposable } from "vscode";
 import EventSource from "eventsource";
 import { Readable } from "stream";
 
-import { EventStreamMessage } from "src/api";
+import { EventStreamMessage } from "@publishing-client/api";
 
 export type EventStreamRegistration = (message: EventStreamMessage) => void;
 
diff --git a/extensions/vscode/src/extension.ts b/extensions/vscode/src/extension.ts
index f3ded673b..791f8eae7 100644
--- a/extensions/vscode/src/extension.ts
+++ b/extensions/vscode/src/extension.ts
@@ -11,8 +11,9 @@ import {
   workspace,
 } from "vscode";
 
+import { useApi } from "@publishing-client/api";
+
 import * as ports from "src/ports";
-import { useApi } from "src/api";
 import { Service } from "src/services";
 import { ProjectTreeDataProvider } from "src/views/project";
 import { DeploymentsTreeDataProvider } from "src/views/deployments";
diff --git a/extensions/vscode/src/multiStepInputs/initWorkspace.ts b/extensions/vscode/src/multiStepInputs/initWorkspace.ts
index dcc0a8b05..c026d8310 100644
--- a/extensions/vscode/src/multiStepInputs/initWorkspace.ts
+++ b/extensions/vscode/src/multiStepInputs/initWorkspace.ts
@@ -17,7 +17,11 @@ import {
   window,
 } from "vscode";
 
-import { AccountAuthType, useApi, ConfigurationDetails } from "src/api";
+import {
+  AccountAuthType,
+  useApi,
+  ConfigurationDetails,
+} from "@publishing-client/api";
 import { getSummaryStringFromError } from "src/utils/errors";
 import {
   untitledConfigurationName,
diff --git a/extensions/vscode/src/multiStepInputs/newConfig.ts b/extensions/vscode/src/multiStepInputs/newConfig.ts
index 9a7620d4b..f9d5a669a 100644
--- a/extensions/vscode/src/multiStepInputs/newConfig.ts
+++ b/extensions/vscode/src/multiStepInputs/newConfig.ts
@@ -17,7 +17,11 @@ import {
   window,
 } from "vscode";
 
-import { useApi, ConfigurationDetails, Configuration } from "src/api";
+import {
+  useApi,
+  ConfigurationDetails,
+  Configuration,
+} from "@publishing-client/api";
 import { getSummaryStringFromError } from "src/utils/errors";
 import { untitledConfigurationName } from "src/utils/names";
 import { isValidFilename } from "src/utils/files";
diff --git a/extensions/vscode/src/multiStepInputs/newDeployment.ts b/extensions/vscode/src/multiStepInputs/newDeployment.ts
index 55d7dc17d..25b1f5e67 100644
--- a/extensions/vscode/src/multiStepInputs/newDeployment.ts
+++ b/extensions/vscode/src/multiStepInputs/newDeployment.ts
@@ -7,7 +7,7 @@ import {
   PreDeployment,
   isConfigurationError,
   useApi,
-} from "src/api";
+} from "@publishing-client/api";
 import { EventStream } from "src/events";
 import { getSummaryStringFromError } from "src/utils/errors";
 import {
diff --git a/extensions/vscode/src/types/messages/hostToWebviewMessages.ts b/extensions/vscode/src/types/messages/hostToWebviewMessages.ts
index 66e47651c..4013e4c31 100644
--- a/extensions/vscode/src/types/messages/hostToWebviewMessages.ts
+++ b/extensions/vscode/src/types/messages/hostToWebviewMessages.ts
@@ -6,7 +6,7 @@ import {
   Deployment,
   DeploymentFile,
   PreDeployment,
-} from "../../api";
+} from "@publishing-client/api";
 
 export enum HostToWebviewMessageType {
   // Sent from host to webviewView
diff --git a/extensions/vscode/src/utils/files.ts b/extensions/vscode/src/utils/files.ts
index b43c28ddd..fdeb00360 100644
--- a/extensions/vscode/src/utils/files.ts
+++ b/extensions/vscode/src/utils/files.ts
@@ -9,7 +9,7 @@ import {
   commands,
 } from "vscode";
 
-import { DeploymentFile } from "../api";
+import { DeploymentFile } from "@publishing-client/api";
 
 export async function fileExists(fileUri: Uri): Promise<boolean> {
   try {
diff --git a/extensions/vscode/src/views/homeView.ts b/extensions/vscode/src/views/homeView.ts
index e7c8e0f86..89c4c1e1e 100644
--- a/extensions/vscode/src/views/homeView.ts
+++ b/extensions/vscode/src/views/homeView.ts
@@ -29,7 +29,7 @@ import {
   isConfigurationError,
   isDeploymentError,
   useApi,
-} from "src/api";
+} from "@publishing-client/api";
 import { useBus } from "src/bus";
 import { EventStream } from "src/events";
 import { getSummaryStringFromError } from "src/utils/errors";
diff --git a/extensions/vscode/src/views/logs.ts b/extensions/vscode/src/views/logs.ts
index 05d691fcf..e0d042e96 100644
--- a/extensions/vscode/src/views/logs.ts
+++ b/extensions/vscode/src/views/logs.ts
@@ -17,7 +17,7 @@ import {
 
 import { EventStream, displayEventStreamMessage } from "src/events";
 
-import { EventStreamMessage } from "src/api";
+import { EventStreamMessage } from "@publishing-client/api";
 
 enum LogStageStatus {
   notStarted,
diff --git a/extensions/vscode/webviews/homeView/src/components/EasyDeploy.vue b/extensions/vscode/webviews/homeView/src/components/EasyDeploy.vue
index 0a6afac98..b37e60be5 100644
--- a/extensions/vscode/webviews/homeView/src/components/EasyDeploy.vue
+++ b/extensions/vscode/webviews/homeView/src/components/EasyDeploy.vue
@@ -140,10 +140,12 @@
 <script setup lang="ts">
 import { computed } from "vue";
 
+import {
+  isPreDeployment,
+  Account,
+  Configuration,
+} from "@publishing-client/api";
 import { formatDateString } from "../../../../../../web/src/utils/date";
-import { isPreDeployment } from "../../../../src/api/types/deployments";
-import { Account } from "../../../../src/api/types/accounts";
-import { Configuration } from "../../../../src/api/types/configurations";
 import { WebviewToHostMessageType } from "../../../../src/types/messages/webviewToHostMessages";
 
 import { useHomeStore } from "src/stores/home";
diff --git a/extensions/vscode/webviews/homeView/src/components/views/ProjectFiles.vue b/extensions/vscode/webviews/homeView/src/components/views/ProjectFiles.vue
index c13bf5e3b..592440047 100644
--- a/extensions/vscode/webviews/homeView/src/components/views/ProjectFiles.vue
+++ b/extensions/vscode/webviews/homeView/src/components/views/ProjectFiles.vue
@@ -97,7 +97,7 @@ import {
   DeploymentFile,
   DeploymentState,
   FileMatchSource,
-} from "../../../../../src/api";
+} from "@publishing-client/api";
 import { WebviewToHostMessageType } from "../../../../../src/types/messages/webviewToHostMessages";
 
 import TreeItem from "src/components/TreeItem.vue";
diff --git a/extensions/vscode/webviews/homeView/src/stores/home.ts b/extensions/vscode/webviews/homeView/src/stores/home.ts
index 9be923f9c..a310dc200 100644
--- a/extensions/vscode/webviews/homeView/src/stores/home.ts
+++ b/extensions/vscode/webviews/homeView/src/stores/home.ts
@@ -8,7 +8,7 @@ import {
   Account,
   Configuration,
   DeploymentFile,
-} from "../../../../src/api";
+} from "@publishing-client/api";
 import { WebviewToHostMessageType } from "../../../../src/types/messages/webviewToHostMessages";
 
 export const useHomeStore = defineStore("home", () => {
diff --git a/packages/api/README.md b/packages/api/README.md
index 1bb46a6d0..30e9c8aea 100644
--- a/packages/api/README.md
+++ b/packages/api/README.md
@@ -6,7 +6,7 @@ response types.
 ## Usage
 
 ```typescript
-import { initApi, useApi } from "src/api";
+import { initApi, useApi } from "@publishing-client/api";
 
 // You must first initialize the API one time.
 // The initialization method requires a promise which indicates