@shopify/cli-hydrogen 5.4.0 → 5.4.2

package/dist/commands/hydrogen/deploy.js

@@ -3,11 +3,13 @@ import Command from '@shopify/cli-kit/node/base-command';
 import colors from '@shopify/cli-kit/node/colors';
 import { outputWarn, outputInfo, outputContent } from '@shopify/cli-kit/node/output';
 import { AbortError } from '@shopify/cli-kit/node/error';
+import { getLatestGitCommit } from '@shopify/cli-kit/node/git';
 import { resolvePath } from '@shopify/cli-kit/node/path';
-import { renderFatalError, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
+import { renderFatalError, renderSelectPrompt, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
+import { ciPlatform } from '@shopify/cli-kit/node/context/local';
 import { parseToken, createDeploy } from '@shopify/oxygen-cli/deploy';
-import { commonFlags } from '../../lib/flags.js';
-import { getOxygenDeploymentToken } from '../../lib/get-oxygen-token.js';
+import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
+import { getOxygenDeploymentData } from '../../lib/get-oxygen-deployment-data.js';
 import { runBuild } from './build.js';
 
 const deploymentLogger = (message, level = "info") => {
@@ -17,25 +19,36 @@ const deploymentLogger = (message, level = "info") => {
 };
 class Deploy extends Command {
   static flags = {
+    "env-branch": Flags.string({
+      char: "e",
+      description: "Environment branch (tag) for environment to deploy to",
+      required: false
+    }),
     path: commonFlags.path,
     shop: commonFlags.shop,
-    publicDeployment: Flags.boolean({
+    "public-deployment": Flags.boolean({
       env: "SHOPIFY_HYDROGEN_FLAG_PUBLIC_DEPLOYMENT",
       description: "Marks a preview deployment as publicly accessible.",
       required: false,
       default: false
     }),
-    metadataUrl: Flags.string({
+    token: Flags.string({
+      char: "t",
+      description: "Oxygen deployment token",
+      env: "SHOPIFY_HYDROGEN_DEPLOYMENT_TOKEN",
+      required: false
+    }),
+    "metadata-url": Flags.string({
       description: "URL that links to the deployment. Will be saved and displayed in the Shopify admin",
       required: false,
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_URL"
     }),
-    metadataUser: Flags.string({
+    "metadata-user": Flags.string({
       description: "User that initiated the deployment. Will be saved and displayed in the Shopify admin",
       required: false,
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_USER"
     }),
-    metadataVersion: Flags.string({
+    "metadata-version": Flags.string({
       description: "A version identifier for the deployment. Will be saved and displayed in the Shopify admin",
       required: false,
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_VERSION"
@@ -44,24 +57,26 @@ class Deploy extends Command {
   static hidden = true;
   async run() {
     const { flags } = await this.parse(Deploy);
-    const actualPath = flags.path ? resolvePath(flags.path) : process.cwd();
-    await oxygenDeploy({
-      path: actualPath,
-      shop: flags.shop,
-      publicDeployment: flags.publicDeployment,
-      metadataUrl: flags.metadataUrl,
-      metadataUser: flags.metadataUser,
-      metadataVersion: flags.metadataVersion
-    }).catch((error) => {
+    const deploymentOptions = this.flagsToOxygenDeploymentOptions(flags);
+    await oxygenDeploy(deploymentOptions).catch((error) => {
       renderFatalError(error);
       process.exit(1);
     }).finally(() => {
       process.exit(0);
     });
   }
+  flagsToOxygenDeploymentOptions(flags) {
+    const camelFlags = flagsToCamelObject(flags);
+    return {
+      ...camelFlags,
+      environmentTag: flags["env-branch"],
+      path: flags.path ? resolvePath(flags.path) : process.cwd()
+    };
+  }
 }
 async function oxygenDeploy(options) {
   const {
+    environmentTag,
     path,
     shop,
     publicDeployment,
@@ -69,25 +84,69 @@ async function oxygenDeploy(options) {
     metadataUser,
     metadataVersion
   } = options;
-  const token = await getOxygenDeploymentToken({
-    root: path,
-    flagShop: shop
-  });
+  const ci = ciPlatform();
+  let token = options.token;
+  let branch;
+  let deploymentData;
+  let deploymentEnvironmentTag = void 0;
+  let gitCommit;
+  try {
+    gitCommit = await getLatestGitCommit(path);
+    branch = (/HEAD -> ([^,]*)/.exec(gitCommit.refs) || [])[1];
+  } catch (error) {
+    outputWarn("Could not retrieve Git history.");
+    branch = void 0;
+  }
+  if (!ci.isCI) {
+    deploymentData = await getOxygenDeploymentData({
+      root: path,
+      flagShop: shop
+    });
+    if (!deploymentData) {
+      return;
+    }
+    token = token || deploymentData.oxygenDeploymentToken;
+  }
   if (!token) {
-    throw new AbortError("Could not obtain Oxygen deployment token");
+    const errMessage = ci.isCI ? [
+      "No deployment token provided. Use the ",
+      { command: "--token" },
+      " flag to provide a token."
+    ] : `Could not obtain an Oxygen deployment token, please try again or contact Shopify support.`;
+    throw new AbortError(errMessage);
+  }
+  if (!ci.isCI && !environmentTag && deploymentData?.environments) {
+    if (deploymentData.environments.length > 1) {
+      const choices = [
+        ...deploymentData.environments.map(({ name, branch: branch2 }) => ({
+          label: name,
+          value: branch2
+        }))
+      ];
+      deploymentEnvironmentTag = await renderSelectPrompt({
+        message: "Select an environment to deploy to",
+        choices,
+        defaultValue: branch
+      });
+    } else {
+      outputInfo(
+        `Using current checked out branch ${branch} as environment tag`
+      );
+    }
   }
   const config = {
     assetsDir: "dist/client",
     deploymentUrl: "https://oxygen.shopifyapps.com",
     deploymentToken: parseToken(token),
-    healthCheckMaxDuration: 180,
+    environmentTag: environmentTag || deploymentEnvironmentTag || branch,
+    verificationMaxDuration: 180,
     metadata: {
       ...metadataUrl ? { url: metadataUrl } : {},
       ...metadataUser ? { user: metadataUser } : {},
       ...metadataVersion ? { version: metadataVersion } : {}
     },
     publicDeployment,
-    skipHealthCheck: false,
+    skipVerification: false,
     rootPath: path,
     skipBuild: false,
     workerOnly: false,
@@ -120,10 +179,10 @@ async function oxygenDeploy(options) {
         useCodegen: false
       });
     },
-    onHealthCheckComplete: () => resolveHealthCheck(),
+    onVerificationComplete: () => resolveHealthCheck(),
     onUploadFilesStart: () => uploadStart(),
     onUploadFilesComplete: () => resolveUpload(),
-    onHealthCheckError: (error) => {
+    onVerificationError: (error) => {
       deployError = new AbortError(
         error.message,
         "Please verify the deployment status in the Shopify Admin and retry deploying if necessary."
@@ -146,7 +205,7 @@ async function oxygenDeploy(options) {
         task: async () => await uploadPromise
       },
       {
-        title: "Performing health check",
+        title: "Verifying deployment",
         task: async () => await healthCheckPromise
       }
     ]);

package/dist/commands/hydrogen/deploy.test.js

@@ -1,13 +1,14 @@
-import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest';
+import { vi, describe, expect, beforeEach, afterEach, it } from 'vitest';
 import { login } from '../../lib/auth.js';
 import { getStorefronts } from '../../lib/graphql/admin/link-storefront.js';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { renderSelectPrompt, renderSuccess, renderFatalError } from '@shopify/cli-kit/node/ui';
+import { getLatestGitCommit } from '@shopify/cli-kit/node/git';
 import { oxygenDeploy, deploymentLogger } from './deploy.js';
-import { getOxygenDeploymentToken } from '../../lib/get-oxygen-token.js';
+import { getOxygenDeploymentData } from '../../lib/get-oxygen-deployment-data.js';
 import { createDeploy, parseToken } from '@shopify/oxygen-cli/deploy';
 
-vi.mock("../../lib/get-oxygen-token.js");
+vi.mock("../../lib/get-oxygen-deployment-data.js");
 vi.mock("@shopify/oxygen-cli/deploy");
 vi.mock("../../lib/auth.js");
 vi.mock("../../lib/shopify-config.js");
@@ -19,6 +20,8 @@ vi.mock("@shopify/cli-kit/node/output", async () => {
   return {
     outputContent: () => ({ value: "" }),
     outputInfo: () => {
+    },
+    outputWarn: () => {
     }
   };
 });
@@ -30,6 +33,16 @@ vi.mock("@shopify/cli-kit/node/ui", async () => {
     renderTasks: vi.fn()
   };
 });
+vi.mock("@shopify/cli-kit/node/git", async () => {
+  return {
+    getLatestGitCommit: vi.fn()
+  };
+});
+vi.mock("@shopify/cli-kit/node/context/local", async () => {
+  return {
+    ciPlatform: () => ({ isCI: false })
+  };
+});
 describe("deploy", () => {
   const ADMIN_SESSION = {
     token: "abc123",
@@ -66,6 +79,31 @@ describe("deploy", () => {
     namespace: "some-namespace",
     namespaceId: "1"
   };
+  const expectedConfig = {
+    assetsDir: "dist/client",
+    deploymentUrl: "https://oxygen.shopifyapps.com",
+    deploymentToken: mockToken,
+    verificationMaxDuration: 180,
+    metadata: {
+      url: deployParams.metadataUrl,
+      user: deployParams.metadataUser,
+      version: deployParams.metadataVersion
+    },
+    publicDeployment: deployParams.publicDeployment,
+    skipVerification: false,
+    rootPath: deployParams.path,
+    skipBuild: false,
+    workerOnly: false,
+    workerDir: "dist/worker"
+  };
+  const expectedHooks = {
+    buildFunction: expect.any(Function),
+    onVerificationComplete: expect.any(Function),
+    onUploadFilesStart: expect.any(Function),
+    onUploadFilesComplete: expect.any(Function),
+    onVerificationError: expect.any(Function),
+    onUploadFilesError: expect.any(Function)
+  };
   beforeEach(async () => {
     process.exit = vi.fn();
     vi.mocked(login).mockResolvedValue({
@@ -83,54 +121,68 @@ describe("deploy", () => {
     vi.mocked(createDeploy).mockResolvedValue(
       "https://a-lovely-deployment.com"
     );
-    vi.mocked(getOxygenDeploymentToken).mockResolvedValue("some-encoded-token");
+    vi.mocked(getOxygenDeploymentData).mockResolvedValue({
+      oxygenDeploymentToken: "some-encoded-token",
+      environments: []
+    });
     vi.mocked(parseToken).mockReturnValue(mockToken);
   });
   afterEach(() => {
     vi.resetAllMocks();
     process.exit = originalExit;
   });
-  it("calls getOxygenDeploymentToken with the correct parameters", async () => {
+  it("calls getOxygenDeploymentData with the correct parameters", async () => {
     await oxygenDeploy(deployParams);
-    expect(getOxygenDeploymentToken).toHaveBeenCalledWith({
+    expect(getOxygenDeploymentData).toHaveBeenCalledWith({
       root: "./",
       flagShop: "snowdevil.myshopify.com"
     });
-    expect(getOxygenDeploymentToken).toHaveBeenCalledTimes(1);
+    expect(getOxygenDeploymentData).toHaveBeenCalledTimes(1);
   });
   it("calls createDeploy with the correct parameters", async () => {
     await oxygenDeploy(deployParams);
-    const expectedConfig = {
-      assetsDir: "dist/client",
-      deploymentUrl: "https://oxygen.shopifyapps.com",
-      deploymentToken: mockToken,
-      healthCheckMaxDuration: 180,
-      metadata: {
-        url: deployParams.metadataUrl,
-        user: deployParams.metadataUser,
-        version: deployParams.metadataVersion
-      },
-      publicDeployment: deployParams.publicDeployment,
-      skipHealthCheck: false,
-      rootPath: deployParams.path,
-      skipBuild: false,
-      workerOnly: false,
-      workerDir: "dist/worker"
-    };
     expect(vi.mocked(createDeploy)).toHaveBeenCalledWith({
       config: expectedConfig,
-      hooks: {
-        buildFunction: expect.any(Function),
-        onHealthCheckComplete: expect.any(Function),
-        onUploadFilesStart: expect.any(Function),
-        onUploadFilesComplete: expect.any(Function),
-        onHealthCheckError: expect.any(Function),
-        onUploadFilesError: expect.any(Function)
-      },
+      hooks: expectedHooks,
+      logger: deploymentLogger
+    });
+    expect(vi.mocked(renderSuccess)).toHaveBeenCalled;
+  });
+  it("calls createDeploy with the checked out branch name", async () => {
+    vi.mocked(getLatestGitCommit).mockResolvedValue({
+      hash: "123",
+      message: "test commit",
+      date: "2021-01-01",
+      author_name: "test author",
+      author_email: "test@author.com",
+      body: "test body",
+      refs: "HEAD -> main"
+    });
+    await oxygenDeploy(deployParams);
+    expect(vi.mocked(createDeploy)).toHaveBeenCalledWith({
+      config: { ...expectedConfig, environmentTag: "main" },
+      hooks: expectedHooks,
       logger: deploymentLogger
     });
     expect(vi.mocked(renderSuccess)).toHaveBeenCalled;
   });
+  it("calls renderSelectPrompt when there are multiple environments", async () => {
+    vi.mocked(getOxygenDeploymentData).mockResolvedValue({
+      oxygenDeploymentToken: "some-encoded-token",
+      environments: [
+        { name: "production", branch: "main" },
+        { name: "preview", branch: "staging" }
+      ]
+    });
+    await oxygenDeploy(deployParams);
+    expect(vi.mocked(renderSelectPrompt)).toHaveBeenCalledWith({
+      message: "Select an environment to deploy to",
+      choices: [
+        { label: "production", value: "main" },
+        { label: "preview", value: "staging" }
+      ]
+    });
+  });
   it("handles error during uploadFiles", async () => {
     const mockRenderFatalError = vi.fn();
     vi.mocked(renderFatalError).mockImplementation(mockRenderFatalError);
@@ -156,14 +208,14 @@ describe("deploy", () => {
       }
     }
   });
-  it("handles error during health check", async () => {
+  it("handles error during deployment verification", async () => {
     const mockRenderFatalError = vi.fn();
     vi.mocked(renderFatalError).mockImplementation(mockRenderFatalError);
     const error = new Error("Cloudflare is down!");
     vi.mocked(createDeploy).mockImplementation((options) => {
       options.hooks?.onUploadFilesStart?.();
       options.hooks?.onUploadFilesComplete?.();
-      options.hooks?.onHealthCheckError?.(error);
+      options.hooks?.onVerificationError?.(error);
       return new Promise((_resolve, reject) => {
         reject(error);
       });

package/dist/generator-templates/starter/app/components/Search.tsx

@@ -151,7 +151,7 @@ export function SearchResults({
 function SearchResultsProductsGrid({products}: Pick<SearchQuery, 'products'>) {
   return (
     <div className="search-result">
-      <h3>Products</h3>
+      <h2>Products</h2>
       <Pagination connection={products}>
         {({nodes, isLoading, NextLink, PreviousLink}) => {
           const itemsMarkup = nodes.map((product) => (

package/dist/generator-templates/starter/app/routes/discount.$code.tsx

@@ -17,9 +17,14 @@ export async function loader({request, context, params}: LoaderArgs) {
 
   const url = new URL(request.url);
   const searchParams = new URLSearchParams(url.search);
-  const redirectParam =
+  let redirectParam =
     searchParams.get('redirect') || searchParams.get('return_to') || '/';
 
+  if (redirectParam.includes('//')) {
+    // Avoid redirecting to external URLs to prevent phishing attacks
+    redirectParam = '/';
+  }
+
   searchParams.delete('redirect');
   searchParams.delete('return_to');
 

package/dist/generator-templates/starter/package.json

@@ -15,9 +15,9 @@
   "dependencies": {
     "@remix-run/react": "1.19.1",
     "@shopify/cli": "3.49.2",
-    "@shopify/cli-hydrogen": "^5.4.0",
-    "@shopify/hydrogen": "^2023.7.9",
-    "@shopify/remix-oxygen": "^1.1.4",
+    "@shopify/cli-hydrogen": "^5.4.2",
+    "@shopify/hydrogen": "^2023.7.10",
+    "@shopify/remix-oxygen": "^1.1.6",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^3.6.6",

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/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/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.4.0",
+  "version": "5.4.2",
   "commands": {
     "hydrogen:build": {
       "id": "hydrogen:build",
@@ -153,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",
@@ -166,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,

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "5.4.0",
+  "version": "5.4.2",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -38,7 +38,7 @@
     "@shopify/cli-kit": "3.49.2",
     "@shopify/hydrogen-codegen": "^0.0.2",
     "@shopify/mini-oxygen": "^2.2.1",
-    "@shopify/oxygen-cli": "^1.12.0",
+    "@shopify/oxygen-cli": "^2.0.0",
     "ansi-escapes": "^6.2.0",
     "diff": "^5.1.0",
     "fs-extra": "^11.1.0",
@@ -57,7 +57,7 @@
     "@remix-run/dev": "1.19.1",
     "@remix-run/react": "1.19.1",
     "@shopify/hydrogen-react": "^2023.7.4",
-    "@shopify/remix-oxygen": "^1.1.4"
+    "@shopify/remix-oxygen": "^1.1.6"
   },
   "peerDependenciesMeta": {
     "@remix-run/dev": {