@shopify/cli-hydrogen 5.3.1 → 5.4.1

package/dist/lib/check-lockfile.js

@@ -2,24 +2,28 @@ import { fileExists } from '@shopify/cli-kit/node/fs';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 import { checkIfIgnoredInGitRepository } from '@shopify/cli-kit/node/git';
 import { renderWarning } from '@shopify/cli-kit/node/ui';
+import { AbortError } from '@shopify/cli-kit/node/error';
 import { lockfiles } from '@shopify/cli-kit/node/node-package-manager';
 
-function missingLockfileWarning() {
-  renderWarning({
-    headline: "No lockfile found",
-    body: `If you don\u2019t commit a lockfile, then your app might install the wrong package versions when deploying. To avoid versioning issues, generate a new lockfile and commit it to your repository.`,
-    nextSteps: [
-      [
-        "Generate a lockfile. Run",
-        {
-          command: "npm|yarn|pnpm install"
-        }
-      ],
-      "Commit the new file to your repository"
-    ]
-  });
+function missingLockfileWarning(shouldExit) {
+  const headline = "No lockfile found";
+  const body = `If you don\u2019t commit a lockfile, then your app might install the wrong package versions when deploying. To avoid versioning issues, generate a new lockfile and commit it to your repository.`;
+  const nextSteps = [
+    [
+      "Generate a lockfile. Run",
+      {
+        command: "npm|yarn|pnpm install"
+      }
+    ],
+    "Commit the new file to your repository"
+  ];
+  if (shouldExit) {
+    throw new AbortError(headline, body, nextSteps);
+  } else {
+    renderWarning({ headline, body, nextSteps });
+  }
 }
-function multipleLockfilesWarning(lockfiles2) {
+function multipleLockfilesWarning(lockfiles2, shouldExit) {
   const packageManagers = {
     "yarn.lock": "yarn",
     "package-lock.json": "npm",
@@ -28,30 +32,32 @@ function multipleLockfilesWarning(lockfiles2) {
   const lockfileList = lockfiles2.map((lockfile) => {
     return `${lockfile} (created by ${packageManagers[lockfile]})`;
   });
-  renderWarning({
-    headline: "Multiple lockfiles found",
-    body: [
-      `Your project contains more than one lockfile. This can cause version conflicts when installing and deploying your app. The following lockfiles were detected:
+  const headline = "Multiple lockfiles found";
+  const body = [
+    `Your project contains more than one lockfile. This can cause version conflicts when installing and deploying your app. The following lockfiles were detected:
 `,
-      { list: { items: lockfileList } }
-    ],
-    nextSteps: [
-      "Delete any unneeded lockfiles",
-      "Commit the change to your repository"
-    ]
-  });
+    { list: { items: lockfileList } }
+  ];
+  const nextSteps = [
+    "Delete any unneeded lockfiles",
+    "Commit the change to your repository"
+  ];
+  if (shouldExit) {
+    throw new AbortError(headline, body, nextSteps);
+  } else {
+    renderWarning({ headline, body, nextSteps });
+  }
 }
 function lockfileIgnoredWarning(lockfile) {
-  renderWarning({
-    headline: "Lockfile ignored by Git",
-    body: `Your project\u2019s lockfile isn\u2019t being tracked by Git. If you don\u2019t commit a lockfile, then your app might install the wrong package versions when deploying.`,
-    nextSteps: [
-      `In your project\u2019s .gitignore file, delete any references to ${lockfile}`,
-      "Commit the change to your repository"
-    ]
-  });
+  const headline = "Lockfile ignored by Git";
+  const body = `Your project\u2019s lockfile isn\u2019t being tracked by Git. If you don\u2019t commit a lockfile, then your app might install the wrong package versions when deploying.`;
+  const nextSteps = [
+    `In your project\u2019s .gitignore file, delete any references to ${lockfile}`,
+    "Commit the change to your repository"
+  ];
+  renderWarning({ headline, body, nextSteps });
 }
-async function checkLockfileStatus(directory) {
+async function checkLockfileStatus(directory, shouldExit = false) {
   if (process.env.LOCAL_DEV)
     return;
   const availableLockfiles = [];
@@ -60,21 +66,20 @@ async function checkLockfileStatus(directory) {
       availableLockfiles.push(lockFileName);
     }
   }
-  if (!availableLockfiles.length) {
-    return missingLockfileWarning();
+  if (availableLockfiles.length === 0) {
+    return missingLockfileWarning(shouldExit);
   }
   if (availableLockfiles.length > 1) {
-    return multipleLockfilesWarning(availableLockfiles);
+    return multipleLockfilesWarning(availableLockfiles, shouldExit);
   }
-  try {
-    const lockfile = availableLockfiles[0];
-    const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [
-      lockfile
-    ]);
-    if (ignoredLockfile.length) {
-      lockfileIgnoredWarning(lockfile);
-    }
-  } catch {
+  const lockfile = availableLockfiles[0];
+  const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [
+    lockfile
+  ]).catch(() => {
+    return [];
+  });
+  if (ignoredLockfile.length > 0) {
+    lockfileIgnoredWarning(lockfile);
   }
 }
 

package/dist/lib/check-lockfile.test.js

@@ -53,6 +53,15 @@ describe("checkLockfileStatus()", () => {
         );
       });
     });
+    it("throws when shouldExit is true", async () => {
+      await inTemporaryDirectory(async (tmpDir) => {
+        await writeFile(joinPath(tmpDir, "package-lock.json"), "");
+        await writeFile(joinPath(tmpDir, "pnpm-lock.yaml"), "");
+        await expect(checkLockfileStatus(tmpDir, true)).rejects.toThrow(
+          /Multiple lockfiles found/is
+        );
+      });
+    });
   });
   describe("when a lockfile is missing", () => {
     it("renders a warning", async () => {
@@ -61,5 +70,12 @@ describe("checkLockfileStatus()", () => {
         expect(outputMock.warn()).toMatch(/ warning .+ No lockfile found .+/is);
       });
     });
+    it("throws when shouldExit is true", async () => {
+      await inTemporaryDirectory(async (tmpDir) => {
+        await expect(checkLockfileStatus(tmpDir, true)).rejects.toThrow(
+          /No lockfile found/is
+        );
+      });
+    });
   });
 });

package/dist/lib/{get-oxygen-token.js → get-oxygen-deployment-data.js}

@@ -4,9 +4,9 @@ import { linkStorefront } from '../commands/hydrogen/link.js';
 import { login } from './auth.js';
 import { getCliCommand } from './shell.js';
 import { renderMissingLink, renderMissingStorefront } from './render-errors.js';
-import { getOxygenToken } from './graphql/admin/oxygen-token.js';
+import { getOxygenData } from './graphql/admin/get-oxygen-data.js';
 
-async function getOxygenDeploymentToken({
+async function getOxygenDeploymentData({
   root
 }) {
   const [{ session, config }, cliCommand] = await Promise.all([
@@ -28,7 +28,7 @@ async function getOxygenDeploymentToken({
   if (!config.storefront) {
     return;
   }
-  const { storefront } = await getOxygenToken(session, config.storefront.id);
+  const { storefront } = await getOxygenData(session, config.storefront.id);
   if (!storefront) {
     renderMissingStorefront({
       session,
@@ -41,7 +41,7 @@ async function getOxygenDeploymentToken({
     outputWarn(`Could not retrieve a deployment token.`);
     return;
   }
-  return storefront.oxygenDeploymentToken;
+  return storefront;
 }
 
-export { getOxygenDeploymentToken };
+export { getOxygenDeploymentData };

package/dist/lib/{get-oxygen-token.test.js → get-oxygen-deployment-data.test.js}

@@ -1,11 +1,11 @@
 import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest';
 import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
-import { getOxygenDeploymentToken } from './get-oxygen-token.js';
+import { getOxygenDeploymentData } from './get-oxygen-deployment-data.js';
 import { login } from './auth.js';
 import { getConfig } from './shopify-config.js';
 import { renderMissingLink, renderMissingStorefront } from './render-errors.js';
 import { linkStorefront } from '../commands/hydrogen/link.js';
-import { getOxygenToken } from './graphql/admin/oxygen-token.js';
+import { getOxygenData } from './graphql/admin/get-oxygen-data.js';
 
 vi.mock("@shopify/cli-kit/node/ui", async () => {
   const original = await vi.importActual("@shopify/cli-kit/node/ui");
@@ -19,9 +19,19 @@ vi.mock("./admin-session.js");
 vi.mock("./shopify-config.js");
 vi.mock("./render-errors.js");
 vi.mock("../commands/hydrogen/link.js");
-vi.mock("./graphql/admin/oxygen-token.js");
-describe("getOxygenDeploymentToken", () => {
+vi.mock("./graphql/admin/get-oxygen-data.js");
+describe("getOxygenDeploymentData", () => {
   const OXYGEN_DEPLOYMENT_TOKEN = "a-lovely-token";
+  const environments = [
+    {
+      name: "production",
+      branch: "main"
+    },
+    {
+      name: "preview",
+      branch: "staging"
+    }
+  ];
   beforeEach(() => {
     vi.mocked(login).mockResolvedValue({
       session: {
@@ -41,16 +51,20 @@ describe("getOxygenDeploymentToken", () => {
     vi.mocked(getConfig).mockResolvedValue({
       storefront: { id: "storefront-id", title: "Existing Link" }
     });
-    vi.mocked(getOxygenToken).mockResolvedValue({
-      storefront: { oxygenDeploymentToken: OXYGEN_DEPLOYMENT_TOKEN }
+    vi.mocked(getOxygenData).mockResolvedValue({
+      storefront: {
+        oxygenDeploymentToken: OXYGEN_DEPLOYMENT_TOKEN,
+        environments
+      }
     });
   });
   afterEach(() => {
     vi.resetAllMocks();
   });
-  it("returns the oxygen deployment token", async () => {
-    const token = await getOxygenDeploymentToken({ root: "test-root" });
-    expect(token).toBe(OXYGEN_DEPLOYMENT_TOKEN);
+  it("returns the oxygen deployment token and environments", async () => {
+    const data = await getOxygenDeploymentData({ root: "test-root" });
+    expect(data?.oxygenDeploymentToken).toBe(OXYGEN_DEPLOYMENT_TOKEN);
+    expect(data?.environments).toEqual(environments);
   });
   describe("when there is no linked storefront", () => {
     beforeEach(() => {
@@ -69,36 +83,36 @@ describe("getOxygenDeploymentToken", () => {
     });
     it("calls renderMissingLink and prompts the user to create a link", async () => {
       vi.mocked(renderConfirmationPrompt).mockResolvedValue(true);
-      await getOxygenDeploymentToken({ root: "test-root" });
+      await getOxygenDeploymentData({ root: "test-root" });
       expect(renderMissingLink).toHaveBeenCalled();
       expect(renderConfirmationPrompt).toHaveBeenCalled();
       expect(linkStorefront).toHaveBeenCalled();
     });
     it("returns nothing if the user does not create a new link", async () => {
       vi.mocked(renderConfirmationPrompt).mockResolvedValue(false);
-      const token = await getOxygenDeploymentToken({ root: "test-root" });
+      const token = await getOxygenDeploymentData({ root: "test-root" });
       expect(token).toEqual(void 0);
     });
   });
   describe("when there is no matching storefront in the shop", () => {
     beforeEach(() => {
-      vi.mocked(getOxygenToken).mockResolvedValue({ storefront: null });
+      vi.mocked(getOxygenData).mockResolvedValue({ storefront: null });
     });
     it("calls renderMissingStorefront and returns nothing", async () => {
-      const token = await getOxygenDeploymentToken({ root: "test-root" });
+      const token = await getOxygenDeploymentData({ root: "test-root" });
       expect(renderMissingStorefront).toHaveBeenCalled();
       expect(token).toEqual(void 0);
     });
   });
   describe("when the storefront does not have an oxygen deployment token", () => {
     beforeEach(() => {
-      vi.mocked(getOxygenToken).mockResolvedValue({
-        storefront: { oxygenDeploymentToken: "" }
+      vi.mocked(getOxygenData).mockResolvedValue({
+        storefront: { oxygenDeploymentToken: "", environments: [] }
       });
     });
     it("returns nothing", async () => {
-      const token = await getOxygenDeploymentToken({ root: "test-root" });
-      expect(token).toEqual(void 0);
+      const data = await getOxygenDeploymentData({ root: "test-root" });
+      expect(data).toEqual(void 0);
     });
   });
 });

package/dist/lib/graphiql-url.js

@@ -0,0 +1,15 @@
+function getGraphiQLUrl({
+  host = "",
+  graphql
+}) {
+  let url = `${host.endsWith("/") ? host.slice(0, -1) : host}/graphiql`;
+  if (graphql) {
+    let { query, variables } = graphql;
+    if (typeof variables !== "string")
+      variables = JSON.stringify(variables);
+    url += `?query=${encodeURIComponent(query)}${variables ? `&variables=${encodeURIComponent(variables)}` : ""}`;
+  }
+  return url;
+}
+
+export { getGraphiQLUrl };

package/dist/lib/graphql/admin/{oxygen-token.js → get-oxygen-data.js}

@@ -1,15 +1,19 @@
 import { adminRequest } from './client.js';
 
-const GetDeploymentTokenQuery = `#graphql
+const GetDeploymentDataQuery = `#graphql
   query GetDeploymentToken($id: ID!) {
     hydrogenStorefront(id: $id) {
       oxygenDeploymentToken
+      environments {
+        name
+        branch
+      }
     }
   }
 `;
-async function getOxygenToken(adminSession, storefrontId) {
+async function getOxygenData(adminSession, storefrontId) {
   const { hydrogenStorefront } = await adminRequest(
-    GetDeploymentTokenQuery,
+    GetDeploymentDataQuery,
     adminSession,
     {
       id: storefrontId
@@ -18,4 +22,4 @@ async function getOxygenToken(adminSession, storefrontId) {
   return { storefront: hydrogenStorefront };
 }
 
-export { GetDeploymentTokenQuery, getOxygenToken };
+export { GetDeploymentDataQuery, getOxygenData };

package/dist/lib/is-ci.js

@@ -0,0 +1,6 @@
+function isCI() {
+  const { env } = process;
+  return env.CI === "false" ? false : !!(env.CI || env.CI_NAME || env.BUILD_NUMBER || env.TF_BUILD);
+}
+
+export { isCI };

package/dist/lib/log.js

@@ -2,6 +2,7 @@ import { renderFatalError, renderWarning, renderInfo } from '@shopify/cli-kit/no
 import { BugError } from '@shopify/cli-kit/node/error';
 import { outputContent, outputToken } from '@shopify/cli-kit/node/output';
 import colors from '@shopify/cli-kit/node/colors';
+import { getGraphiQLUrl } from './graphiql-url.js';
 
 const originalConsole = { ...console };
 const methodsReplaced = /* @__PURE__ */ new Set();
@@ -194,11 +195,11 @@ function enhanceH2Logs(options) {
           }
         }
         if (typeof cause !== "string" && !!cause?.graphql?.query) {
-          const { query, variables } = cause.graphql;
-          const link = `${options.graphiqlUrl}?query=${encodeURIComponent(
-            query
-          )}${variables ? `&variables=${encodeURIComponent(variables)}` : ""}`;
-          const [, queryType, queryName] = query.match(/(query|mutation)\s+(\w+)/) || [];
+          const link = getGraphiQLUrl({
+            host: options.host,
+            graphql: cause.graphql
+          });
+          const [, queryType, queryName] = cause.graphql.query.match(/(query|mutation)\s+(\w+)/) || [];
           tryMessage = (tryMessage ? `${tryMessage}
 
 ` : "") + outputContent`To debug the ${queryType || "query"}${queryName ? ` \`${colors.whiteBright(queryName)}\`` : ""}, try it in ${outputToken.link(colors.bold("GraphiQL"), link)}.`.value;

package/dist/lib/log.test.js

@@ -5,7 +5,7 @@ import { resetAllLogs, enhanceH2Logs } from './log.js';
 
 describe("log replacer", () => {
   describe("enhanceH2Logs", () => {
-    const graphiqlUrl = "http://localhost:3000/graphiql";
+    const host = "http://localhost:3000";
     const rootDirectory = fileURLToPath(import.meta.url);
     const outputMock = mockAndCaptureOutput();
     beforeEach(() => {
@@ -18,7 +18,7 @@ describe("log replacer", () => {
     });
     describe("enhances h2:info pattern", () => {
       it("renders in an info banner", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.warn("[h2:info:storefront.query] Tip");
         const message = outputMock.info();
         expect(message).not.toMatch("h2");
@@ -29,7 +29,7 @@ describe("log replacer", () => {
     });
     describe("enhances h2:warn pattern", () => {
       it("renders in a warning banner", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.warn("[h2:warn:storefront.query] Wrong query 1");
         const warning = outputMock.warn();
         expect(warning).not.toMatch("h2");
@@ -38,7 +38,7 @@ describe("log replacer", () => {
         expect(warning).toMatch("Wrong query");
       });
       it("shows links from the last line as a list", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.warn(
           "[h2:warn:storefront.query] Wrong query.\nhttps://docs.com/something"
         );
@@ -50,7 +50,7 @@ describe("log replacer", () => {
     });
     describe("enhances h2:error pattern", () => {
       it("renders in an error banner", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.error(new Error("[h2:error:storefront.query] Wrong query 2"));
         const error = outputMock.error();
         expect(error.split("stack trace:")[0]).not.toMatch("h2");
@@ -59,7 +59,7 @@ describe("log replacer", () => {
         expect(error).toMatch("Wrong query");
       });
       it("shows a GraphiQL link when the error is related to a GraphQL query", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.error(
           new Error("[h2:error:storefront.query] Wrong query 3", {
             cause: {
@@ -75,7 +75,7 @@ describe("log replacer", () => {
         `);
       });
       it("trims stack traces when the error is related to a GraphQL query", () => {
-        enhanceH2Logs({ graphiqlUrl, rootDirectory });
+        enhanceH2Logs({ host, rootDirectory });
         console.error(
           new Error("[h2:error:storefront.query] Wrong query 4", {
             cause: { graphql: { query: "query test {}" } }

package/dist/lib/mini-oxygen/node.js

@@ -1,6 +1,5 @@
 import { randomUUID } from 'node:crypto';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { resolvePath } from '@shopify/cli-kit/node/path';
 import { readFile } from '@shopify/cli-kit/node/fs';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
 import { startServer, Request } from '@shopify/mini-oxygen';
@@ -9,14 +8,12 @@ import { OXYGEN_HEADERS_MAP, logRequestLine } from './common.js';
 import { clearHistory, streamRequestEvents, logRequestEvent } from '../request-events.js';
 
 async function startNodeServer({
-  root,
   port = DEFAULT_PORT,
   watch = false,
   buildPathWorkerFile,
   buildPathClient,
   env
 }) {
-  resolvePath(root, ".env");
   const oxygenHeaders = Object.fromEntries(
     Object.entries(OXYGEN_HEADERS_MAP).map(([key, value]) => {
       return [key, value.defaultValue];
@@ -25,13 +22,13 @@ async function startNodeServer({
   const asyncLocalStorage = new AsyncLocalStorage();
   const serviceBindings = {
     H2O_LOG_EVENT: {
-      fetch: (request) => logRequestEvent(
+      fetch: async (request) => logRequestEvent(
         new Request(request.url, {
-          headers: {
-            ...Object.fromEntries(request.headers.entries()),
-            // Merge some headers from the parent request
+          method: "POST",
+          body: JSON.stringify({
+            ...await request.json(),
             ...asyncLocalStorage.getStore()
-          }
+          })
         })
       )
     }
@@ -65,7 +62,7 @@ async function startNodeServer({
       }
       const startTimeMs = Date.now();
       const response = await asyncLocalStorage.run(
-        { "request-id": requestId, purpose: request.headers.get("purpose") },
+        { requestId, purpose: request.headers.get("purpose") },
         () => defaultDispatcher(request)
       );
       logRequestLine(request, {

package/dist/lib/request-events.js

@@ -1,20 +1,24 @@
 import { EventEmitter } from 'node:events';
 import { ReadableStream } from 'node:stream/web';
 import { Response } from '@shopify/mini-oxygen';
+import { getGraphiQLUrl } from './graphiql-url.js';
 
 const DEV_ROUTES = /* @__PURE__ */ new Set(["/graphiql", "/debug-network"]);
 const EVENT_MAP = {
   request: "Request",
   subrequest: "Sub request"
 };
-function getRequestInfo(request) {
+async function getRequestInfo(request) {
+  const data = await request.json();
   return {
-    id: request.headers.get("request-id"),
-    eventType: request.headers.get("hydrogen-event-type") || "unknown",
-    startTime: request.headers.get("hydrogen-start-time"),
-    endTime: request.headers.get("hydrogen-end-time") || String(Date.now()),
-    purpose: request.headers.get("purpose") === "prefetch" ? "(prefetch)" : "",
-    cacheStatus: request.headers.get("hydrogen-cache-status")
+    id: data.requestId ?? "",
+    eventType: data.eventType || "unknown",
+    startTime: data.startTime,
+    endTime: data.endTime || Date.now(),
+    purpose: data.purpose === "prefetch" ? "(prefetch)" : "",
+    cacheStatus: data.cacheStatus ?? "",
+    stackLine: data.stackLine ?? "",
+    graphql: data.graphql ? JSON.parse(data.graphql) : null
   };
 }
 const eventEmitter = new EventEmitter();
@@ -24,24 +28,36 @@ async function clearHistory() {
   return new Response("ok");
 }
 async function logRequestEvent(request) {
-  if (DEV_ROUTES.has(new URL(request.url).pathname)) {
+  const url = new URL(request.url);
+  if (DEV_ROUTES.has(url.pathname)) {
     return new Response("ok");
   }
-  const { eventType, purpose, ...data } = getRequestInfo(request);
+  const { eventType, purpose, stackLine, graphql, ...data } = await getRequestInfo(request);
+  let originFile = "";
+  let graphiqlLink = "";
   let description = request.url;
   if (eventType === "subrequest") {
-    description = decodeURIComponent(request.url).match(/(query|mutation)\s+(\w+)/)?.[0]?.replace(/\s+/, " ") || request.url;
+    description = graphql?.query.match(/(query|mutation)\s+(\w+)/)?.[0]?.replace(/\s+/, " ") || decodeURIComponent(url.search.slice(1));
+    const [, fnName, filePath] = stackLine?.match(/\s+at ([^\s]+) \(.*?\/(app\/[^\n]*)\)/) || [];
+    if (fnName && filePath) {
+      originFile = `${fnName}:${filePath}`;
+    }
+    if (graphql) {
+      graphiqlLink = getGraphiQLUrl({ graphql });
+    }
   }
   const event = {
     event: EVENT_MAP[eventType] || eventType,
     data: JSON.stringify({
       ...data,
-      url: `${purpose} ${description}`.trim()
+      url: `${purpose} ${description}`.trim(),
+      graphiqlLink,
+      originFile
     })
   };
+  eventHistory.push(event);
   if (eventHistory.length > 100)
     eventHistory.shift();
-  eventHistory.push(event);
   eventEmitter.emit("request", event);
   return new Response("ok");
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.3.1",
+  "version": "5.4.1",
   "commands": {
     "hydrogen:build": {
       "id": "hydrogen:build",
@@ -28,6 +28,12 @@
           "description": "Show a bundle size summary after building.",
           "allowNo": true
         },
+        "lockfile-check": {
+          "name": "lockfile-check",
+          "type": "boolean",
+          "description": "Checks that there is exactly 1 valid lockfile in the project.",
+          "allowNo": true
+        },
         "disable-route-warning": {
           "name": "disable-route-warning",
           "type": "boolean",
@@ -147,6 +153,14 @@
       "hidden": true,
       "aliases": [],
       "flags": {
+        "env-branch": {
+          "name": "env-branch",
+          "type": "option",
+          "char": "e",
+          "description": "Environment branch (tag) for environment to deploy to",
+          "required": false,
+          "multiple": false
+        },
         "path": {
           "name": "path",
           "type": "option",
@@ -160,29 +174,37 @@
           "description": "Shop URL. It can be the shop prefix (janes-apparel) or the full myshopify.com URL (janes-apparel.myshopify.com, https://janes-apparel.myshopify.com).",
           "multiple": false
         },
-        "publicDeployment": {
-          "name": "publicDeployment",
+        "public-deployment": {
+          "name": "public-deployment",
           "type": "boolean",
           "description": "Marks a preview deployment as publicly accessible.",
           "required": false,
           "allowNo": false
         },
-        "metadataUrl": {
-          "name": "metadataUrl",
+        "token": {
+          "name": "token",
+          "type": "option",
+          "char": "t",
+          "description": "Oxygen deployment token",
+          "required": false,
+          "multiple": false
+        },
+        "metadata-url": {
+          "name": "metadata-url",
           "type": "option",
           "description": "URL that links to the deployment. Will be saved and displayed in the Shopify admin",
           "required": false,
           "multiple": false
         },
-        "metadataUser": {
-          "name": "metadataUser",
+        "metadata-user": {
+          "name": "metadata-user",
           "type": "option",
           "description": "User that initiated the deployment. Will be saved and displayed in the Shopify admin",
           "required": false,
           "multiple": false
         },
-        "metadataVersion": {
-          "name": "metadataVersion",
+        "metadata-version": {
+          "name": "metadata-version",
           "type": "option",
           "description": "A version identifier for the deployment. Will be saved and displayed in the Shopify admin",
           "required": false,