@shopify/oxygen-cli 1.11.7-unstable.202309081456.0 → 1.12.1-unstable.202309120939.0

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.202309081456.0",
+  "version": "1.12.1-unstable.202309120939.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.202309081456.0",
+  "version": "1.12.1-unstable.202309120939.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"
   },
@@ -44,7 +45,7 @@
     "@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",