@shopify/oxygen-cli 1.11.7-unstable.202309081455.0 → 1.12.0

package/dist/deploy/deployment-cancel.d.ts

@@ -2,16 +2,12 @@ import { Logger } from '@shopify/cli-kit/node/output';
 import { DeploymentConfig } from './types.js';
 import { DeploymentCancelResponse } from './graphql/deployment-cancel.js';
 
-declare enum DeploymentCancelReason {
-    Failed = "FAILED",
-    Cancelled = "CANCELLED"
-}
 interface DeploymentCancelOptions {
     config: DeploymentConfig;
     deploymentId: string;
-    reason: DeploymentCancelReason;
+    reason: string;
     logger: Logger;
 }
 declare function deploymentCancel(options: DeploymentCancelOptions): Promise<DeploymentCancelResponse>;
 
-export { DeploymentCancelReason, deploymentCancel };
+export { deploymentCancel };

package/dist/deploy/deployment-cancel.js

@@ -4,11 +4,6 @@ import { outputInfo } from '@shopify/cli-kit/node/output';
 import { Header, errorHandler } from '../utils/utils.js';
 import { DeploymentCancelQuery } from './graphql/deployment-cancel.js';
 
-var DeploymentCancelReason = /* @__PURE__ */ ((DeploymentCancelReason2) => {
-  DeploymentCancelReason2["Failed"] = "FAILED";
-  DeploymentCancelReason2["Cancelled"] = "CANCELLED";
-  return DeploymentCancelReason2;
-})(DeploymentCancelReason || {});
 async function deploymentCancel(options) {
   const { config, deploymentId, reason, logger } = options;
   const variables = {
@@ -39,4 +34,4 @@ async function deploymentCancel(options) {
   }
 }
 
-export { DeploymentCancelReason, deploymentCancel };
+export { deploymentCancel };

package/dist/deploy/deployment-cancel.test.js

@@ -3,7 +3,7 @@ import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
 import { vi, describe, test, expect } from 'vitest';
 import { createTestConfig } from '../utils/test-helper.js';
 import { stderrLogger, Header } from '../utils/utils.js';
-import { deploymentCancel, DeploymentCancelReason } from './deployment-cancel.js';
+import { deploymentCancel } from './deployment-cancel.js';
 
 vi.mock("@shopify/cli-kit/node/api/graphql");
 vi.mock("@shopify/cli-kit/node/output");
@@ -22,7 +22,7 @@ describe("DeploymentComplete", () => {
     const completeResponse = await deploymentCancel({
       config: testConfig,
       deploymentId: "deployment-1",
-      reason: DeploymentCancelReason.Failed,
+      reason: "error message",
       logger: stderrLogger
     });
     expect(completeResponse).toEqual(response.deploymentCancel);
@@ -33,7 +33,7 @@ describe("DeploymentComplete", () => {
       token: testConfig.deploymentToken.accessToken,
       variables: {
         deploymentId: "deployment-1",
-        reason: DeploymentCancelReason.Failed
+        reason: "error message"
       },
       addedHeaders: {
         [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
@@ -55,7 +55,7 @@ describe("DeploymentComplete", () => {
       deploymentCancel({
         config: testConfig,
         deploymentId: "deployment-1",
-        reason: DeploymentCancelReason.Failed,
+        reason: "error message",
         logger: stderrLogger
       })
     ).rejects.toThrow(
@@ -74,7 +74,7 @@ describe("DeploymentComplete", () => {
         deploymentCancel({
           config: testConfig,
           deploymentId: "deployment-1",
-          reason: DeploymentCancelReason.Failed,
+          reason: "error message",
           logger: stderrLogger
         })
       ).rejects.toThrow(

package/dist/deploy/graphql/deployment-cancel.d.ts

@@ -1,6 +1,6 @@
 import { OxygenError } from '../types.js';
 
-declare const DeploymentCancelQuery = "\nmutation DeploymentCancel($deploymentId: ID!, $reason: DeploymentCancellationReason!) {\n  deploymentCancel(id: $deploymentId, reason: $reason) {\n    deployment {\n      id\n    }\n    userErrors {\n      message\n    }\n  }\n}\n";
+declare const DeploymentCancelQuery = "\nmutation DeploymentCancel($deploymentId: ID!, $reason: String!) {\n  deploymentCancel(id: $deploymentId, reason: $reason) {\n    deployment {\n      id\n    }\n    userErrors {\n      message\n    }\n  }\n}\n";
 interface DeploymentCancelQueryData {
     deploymentCancel: DeploymentCancelResponse;
 }

package/dist/deploy/graphql/deployment-cancel.js

@@ -1,5 +1,5 @@
 const DeploymentCancelQuery = `
-mutation DeploymentCancel($deploymentId: ID!, $reason: DeploymentCancellationReason!) {
+mutation DeploymentCancel($deploymentId: ID!, $reason: String!) {
   deploymentCancel(id: $deploymentId, reason: $reason) {
     deployment {
       id

package/dist/deploy/index.js

@@ -7,7 +7,7 @@ import { getUploadFiles } from './get-upload-files.js';
 import { deploymentInitiate } from './deployment-initiate.js';
 import { deploymentComplete } from './deployment-complete.js';
 import { healthCheck } from './health-check.js';
-import { deploymentCancel, DeploymentCancelReason } from './deployment-cancel.js';
+import { deploymentCancel } from './deployment-cancel.js';
 import { uploadFiles } from './upload-files.js';
 import { HealthCheckError } from './types.js';
 import { buildProject } from './build-project.js';
@@ -107,7 +107,7 @@ ${urlMessage} preview URL: ${deploymentCompleteOp.deployment.url}`,
       await deploymentCancel({
         config,
         deploymentId: deployment.deployment.id,
-        reason: DeploymentCancelReason.Failed,
+        reason: error.message,
         logger
       }).catch((err) => {
         if (err instanceof Error) {

package/dist/deploy/metadata.js

@@ -8,10 +8,10 @@ async function getMetadata(config, logger) {
   let metadata = {};
   try {
     const gitCommit = await getLatestGitCommit(config.rootPath);
-    const branch = gitCommit.refs.split(" ");
+    const branch = (/HEAD -> ([^,]*)/.exec(gitCommit.refs) || [])[1];
     metadata = {
       actor: gitCommit.author_name,
-      branch: branch[branch.length - 1],
+      branch,
       commitDate: gitCommit.date,
       commitSha: gitCommit.hash,
       commitMessage: gitCommit.message.substring(0, maxLabelLength)

package/dist/deploy/metadata.test.js

@@ -7,6 +7,7 @@ import { getMetadata, getEnvironmentInput, createLabels } from './metadata.js';
 
 vi.mock("@shopify/cli-kit/node/context/local");
 vi.mock("@shopify/cli-kit/node/git");
+vi.mock("@shopify/cli-kit/node/output");
 describe("getMetadata", () => {
   test("should return custom metadata from environment", async () => {
     vi.mocked(ciPlatform).mockReturnValueOnce({
@@ -69,6 +70,39 @@ describe("getMetadata", () => {
     expect(metadataResult.name).toBe("none");
     expect(metadataResult.url).toBe(void 0);
   });
+  test("should derive branch correctly from commit refs", async () => {
+    vi.mocked(ciPlatform).mockReturnValue({
+      isCI: false
+    });
+    const testCases = {
+      "HEAD -> main, origin/main, origin/HEAD": "main",
+      "HEAD -> dev, origin/dev, origin/HEAD": "dev",
+      "HEAD -> feature/awesome-feature, origin/feature/awesome-feature, origin/HEAD": "feature/awesome-feature",
+      "HEAD -> bugfix/123-fix-bug, origin/bugfix/123-fix-bug, origin/HEAD": "bugfix/123-fix-bug",
+      "HEAD -> release/v1.0.0, origin/release/v1.0.0, origin/HEAD": "release/v1.0.0",
+      "HEAD -> hotfix/urgent-fix, origin/hotfix/urgent-fix, origin/HEAD": "hotfix/urgent-fix",
+      "HEAD -> test, origin/test, origin/HEAD": "test",
+      "HEAD -> my-branch, origin/my-branch, origin/HEAD": "my-branch",
+      "HEAD -> long-branch-name, origin/long-branch-name, origin/HEAD": "long-branch-name",
+      "HEAD -> branch_with_underscores, origin/branch_with_underscores, origin/HEAD": "branch_with_underscores",
+      "HEAD -> branch-with-dashes, origin/branch-with-dashes, origin/HEAD": "branch-with-dashes",
+      "HEAD -> branch.with.dots, origin/branch.with.dots, origin/HEAD": "branch.with.dots"
+    };
+    for (const [refs, expectedBranch] of Object.entries(testCases)) {
+      vi.mocked(getLatestGitCommit).mockResolvedValueOnce({
+        author_name: "gh_author",
+        author_email: "test@github.com",
+        hash: "gh_hash",
+        message: "gh_message",
+        refs,
+        date: "gh_date",
+        body: "gh_body"
+      });
+      const testConfig = createTestConfig("/tmp/deploymentRoot/");
+      const metadataResult = await getMetadata(testConfig, stderrLogger);
+      expect(metadataResult.branch).toBe(expectedBranch);
+    }
+  });
 });
 describe("getEnvironmentInput", () => {
   test("should return environment tag from config", () => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.11.7-unstable.202309081455.0",
+  "version": "1.12.0",
   "commands": {
     "oxygen:deploy": {
       "id": "oxygen:deploy",

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "1.11.7-unstable.202309081455.0",
+  "version": "1.12.0",
   "type": "module",
   "scripts": {
     "build": "tsup --clean --config ./tsup.config.ts && oclif manifest",
@@ -16,7 +16,8 @@
     "lint:format": "prettier --write \"**/*.*\" && npm run lint --fix",
     "generate:manifest": "oclif manifest",
     "prepack": "npm install && npm run build",
-    "release": "npm run build && npx changeset publish",
+    "prepublishOnly": "rm -rf dist/**/*.test.*",
+    "release": "npm run build && npx changeset publish && git push --follow-tags",
     "test": "vitest run",
     "test:watch": "vitest"
   },
@@ -24,7 +25,7 @@
     "oxygen-cli": "./dist/oxygen-cli.js"
   },
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16.14.0"
   },
   "exports": {
     "./deploy": "./dist/deploy/index.js"
@@ -35,7 +36,7 @@
   ],
   "dependencies": {
     "@oclif/core": "2.15.0",
-    "@shopify/cli-kit": "nightly",
+    "@shopify/cli-kit": "^3.49.2",
     "async": "^3.2.4"
   },
   "devDependencies": {
@@ -44,14 +45,14 @@
     "@shopify/prettier-config": "^1.1.2",
     "@types/async": "^3.2.18",
     "@types/node": "^20.5.9",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-plugin-prettier": "^5.0.0",
     "node-fetch": "^3.3.2",
     "oclif": "^3",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vitest": "^0.34.3"
+    "vitest": "^0.34.4"
   },
   "prettier": "@shopify/prettier-config",
   "oclif": {