@shopify/cli-hydrogen 4.2.1 → 5.0.1

package/dist/commands/hydrogen/build.d.ts

@@ -6,7 +6,7 @@ declare class Build extends Command {
     static flags: {
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         sourcemap: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
-        "disable-route-warning": _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        'disable-route-warning': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         base: _oclif_core_lib_interfaces_parser_js.OptionFlag<unknown, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         entry: _oclif_core_lib_interfaces_parser_js.OptionFlag<unknown, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         target: _oclif_core_lib_interfaces_parser_js.OptionFlag<unknown, _oclif_core_lib_interfaces_parser_js.CustomOptions>;

package/dist/commands/hydrogen/build.js

@@ -1,26 +1,23 @@
 import path from 'path';
+import { Flags } from '@oclif/core';
+import Command from '@shopify/cli-kit/node/base-command';
 import { outputInfo, outputContent, outputToken, outputWarn } from '@shopify/cli-kit/node/output';
 import { rmdir, fileSize, copyFile } from '@shopify/cli-kit/node/fs';
+import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
+import colors from '@shopify/cli-kit/node/colors';
 import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
 import { commonFlags, deprecated, flagsToCamelObject } from '../../lib/flags.js';
-import Command from '@shopify/cli-kit/node/base-command';
-import { Flags } from '@oclif/core';
 import { checkLockfileStatus } from '../../lib/check-lockfile.js';
 import { findMissingRoutes } from '../../lib/missing-routes.js';
-import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
-import { colors } from '../../lib/colors.js';
+import { warnOnce } from '../../lib/log.js';
 
 const LOG_WORKER_BUILT = "\u{1F4E6} Worker built";
 class Build extends Command {
   static description = "Builds a Hydrogen storefront for production.";
   static flags = {
     path: commonFlags.path,
-    sourcemap: Flags.boolean({
-      description: "Generate sourcemaps for the build.",
-      env: "SHOPIFY_HYDROGEN_FLAG_SOURCEMAP",
-      default: true
-    }),
-    ["disable-route-warning"]: Flags.boolean({
+    sourcemap: commonFlags.sourcemap,
+    "disable-route-warning": Flags.boolean({
       description: "Disable warning about missing standard routes.",
       env: "SHOPIFY_HYDROGEN_FLAG_DISABLE_ROUTE_WARNING"
     }),
@@ -45,23 +42,28 @@ async function runBuild({
   const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(appPath);
   await checkLockfileStatus(root);
   console.time(LOG_WORKER_BUILT);
-  const [remixConfig] = await Promise.all([
+  outputInfo(`
+\u{1F3D7}\uFE0F  Building in ${process.env.NODE_ENV} mode...`);
+  const [remixConfig, { build }, { logThrown }, { createFileWatchCache }] = await Promise.all([
     getRemixConfig(root),
+    import('@remix-run/dev/dist/compiler/build.js'),
+    import('@remix-run/dev/dist/compiler/utils/log.js'),
+    import('@remix-run/dev/dist/compiler/fileWatchCache.js'),
     rmdir(buildPath, { force: true })
   ]);
-  outputInfo(`
-\u{1F3D7}\uFE0F  Building in ${process.env.NODE_ENV} mode...`);
-  const { build } = await import('@remix-run/dev/dist/compiler/build.js');
-  const { logCompileFailure } = await import('@remix-run/dev/dist/compiler/onCompileFailure.js');
   await Promise.all([
     copyPublicFiles(publicPath, buildPathClient),
-    build(remixConfig, {
-      mode: process.env.NODE_ENV,
-      sourcemap,
-      onCompileFailure: (failure) => {
-        logCompileFailure(failure);
-        throw Error();
-      }
+    build({
+      config: remixConfig,
+      options: {
+        mode: process.env.NODE_ENV,
+        onWarning: warnOnce,
+        sourcemap
+      },
+      fileWatchCache: createFileWatchCache()
+    }).catch((thrown) => {
+      logThrown(thrown);
+      process.exit(1);
     })
   ]);
   if (process.env.NODE_ENV !== "development") {

package/dist/commands/hydrogen/check.js

@@ -29,7 +29,7 @@ class GenerateRoute extends Command {
   }
 }
 async function runCheckRoutes({ directory }) {
-  const remixConfig = await getRemixConfig(directory);
+  const remixConfig = await getRemixConfig(directory, true);
   logMissingRoutes(findMissingRoutes(remixConfig));
 }
 

package/dist/commands/hydrogen/codegen-unstable.d.ts

@@ -6,6 +6,7 @@ declare class Codegen extends Command {
     static flags: {
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         "codegen-config-path": _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        "force-sfapi-version": _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         watch: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/hydrogen/codegen-unstable.js

@@ -15,6 +15,10 @@ class Codegen extends Command {
       description: "Specify a path to a codegen configuration file. Defaults to `<root>/codegen.ts` if it exists.",
       required: false
     }),
+    ["force-sfapi-version"]: Flags.string({
+      description: "Force generating Storefront API types for a specific version instead of using the one provided in Hydrogen. A token can also be provided with this format: `<version>:<token>`.",
+      hidden: true
+    }),
     watch: Flags.boolean({
       description: "Watch the project for changes to update types on file save.",
       required: false,
@@ -33,6 +37,7 @@ class Codegen extends Command {
 async function runCodegen({
   path: appPath,
   codegenConfigPath,
+  forceSfapiVersion,
   watch
 }) {
   const { root } = getProjectPaths(appPath);
@@ -42,6 +47,7 @@ async function runCodegen({
     const generatedFiles = await generateTypes({
       ...remixConfig,
       configFilePath: codegenConfigPath,
+      forceSfapiVersion,
       watch
     });
     if (!watch) {

package/dist/commands/hydrogen/dev.d.ts

@@ -8,7 +8,8 @@ declare class Dev extends Command {
         port: _oclif_core_lib_interfaces_parser_js.OptionFlag<number, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         "codegen-unstable": _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         "codegen-config-path": _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
-        "disable-virtual-routes": _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        sourcemap: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        'disable-virtual-routes': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         shop: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         debug: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         host: _oclif_core_lib_interfaces_parser_js.OptionFlag<unknown, _oclif_core_lib_interfaces_parser_js.CustomOptions>;

package/dist/commands/hydrogen/dev.js

@@ -2,16 +2,16 @@ import path from 'path';
 import fs from 'fs/promises';
 import { outputInfo } from '@shopify/cli-kit/node/output';
 import { fileExists } from '@shopify/cli-kit/node/fs';
+import { renderFatalError } from '@shopify/cli-kit/node/ui';
 import { copyPublicFiles } from './build.js';
 import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
-import { muteDevLogs } from '../../lib/log.js';
+import { muteDevLogs, warnOnce } from '../../lib/log.js';
 import { commonFlags, deprecated, flagsToCamelObject } from '../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
 import { Flags } from '@oclif/core';
 import { startMiniOxygen } from '../../lib/mini-oxygen.js';
 import { checkHydrogenVersion } from '../../lib/check-version.js';
 import { addVirtualRoutes } from '../../lib/virtual-routes.js';
-import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { combinedEnvironmentVariables } from '../../lib/combined-environment-variables.js';
 import { getConfig } from '../../lib/shopify-config.js';
 
@@ -33,7 +33,8 @@ class Dev extends Command {
       required: false,
       dependsOn: ["codegen-unstable"]
     }),
-    ["disable-virtual-routes"]: Flags.boolean({
+    sourcemap: commonFlags.sourcemap,
+    "disable-virtual-routes": Flags.boolean({
       description: "Disable rendering fallback routes when a route file doesn't exist.",
       env: "SHOPIFY_HYDROGEN_FLAG_DISABLE_VIRTUAL_ROUTES",
       default: false
@@ -65,7 +66,8 @@ async function runDev({
   disableVirtualRoutes,
   shop,
   envBranch,
-  debug = false
+  debug = false,
+  sourcemap = true
 }) {
   if (!process.env.NODE_ENV)
     process.env.NODE_ENV = "development";
@@ -91,9 +93,9 @@ async function runDev({
     shop,
     envBranch
   }) : void 0;
-  let miniOxygenStarted = false;
+  let isMiniOxygenStarted = false;
   async function safeStartMiniOxygen() {
-    if (miniOxygenStarted)
+    if (isMiniOxygenStarted)
       return;
     await startMiniOxygen({
       root,
@@ -103,75 +105,93 @@ async function runDev({
       buildPathClient,
       environmentVariables
     });
-    miniOxygenStarted = true;
+    isMiniOxygenStarted = true;
     const showUpgrade = await checkingHydrogenVersion;
     if (showUpgrade)
       showUpgrade();
   }
-  const { watch } = await import('@remix-run/dev/dist/compiler/watch.js');
-  const remixConfig = await reloadConfig();
-  if (codegen) {
-    spawnCodegenProcess({ ...remixConfig, configFilePath: codegenConfigPath });
-  }
-  await watch(remixConfig, {
-    reloadConfig,
-    mode: process.env.NODE_ENV,
-    async onInitialBuild() {
-      await copyingFiles;
-      if (!await serverBundleExists()) {
-        const { renderFatalError } = await import('@shopify/cli-kit/node/ui');
-        return renderFatalError({
-          name: "BuildError",
-          type: 0,
-          message: "MiniOxygen cannot start because the server bundle has not been generated.",
-          tryMessage: "This is likely due to an error in your app and Remix is unable to compile. Try fixing the app and MiniOxygen will start."
-        });
-      }
-      console.timeEnd(LOG_INITIAL_BUILD);
-      await safeStartMiniOxygen();
+  let isInitialBuild = true;
+  const [{ watch }, { createFileWatchCache }] = await Promise.all([
+    import('@remix-run/dev/dist/compiler/watch.js'),
+    import('@remix-run/dev/dist/compiler/fileWatchCache.js')
+  ]);
+  const fileWatchCache = createFileWatchCache();
+  await watch(
+    {
+      config: await reloadConfig(),
+      options: {
+        mode: process.env.NODE_ENV,
+        onWarning: warnOnce,
+        sourcemap
+      },
+      fileWatchCache
     },
-    async onFileCreated(file) {
-      const [relative, absolute] = getFilePaths(file);
-      outputInfo(`
+    {
+      reloadConfig,
+      onBuildStart() {
+        if (isInitialBuild) {
+          console.time(LOG_INITIAL_BUILD);
+        } else {
+          console.time(LOG_REBUILT);
+          outputInfo(LOG_REBUILDING);
+        }
+      },
+      async onBuildFinish() {
+        if (isInitialBuild) {
+          await copyingFiles;
+          console.timeEnd(LOG_INITIAL_BUILD);
+          isInitialBuild = false;
+        } else {
+          console.timeEnd(LOG_REBUILT);
+          if (!isMiniOxygenStarted)
+            console.log("");
+        }
+        if (!isMiniOxygenStarted) {
+          if (!await serverBundleExists()) {
+            return renderFatalError({
+              name: "BuildError",
+              type: 0,
+              message: "MiniOxygen cannot start because the server bundle has not been generated.",
+              tryMessage: "This is likely due to an error in your app and Remix is unable to compile. Try fixing the app and MiniOxygen will start."
+            });
+          }
+          await safeStartMiniOxygen();
+        }
+      },
+      async onFileCreated(file) {
+        const [relative, absolute] = getFilePaths(file);
+        outputInfo(`
 \u{1F4C4} File created: ${relative}`);
-      if (absolute.startsWith(publicPath)) {
-        await copyPublicFiles(
-          absolute,
-          absolute.replace(publicPath, buildPathClient)
-        );
-      }
-    },
-    async onFileChanged(file) {
-      const [relative, absolute] = getFilePaths(file);
-      outputInfo(`
+        if (absolute.startsWith(publicPath)) {
+          await copyPublicFiles(
+            absolute,
+            absolute.replace(publicPath, buildPathClient)
+          );
+        }
+      },
+      async onFileChanged(file) {
+        fileWatchCache.invalidateFile(file);
+        const [relative, absolute] = getFilePaths(file);
+        outputInfo(`
 \u{1F4C4} File changed: ${relative}`);
-      if (absolute.startsWith(publicPath)) {
-        await copyPublicFiles(
-          absolute,
-          absolute.replace(publicPath, buildPathClient)
-        );
-      }
-    },
-    async onFileDeleted(file) {
-      const [relative, absolute] = getFilePaths(file);
-      outputInfo(`
+        if (absolute.startsWith(publicPath)) {
+          await copyPublicFiles(
+            absolute,
+            absolute.replace(publicPath, buildPathClient)
+          );
+        }
+      },
+      async onFileDeleted(file) {
+        fileWatchCache.invalidateFile(file);
+        const [relative, absolute] = getFilePaths(file);
+        outputInfo(`
 \u{1F4C4} File deleted: ${relative}`);
-      if (absolute.startsWith(publicPath)) {
-        await fs.unlink(absolute.replace(publicPath, buildPathClient));
-      }
-    },
-    onRebuildStart() {
-      outputInfo(LOG_REBUILDING);
-      console.time(LOG_REBUILT);
-    },
-    async onRebuildFinish() {
-      console.timeEnd(LOG_REBUILT);
-      if (!miniOxygenStarted && await serverBundleExists()) {
-        console.log("");
-        await safeStartMiniOxygen();
+        if (absolute.startsWith(publicPath)) {
+          await fs.unlink(absolute.replace(publicPath, buildPathClient));
+        }
       }
     }
-  });
+  );
 }
 
 export { Dev as default };

package/dist/commands/hydrogen/env/list.d.ts

@@ -1,9 +1,8 @@
 import * as _oclif_core_lib_interfaces_parser_js from '@oclif/core/lib/interfaces/parser.js';
 import Command from '@shopify/cli-kit/node/base-command';
 
-declare class List extends Command {
+declare class EnvList extends Command {
     static description: string;
-    static hidden: boolean;
     static flags: {
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         shop: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
@@ -16,4 +15,4 @@ interface Flags {
 }
 declare function listEnvironments({ path, shop: flagShop }: Flags): Promise<void>;
 
-export { List as default, listEnvironments };
+export { EnvList as default, listEnvironments };

package/dist/commands/hydrogen/env/list.js

@@ -1,24 +1,24 @@
 import Command from '@shopify/cli-kit/node/base-command';
-import { renderConfirmationPrompt, renderTable } from '@shopify/cli-kit/node/ui';
-import { outputContent, outputToken, outputNewline } from '@shopify/cli-kit/node/output';
+import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
+import { pluralize } from '@shopify/cli-kit/common/string';
+import colors from '@shopify/cli-kit/node/colors';
+import { outputContent, outputToken, outputNewline, outputInfo } from '@shopify/cli-kit/node/output';
 import { linkStorefront } from '../link.js';
-import { adminRequest } from '../../../lib/graphql.js';
 import { commonFlags } from '../../../lib/flags.js';
 import { getHydrogenShop } from '../../../lib/shop.js';
 import { getAdminSession } from '../../../lib/admin-session.js';
-import { ListEnvironmentsQuery } from '../../../lib/graphql/admin/list-environments.js';
+import { getStorefrontEnvironments } from '../../../lib/graphql/admin/list-environments.js';
 import { getConfig } from '../../../lib/shopify-config.js';
 import { renderMissingLink, renderMissingStorefront } from '../../../lib/render-errors.js';
 
-class List extends Command {
-  static description = "List the environments on your Hydrogen storefront.";
-  static hidden = true;
+class EnvList extends Command {
+  static description = "List the environments on your linked Hydrogen storefront.";
   static flags = {
     path: commonFlags.path,
     shop: commonFlags.shop
   };
   async run() {
-    const { flags } = await this.parse(List);
+    const { flags } = await this.parse(EnvList);
     await listEnvironments(flags);
   }
 }
@@ -43,54 +43,52 @@ async function listEnvironments({ path, shop: flagShop }) {
   if (!configStorefront) {
     return;
   }
-  const result = await adminRequest(
-    ListEnvironmentsQuery,
+  const { storefront } = await getStorefrontEnvironments(
     adminSession,
-    {
-      id: configStorefront.id
-    }
+    configStorefront.id
   );
-  const hydrogenStorefront = result.hydrogenStorefront;
-  if (!hydrogenStorefront) {
+  if (!storefront) {
     renderMissingStorefront({ adminSession, storefront: configStorefront });
     return;
   }
-  const previewEnvironmentIndex = hydrogenStorefront.environments.findIndex(
+  const previewEnvironmentIndex = storefront.environments.findIndex(
     (env) => env.type === "PREVIEW"
   );
-  const previewEnvironment = hydrogenStorefront.environments.splice(
+  const previewEnvironment = storefront.environments.splice(
     previewEnvironmentIndex,
     1
   );
-  hydrogenStorefront.environments.push(previewEnvironment[0]);
-  const rows = hydrogenStorefront.environments.map(
-    ({ branch, name, url, type }) => {
-      const environmentUrl = type === "PRODUCTION" ? hydrogenStorefront.productionUrl : url;
-      return {
-        name,
-        branch: branch ? branch : "-",
-        url: environmentUrl ? environmentUrl : "-"
-      };
-    }
-  );
+  storefront.environments.push(previewEnvironment[0]);
   outputNewline();
-  renderTable({
-    rows,
-    columns: {
-      name: {
-        header: "Name",
-        color: "whiteBright"
-      },
-      branch: {
-        header: "Branch",
-        color: "yellow"
-      },
-      url: {
-        header: "URL",
-        color: "green"
-      }
+  outputInfo(
+    pluralizedEnvironments({
+      environments: storefront.environments,
+      storefrontTitle: configStorefront.title
+    }).toString()
+  );
+  storefront.environments.forEach(({ name, branch, type, url }) => {
+    outputNewline();
+    const environmentUrl = type === "PRODUCTION" ? storefront.productionUrl : url;
+    outputInfo(
+      outputContent`${colors.whiteBright(name)}${branch ? ` ${colors.dim(`(Branch: ${branch})`)}` : ""}`.value
+    );
+    if (environmentUrl) {
+      outputInfo(
+        outputContent`    ${colors.whiteBright(environmentUrl)}`.value
+      );
     }
   });
 }
+const pluralizedEnvironments = ({
+  environments,
+  storefrontTitle
+}) => {
+  return pluralize(
+    environments,
+    (environments2) => `Showing ${environments2.length} environments for the Hydrogen storefront ${storefrontTitle}`,
+    (_environment) => `Showing 1 environment for the Hydrogen storefront ${storefrontTitle}`,
+    () => `There are no environments for the Hydrogen storefront ${storefrontTitle}`
+  );
+};
 
-export { List as default, listEnvironments };
+export { EnvList as default, listEnvironments };

package/dist/commands/hydrogen/env/list.test.js

@@ -2,14 +2,14 @@ import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest';
 import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
 import { inTemporaryDirectory } from '@shopify/cli-kit/node/fs';
 import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
-import { ListEnvironmentsQuery } from '../../../lib/graphql/admin/list-environments.js';
+import { getStorefrontEnvironments } from '../../../lib/graphql/admin/list-environments.js';
 import { getAdminSession } from '../../../lib/admin-session.js';
-import { adminRequest } from '../../../lib/graphql.js';
 import { getConfig } from '../../../lib/shopify-config.js';
 import { renderMissingLink, renderMissingStorefront } from '../../../lib/render-errors.js';
 import { linkStorefront } from '../link.js';
 import { listEnvironments } from './list.js';
 
+const SHOP = "my-shop";
 vi.mock("@shopify/cli-kit/node/ui", async () => {
   const original = await vi.importActual("@shopify/cli-kit/node/ui");
   return {
@@ -21,20 +21,16 @@ vi.mock("../link.js");
 vi.mock("../../../lib/admin-session.js");
 vi.mock("../../../lib/shopify-config.js");
 vi.mock("../../../lib/render-errors.js");
-vi.mock("../../../lib/graphql.js", async () => {
-  const original = await vi.importActual("../../../lib/graphql.js");
-  return {
-    ...original,
-    adminRequest: vi.fn()
-  };
+vi.mock("../../../lib/graphql/admin/list-environments.js", () => {
+  return { getStorefrontEnvironments: vi.fn() };
 });
 vi.mock("../../../lib/shop.js", () => ({
-  getHydrogenShop: () => "my-shop"
+  getHydrogenShop: () => SHOP
 }));
 describe("listEnvironments", () => {
   const ADMIN_SESSION = {
     token: "abc123",
-    storeFqdn: "my-shop"
+    storeFqdn: SHOP
   };
   const PRODUCTION_ENVIRONMENT = {
     id: "gid://shopify/HydrogenStorefrontEnvironment/1",
@@ -68,8 +64,8 @@ describe("listEnvironments", () => {
         title: "Existing Link"
       }
     });
-    vi.mocked(adminRequest).mockResolvedValue({
-      hydrogenStorefront: {
+    vi.mocked(getStorefrontEnvironments).mockResolvedValue({
+      storefront: {
         id: "gid://shopify/HydrogenStorefront/1",
         productionUrl: "https://example.com",
         environments: [
@@ -87,12 +83,9 @@ describe("listEnvironments", () => {
   it("makes a GraphQL call to fetch environment variables", async () => {
     await inTemporaryDirectory(async (tmpDir) => {
       await listEnvironments({ path: tmpDir });
-      expect(adminRequest).toHaveBeenCalledWith(
-        ListEnvironmentsQuery,
+      expect(getStorefrontEnvironments).toHaveBeenCalledWith(
         ADMIN_SESSION,
-        {
-          id: "gid://shopify/HydrogenStorefront/1"
-        }
+        "gid://shopify/HydrogenStorefront/1"
       );
     });
   });
@@ -101,12 +94,13 @@ describe("listEnvironments", () => {
       const output = mockAndCaptureOutput();
       await listEnvironments({ path: tmpDir });
       expect(output.info()).toMatch(
-        /Production\s*main\s*https:\/\/example\.com/
-      );
-      expect(output.info()).toMatch(
-        /Staging\s*staging\s*https:\/\/oxygen-456\.example\.com/
+        /Showing 3 environments for the Hydrogen storefront Existing Link/
       );
-      expect(output.info()).toMatch(/Preview\s*-\s*-/);
+      expect(output.info()).toMatch(/Production \(Branch: main\)/);
+      expect(output.info()).toMatch(/https:\/\/example\.com/);
+      expect(output.info()).toMatch(/Staging \(Branch: staging\)/);
+      expect(output.info()).toMatch(/https:\/\/oxygen-456\.example\.com/);
+      expect(output.info()).toMatch(/Preview/);
     });
   });
   describe("when there is no linked storefront", () => {
@@ -137,8 +131,8 @@ describe("listEnvironments", () => {
   });
   describe("when there is no matching storefront in the shop", () => {
     beforeEach(() => {
-      vi.mocked(adminRequest).mockResolvedValue({
-        hydrogenStorefront: null
+      vi.mocked(getStorefrontEnvironments).mockResolvedValue({
+        storefront: null
       });
     });
     it("calls renderMissingStorefront", async () => {

package/dist/commands/hydrogen/env/pull.d.ts

@@ -1,9 +1,8 @@
 import * as _oclif_core_lib_interfaces_parser_js from '@oclif/core/lib/interfaces/parser.js';
 import Command from '@shopify/cli-kit/node/base-command';
 
-declare class Pull extends Command {
+declare class EnvPull extends Command {
     static description: string;
-    static hidden: boolean;
     static flags: {
         "env-branch": _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
@@ -20,4 +19,4 @@ interface Flags {
 }
 declare function pullVariables({ envBranch, force, path, shop: flagShop, }: Flags): Promise<void>;
 
-export { Pull as default, pullVariables };
+export { EnvPull as default, pullVariables };