Create npm workspaces

.github/workflows/lint.yaml

@@ -14,7 +14,6 @@ jobs:
       - run: just npm-install
       - run: just check-format
 
-      - run: just vscode deps
       - run: just vscode lint
 
       - run: just web install

.github/workflows/vscode.yaml

@@ -18,6 +18,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18.x
+      - run: just npm-install
       - id: get-date
         run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
         shell: bash

extensions/vscode/.vscodeignore

@@ -1,3 +1,8 @@
+# Workaround for https://github.com/microsoft/vscode-vsce/issues/580
+../..
+
+.*
+.*/
 .vscode/**
 .vscode-test/**
 src/**

extensions/vscode/justfile

@@ -58,30 +58,11 @@ clean:
     rm -rf out
     just ./webviews/homeView/clean
 
-
-# Install dependencies
-deps:
-    #!/usr/bin/env bash
-    set -eou pipefail
-    {{ _with_debug }}
-
-    if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund | sed 's/^/debug: /'
-        npm --prefix ./webviews/homeView ci --no-audit --no-fund | sed 's/^/debug: /'
-    else
-        npm install --no-audit --no-fund | sed 's/^/debug: /'
-        npm --prefix ./webviews/homeView install --no-audit --no-fund | sed 's/^/debug: /'
-    fi
-    just ./webviews/homeView/deps
-
-
 configure os="$(just ../../os)" arch="$(just ../../arch)":
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}
 
-    just deps
-
     echo "info: checking for compatible binary executable..." 1>&2
     binary_executable=$(just ../../executable-path {{ os }} {{ arch }})
     if ! [ -f "$binary_executable" ]; then

extensions/vscode/package.json

@@ -550,6 +550,7 @@
   },
   "dependencies": {
     "@hypersphere/omnibus": "0.1.6",
+    "@publishing-client/api": "^1.0.0",
     "@vscode/codicons": "^0.0.35",
     "axios": "^1.6.0",
     "eventsource": "^2.0.2",

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

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;
 

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";

extensions/vscode/src/multiStepInputs/deployProject.ts

@@ -16,7 +16,7 @@ import {
   useApi,
   isConfigurationError,
   Configuration,
-} from "src/api";
+} from "@publishing-client/api";
 import { getSummaryStringFromError } from "src/utils/errors";
 import { deployProject } from "src/views/deployProgress";
 import { EventStream } from "src/events";

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,

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";

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 {

extensions/vscode/src/services.ts

@@ -2,8 +2,9 @@
 
 import { ExtensionContext, Disposable } from "vscode";
 
+import { initApi } from "@publishing-client/api";
+
 import { HOST } from "src";
-import { initApi } from "src/api";
 import { Server } from "src/servers";
 
 export class Service implements Disposable {

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

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 {

extensions/vscode/src/utils/names.ts

@@ -2,7 +2,7 @@
 
 import { InputBoxValidationSeverity } from "vscode";
 
-import { useApi } from "src/api";
+import { useApi } from "@publishing-client/api";
 import { isValidFilename } from "src/utils/files";
 
 export async function untitledConfigurationName(): Promise<string> {

extensions/vscode/src/views/configurations.ts

@@ -22,7 +22,7 @@ import {
   Configuration,
   ConfigurationError,
   isConfigurationError,
-} from "src/api";
+} from "@publishing-client/api";
 
 import { confirmDelete, confirmReplace } from "src/dialogs";
 import { getSummaryStringFromError } from "src/utils/errors";

extensions/vscode/src/views/credentials.ts

@@ -12,7 +12,7 @@ import {
   window,
 } from "vscode";
 
-import { Account, useApi } from "src/api";
+import { Account, useApi } from "@publishing-client/api";
 import { getSummaryStringFromError } from "src/utils/errors";
 
 const viewName = "posit.publisher.credentials";

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, EventStreamMessage } from "src/api";
+import { eventTypeToString, EventStreamMessage } from "@publishing-client/api";
 import { EventStream, UnregisterCallback } from "src/events";
 
 export function deployProject(localID: string, stream: EventStream) {

extensions/vscode/src/views/deployments.ts

@@ -25,7 +25,7 @@ import {
   isDeploymentError,
   isPreDeployment,
   useApi,
-} from "src/api";
+} from "@publishing-client/api";
 
 import { confirmForget } from "src/dialogs";
 import { EventStream } from "src/events";

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";
@@ -568,6 +568,7 @@ export class HomeViewProvider implements WebviewViewProvider {
         Uri.joinPath(this._extensionUri, "webviews", "homeView", "dist"),
         Uri.joinPath(
           this._extensionUri,
+          "../..",
           "node_modules",
           "@vscode",
           "codicons",
@@ -616,6 +617,7 @@ export class HomeViewProvider implements WebviewViewProvider {
     ]);
     // The codicon css (and related tff file) are needing to be loaded for icons
     const codiconsUri = getUri(webview, extensionUri, [
+      "../..",
       "node_modules",
       "@vscode",
       "codicons",

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,

extensions/vscode/webviews/homeView/justfile

@@ -17,16 +17,3 @@ clean:
     {{ _with_debug }}
 
     rm -rf node_modules
-
-
-# Install dependencies
-deps:
-    #!/usr/bin/env bash
-    set -eou pipefail
-    {{ _with_debug }}
-
-    if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund | sed 's/^/debug: /'
-    else
-        npm install --no-audit --no-fund | sed 's/^/debug: /'
-    fi

extensions/vscode/webviews/homeView/package.json

@@ -7,6 +7,7 @@
     "build": "vue-tsc --noEmit && vite build"
   },
   "dependencies": {
+    "@publishing-client/api": "^1.0.0",
     "axios": "^1.6.0",
     "eventsource": "^2.0.2",
     "get-port": "5.1.1",

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";

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";

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", () => {

justfile

@@ -178,9 +178,9 @@ npm-install:
     {{ _with_debug }}
 
     if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund
+        npm ci --no-audit --no-fund | sed 's/^/debug: /'
     else
-        npm install --no-audit --no-fund
+        npm install --no-audit --no-fund | sed 's/^/debug: /'
     fi
 
 # staticcheck, vet, and format check
@@ -215,7 +215,7 @@ name:
 
     basename {{ _cmd }}
 
-package:
+package: npm-install
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}