From b7a25ef7c3dc3c6154b91398c00f39588daefe50 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Wed, 27 Mar 2024 16:36:18 -0700
Subject: [PATCH] Correct api imports in extensions/vscode

---
 extensions/vscode/src/multiStepInputs/addDeployment.ts | 6 +++++-
 extensions/vscode/src/multiStepInputs/deployProject.ts | 2 +-
 extensions/vscode/src/services.ts                      | 2 +-
 extensions/vscode/src/utils/names.ts                   | 2 +-
 extensions/vscode/src/views/configurations.ts          | 5 ++---
 extensions/vscode/src/views/credentials.ts             | 2 +-
 extensions/vscode/src/views/deployProgress.ts          | 2 +-
 extensions/vscode/src/views/deployments.ts             | 2 +-
 extensions/vscode/src/views/files.ts                   | 3 +--
 extensions/vscode/src/views/requirements.ts            | 2 +-
 10 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/extensions/vscode/src/multiStepInputs/addDeployment.ts b/extensions/vscode/src/multiStepInputs/addDeployment.ts
index 5b142f9c57..5bf7382ffc 100644
--- a/extensions/vscode/src/multiStepInputs/addDeployment.ts
+++ b/extensions/vscode/src/multiStepInputs/addDeployment.ts
@@ -13,7 +13,11 @@ import {
   window,
 } from "vscode";
 
-import { AccountAuthType, useApi, isConfigurationError } from "../api";
+import {
+  AccountAuthType,
+  useApi,
+  isConfigurationError,
+} from "@publishing-client/api";
 import { getSummaryStringFromError } from "../utils/errors";
 import { uniqueDeploymentName, untitledDeploymentName } from "../utils/names";
 import { deployProject } from "../views/deployProgress";
diff --git a/extensions/vscode/src/multiStepInputs/deployProject.ts b/extensions/vscode/src/multiStepInputs/deployProject.ts
index 3b42f3d2f4..8f1fdd2006 100644
--- a/extensions/vscode/src/multiStepInputs/deployProject.ts
+++ b/extensions/vscode/src/multiStepInputs/deployProject.ts
@@ -14,7 +14,7 @@ import {
   Deployment,
   useApi,
   isConfigurationError,
-} from "../api";
+} from "@publishing-client/api";
 import { getSummaryStringFromError } from "../utils/errors";
 import { deployProject } from "../views/deployProgress";
 import { EventStream } from "../events";
diff --git a/extensions/vscode/src/services.ts b/extensions/vscode/src/services.ts
index d2212c9be3..2eb954b6e5 100644
--- a/extensions/vscode/src/services.ts
+++ b/extensions/vscode/src/services.ts
@@ -5,7 +5,7 @@ import * as vscode from "vscode";
 import { HOST } from ".";
 import { Panel } from "./panels";
 import { Server } from "./servers";
-import { useApi } from "./api";
+import { useApi } from "@publishing-client/api";
 
 export class Service implements vscode.Disposable {
   private context: vscode.ExtensionContext;
diff --git a/extensions/vscode/src/utils/names.ts b/extensions/vscode/src/utils/names.ts
index 0a726e9c08..85bf99ca7b 100644
--- a/extensions/vscode/src/utils/names.ts
+++ b/extensions/vscode/src/utils/names.ts
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 by Posit Software, PBC.
 
-import api from "../api";
+import api from "@publishing-client/api";
 
 export async function untitledConfigurationName(): Promise<string> {
   const existingConfigurations = (await api.configurations.getAll()).data;
diff --git a/extensions/vscode/src/views/configurations.ts b/extensions/vscode/src/views/configurations.ts
index f4f5486b3b..e72ed2668e 100644
--- a/extensions/vscode/src/views/configurations.ts
+++ b/extensions/vscode/src/views/configurations.ts
@@ -17,13 +17,12 @@ import {
   workspace,
 } from "vscode";
 
-import api from "../api";
-import {
+import api, {
   Configuration,
   ConfigurationDetails,
   ConfigurationError,
   isConfigurationError,
-} from "../api/types/configurations";
+} from "@publishing-client/api";
 
 import { confirmDelete, confirmReplace } from "../dialogs";
 import { getSummaryStringFromError } from "../utils/errors";
diff --git a/extensions/vscode/src/views/credentials.ts b/extensions/vscode/src/views/credentials.ts
index 24e49eb910..6932a421e6 100644
--- a/extensions/vscode/src/views/credentials.ts
+++ b/extensions/vscode/src/views/credentials.ts
@@ -11,7 +11,7 @@ import {
   window,
 } from "vscode";
 
-import api, { Account } from "../api";
+import api, { Account } from "@publishing-client/api";
 import { getSummaryStringFromError } from "../utils/errors";
 
 const viewName = "posit.publisher.credentials";
diff --git a/extensions/vscode/src/views/deployProgress.ts b/extensions/vscode/src/views/deployProgress.ts
index efb5b85ec5..0caf63d718 100644
--- a/extensions/vscode/src/views/deployProgress.ts
+++ b/extensions/vscode/src/views/deployProgress.ts
@@ -1,7 +1,7 @@
 // Copyright (C) 2024 by Posit Software, PBC.
 
 import { ProgressLocation, Uri, env, window } from "vscode";
-import { eventTypeToString } from "../api";
+import { eventTypeToString } from "@publishing-client/api";
 import { EventStream, EventStreamMessage, UnregisterCallback } from "../events";
 
 export function deployProject(localID: string, stream: EventStream) {
diff --git a/extensions/vscode/src/views/deployments.ts b/extensions/vscode/src/views/deployments.ts
index 7c6f12adb0..a7c3e42b08 100644
--- a/extensions/vscode/src/views/deployments.ts
+++ b/extensions/vscode/src/views/deployments.ts
@@ -25,7 +25,7 @@ import {
   isDeploymentError,
   isPreDeployment,
   useApi,
-} from "../api";
+} from "@publishing-client/api";
 
 import { confirmForget } from "../dialogs";
 import { EventStream } from "../events";
diff --git a/extensions/vscode/src/views/files.ts b/extensions/vscode/src/views/files.ts
index b3675cd5ce..effc9363a5 100644
--- a/extensions/vscode/src/views/files.ts
+++ b/extensions/vscode/src/views/files.ts
@@ -1,7 +1,6 @@
 // Copyright (C) 2024 by Posit Software, PBC.
 
-import { DeploymentFile, ExclusionMatch } from "../api/types/files";
-import { useApi } from "../api";
+import { useApi, DeploymentFile, ExclusionMatch } from "@publishing-client/api";
 import {
   TreeDataProvider,
   TreeItem,
diff --git a/extensions/vscode/src/views/requirements.ts b/extensions/vscode/src/views/requirements.ts
index 75726fd2aa..a5a4b858ef 100644
--- a/extensions/vscode/src/views/requirements.ts
+++ b/extensions/vscode/src/views/requirements.ts
@@ -17,7 +17,7 @@ import {
 } from "vscode";
 
 import { isAxiosError } from "axios";
-import api from "../api";
+import api from "@publishing-client/api";
 import { confirmOverwrite } from "../dialogs";
 import { getSummaryStringFromError } from "../utils/errors";
 import { fileExists } from "../utils/files";