@shopify/oxygen-cli 1.7.0 → 1.8.2

package/dist/deploy/health-check.js

@@ -8,6 +8,7 @@ async function healthCheck(options) {
   outputInfo("Performing health check on the deployment...", logger);
   let attempts = 0;
   let delay = 0;
+  let calledHealthCheckError = false;
   const startTime = Date.now();
   const handleInterval = async () => {
     if (attempts < 10) {
@@ -18,7 +19,10 @@ async function healthCheck(options) {
     const elapsedTime = (Date.now() - startTime) / 1e3;
     if (elapsedTime + delay / 1e3 > config.healthCheckMaxDuration) {
       const error = new HealthCheckError("Unable to verify deployment health.");
-      hooks?.onHealthCheckError?.(error);
+      if (!calledHealthCheckError) {
+        calledHealthCheckError = true;
+        hooks?.onHealthCheckError?.(error);
+      }
       throw error;
     }
     attempts++;

package/dist/deploy/types.d.ts

@@ -11,6 +11,7 @@ interface DeploymentHooks {
     onHealthCheckComplete?: () => void;
     onHealthCheckError?: (error: Error) => void;
     onUploadFilesStart?: () => void;
+    onUploadFilesError?: (error: Error) => void;
     onUploadFilesComplete?: () => void;
 }
 interface DeploymentConfig {

package/dist/deploy/upload-files.js

@@ -14,6 +14,9 @@ async function uploadFiles(options) {
   }).then(() => {
     hooks?.onUploadFilesComplete?.();
     outputCompleted(`Files uploaded successfully`, logger);
+  }).catch((err) => {
+    hooks?.onUploadFilesError?.(err);
+    throw err;
   });
 }
 async function uploadFile(config, target) {

package/dist/deploy/upload-files.test.js

@@ -30,15 +30,17 @@ vi.mock("@shopify/cli-kit/node/fs", () => {
   };
 });
 const testConfig = createTestConfig("/tmp/deploymentRoot");
+let hooks;
 describe("UploadFiles", () => {
   beforeEach(() => {
     vi.mocked(fetch).mockReset();
+    hooks = {
+      onUploadFilesComplete: vi.fn(),
+      onUploadFilesError: vi.fn(),
+      onUploadFilesStart: vi.fn()
+    };
   });
   it("Performs a form upload", async () => {
-    const hooks = {
-      onUploadFilesStart: vi.fn(),
-      onUploadFilesComplete: vi.fn()
-    };
     const response = new Response();
     vi.mocked(fetch).mockResolvedValueOnce(response);
     const testWorkerUpload = [
@@ -90,12 +92,15 @@ describe("UploadFiles", () => {
       uploadFiles({
         config: testConfig,
         targets: testWorkerUpload,
-        logger: stderrLogger
+        logger: stderrLogger,
+        hooks
       })
     ).rejects.toThrow("Failed to upload file index.js");
     expect(vi.mocked(fetch)).toHaveBeenCalledTimes(
       Number(deployDefaults.maxUploadAttempts) + 1
     );
+    expect(hooks.onUploadFilesError).toBeCalled();
+    expect(hooks.onUploadFilesComplete).not.toBeCalled();
   });
   it("Performs a resumable upload", async () => {
     const headers = {
@@ -116,7 +121,8 @@ describe("UploadFiles", () => {
     await uploadFiles({
       config: testConfig,
       targets: testWorkerUpload,
-      logger: stderrLogger
+      logger: stderrLogger,
+      hooks
     });
     expect(vi.mocked(fetch)).toHaveBeenCalledTimes(2);
     const secondCall = vi.mocked(fetch).mock.calls[1];
@@ -125,6 +131,8 @@ describe("UploadFiles", () => {
       return req.method === "PUT" && req.body instanceof NamedReadable;
     };
     expect(validateRequestBody(secondCall[1])).toBe(true);
+    expect(hooks.onUploadFilesStart).toBeCalled();
+    expect(hooks.onUploadFilesComplete).toBeCalled();
   });
   it("Resumes a resumable upload", async () => {
     console.error = () => {
@@ -200,7 +208,8 @@ describe("UploadFiles", () => {
       uploadFiles({
         config: testConfig,
         targets: testWorkerUpload,
-        logger: stderrLogger
+        logger: stderrLogger,
+        hooks
       })
     ).rejects.toThrow(
       `Failed to upload file index.js after ${deployDefaults.maxResumabeUploadAttempts} attempts`
@@ -209,5 +218,7 @@ describe("UploadFiles", () => {
       // for each attempt, we make two calls to fetch, plus the initial attempt makes two calls
       Number(deployDefaults.maxResumabeUploadAttempts) * 2 + 2
     );
+    expect(hooks.onUploadFilesError).toBeCalled();
+    expect(hooks.onUploadFilesComplete).not.toBeCalled();
   });
 });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0",
+  "version": "1.8.2",
   "commands": {
     "oxygen:deploy": {
       "id": "oxygen:deploy",

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "1.7.0",
+  "version": "1.8.2",
   "type": "module",
   "scripts": {
     "build": "tsup --clean --config ./tsup.config.ts && oclif manifest",
@@ -26,13 +26,16 @@
   "engines": {
     "node": ">=14.17.0"
   },
+  "exports": {
+    "./deploy": "./dist/deploy/index.js"
+  },
   "files": [
     "dist",
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@oclif/core": "2.9.4",
-    "@shopify/cli-kit": "^3.47.5",
+    "@oclif/core": "2.11.5",
+    "@shopify/cli-kit": "^3.48.0",
     "async": "^3.2.4"
   },
   "devDependencies": {
@@ -40,14 +43,14 @@
     "@shopify/eslint-plugin": "^42.1.0",
     "@shopify/prettier-config": "^1.1.2",
     "@types/async": "^3.2.18",
-    "@types/node": "^20.4.4",
-    "@types/prettier": "^2.7.3",
-    "eslint": "^8.45.0",
-    "node-fetch": "^3.3.1",
+    "@types/node": "^20.4.5",
+    "@types/prettier": "^3.0.0",
+    "eslint": "^8.46.0",
+    "node-fetch": "^3.3.2",
     "oclif": "^3",
     "tsup": "^7.1.0",
     "typescript": "^5.1.3",
-    "vite": "^4.4.6",
+    "vite": "^4.4.8",
     "vitest": "^0.33.0"
   },
   "prettier": "@shopify/prettier-config",