@shopify/cli-hydrogen 4.2.1 → 5.0.0

package/dist/lib/combined-environment-variables.test.js

@@ -49,7 +49,7 @@ describe("combinedEnvironmentVariables()", () => {
       const outputMock = mockAndCaptureOutput();
       await combinedEnvironmentVariables({ root: tmpDir, shop: "my-shop" });
       expect(outputMock.info()).toMatch(
-        /Injecting environment variables into MiniOxygen/
+        /Environment variables injected into MiniOxygen:/
       );
     });
   });
@@ -57,7 +57,7 @@ describe("combinedEnvironmentVariables()", () => {
     await inTemporaryDirectory(async (tmpDir) => {
       const outputMock = mockAndCaptureOutput();
       await combinedEnvironmentVariables({ root: tmpDir, shop: "my-shop" });
-      expect(outputMock.info()).toMatch(/Using PUBLIC_API_TOKEN from Hydrogen/);
+      expect(outputMock.info()).toMatch(/PUBLIC_API_TOKEN\s+from Oxygen/);
     });
   });
   describe("when one of the variables is a secret", () => {
@@ -76,7 +76,7 @@ describe("combinedEnvironmentVariables()", () => {
         const outputMock = mockAndCaptureOutput();
         await combinedEnvironmentVariables({ root: tmpDir, shop: "my-shop" });
         expect(outputMock.info()).toMatch(
-          /Ignoring PUBLIC_API_TOKEN \(value is marked as secret\)/
+          /PUBLIC_API_TOKEN\s+from Oxygen \(Marked as secret\)/
         );
       });
     });
@@ -88,7 +88,7 @@ describe("combinedEnvironmentVariables()", () => {
         await writeFile(filePath, "LOCAL_TOKEN=1");
         const outputMock = mockAndCaptureOutput();
         await combinedEnvironmentVariables({ root: tmpDir });
-        expect(outputMock.info()).toMatch(/Using LOCAL_TOKEN from \.env/);
+        expect(outputMock.info()).toMatch(/LOCAL_TOKEN\s+from local \.env/);
       });
     });
     describe("and they overwrite remote variables", () => {
@@ -98,11 +98,11 @@ describe("combinedEnvironmentVariables()", () => {
           await writeFile(filePath, "PUBLIC_API_TOKEN=abc");
           const outputMock = mockAndCaptureOutput();
           await combinedEnvironmentVariables({ root: tmpDir, shop: "my-shop" });
-          expect(outputMock.info()).toMatch(
-            /Ignoring PUBLIC_API_TOKEN \(overwritten via \.env\)/
+          expect(outputMock.info()).not.toMatch(
+            /PUBLIC_API_TOKEN\s+from Oxygen/
           );
           expect(outputMock.info()).toMatch(
-            /Using PUBLIC_API_TOKEN from \.env/
+            /PUBLIC_API_TOKEN\s+from local \.env/
           );
         });
       });

package/dist/lib/config.d.ts

@@ -8,7 +8,7 @@ declare function getProjectPaths(appPath?: string, entry?: string): {
     buildPathWorkerFile: string;
     publicPath: string;
 };
-declare function getRemixConfig(root: string, mode?: ServerMode): Promise<RemixConfig & {
+declare function getRemixConfig(root: string, skipOxygenChecks?: boolean, mode?: ServerMode): Promise<RemixConfig & {
     serverConditions?: string[] | undefined;
     serverMainFields?: string[] | undefined;
     serverDependenciesToBundle?: string | undefined;

package/dist/lib/config.js

@@ -23,72 +23,76 @@ function getProjectPaths(appPath, entry) {
     publicPath
   };
 }
-async function getRemixConfig(root, mode = process.env.NODE_ENV) {
+async function getRemixConfig(root, skipOxygenChecks = false, mode = process.env.NODE_ENV) {
   const { readConfig } = await import('@remix-run/dev/dist/config.js');
   const config = await readConfig(root, mode);
-  if (!config.serverEntryPoint) {
-    throwConfigError(
-      "Could not find a server entry point.",
-      "Please add a server option to your remix.config.js pointing to an Oxygen worker entry file."
-    );
-  } else {
-    assertEntryFileExists(config.rootDirectory, config.serverEntryPoint);
-  }
-  if (config.serverPlatform !== "neutral") {
-    throwConfigError(
-      'The serverPlatform in remix.config.js must be "neutral".'
-    );
-  }
-  if (config.serverModuleFormat !== "esm") {
-    throwConfigError(
-      'The serverModuleFormat in remix.config.js must be "esm".'
-    );
-  }
-  if (config.serverDependenciesToBundle !== "all") {
-    throwConfigError(
-      'The serverDependenciesToBundle in remix.config.js must be "all".'
-    );
-  }
-  if (!config.serverConditions?.includes("worker")) {
-    throwConfigError(
-      'The serverConditions in remix.config.js must include "worker".'
-    );
-  }
-  if (process.env.NODE_ENV === "development" && !config.serverConditions?.includes("development")) {
-    outputWarn(
-      "Add `process.env.NODE_ENV` value to serverConditions in remix.config.js to enable debugging features in development."
-    );
-  }
-  if (!config.serverMainFields || !oxygenServerMainFields.every((v, i) => config.serverMainFields?.[i] === v)) {
-    throwConfigError(
-      `The serverMainFields in remix.config.js must be ${JSON.stringify(
-        oxygenServerMainFields
-      )}.`
-    );
-  }
-  const cdnUrl = process.env.HYDROGEN_ASSET_BASE_URL;
-  if (cdnUrl && !config.publicPath.startsWith(cdnUrl)) {
-    throwConfigError(
-      "The publicPath in remix.config.js must be prepended with the value of `process.env.HYDROGEN_ASSET_BASE_URL`."
-    );
-  }
-  const expectedServerBuildPath = path.join(
-    BUILD_DIR,
-    WORKER_SUBDIR,
-    "index.js"
-  );
-  if (config.serverBuildPath !== path.resolve(root, expectedServerBuildPath)) {
-    throwConfigError(
-      `The serverBuildPath in remix.config.js must be "${expectedServerBuildPath}".`
-    );
-  }
-  const expectedAssetsBuildDirectory = path.join(BUILD_DIR, CLIENT_SUBDIR);
-  if (!config.assetsBuildDirectory.startsWith(
-    path.resolve(root, expectedAssetsBuildDirectory)
-  )) {
-    throwConfigError(
-      `The assetsBuildDirectory in remix.config.js must be in "${expectedAssetsBuildDirectory}".`
+  if (!skipOxygenChecks) {
+    if (!config.serverEntryPoint) {
+      throwConfigError(
+        "Could not find a server entry point.",
+        "Please add a server option to your remix.config.js pointing to an Oxygen worker entry file."
+      );
+    } else {
+      assertEntryFileExists(config.rootDirectory, config.serverEntryPoint);
+    }
+    if (config.serverPlatform !== "neutral") {
+      throwConfigError(
+        'The serverPlatform in remix.config.js must be "neutral".'
+      );
+    }
+    if (config.serverModuleFormat !== "esm") {
+      throwConfigError(
+        'The serverModuleFormat in remix.config.js must be "esm".'
+      );
+    }
+    if (config.serverDependenciesToBundle !== "all") {
+      throwConfigError(
+        'The serverDependenciesToBundle in remix.config.js must be "all".'
+      );
+    }
+    if (!config.serverConditions?.includes("worker")) {
+      throwConfigError(
+        'The serverConditions in remix.config.js must include "worker".'
+      );
+    }
+    if (process.env.NODE_ENV === "development" && !config.serverConditions?.includes("development")) {
+      outputWarn(
+        "Add `process.env.NODE_ENV` value to serverConditions in remix.config.js to enable debugging features in development."
+      );
+    }
+    if (!config.serverMainFields || !oxygenServerMainFields.every(
+      (v, i) => config.serverMainFields?.[i] === v
+    )) {
+      throwConfigError(
+        `The serverMainFields in remix.config.js must be ${JSON.stringify(
+          oxygenServerMainFields
+        )}.`
+      );
+    }
+    const cdnUrl = process.env.HYDROGEN_ASSET_BASE_URL;
+    if (cdnUrl && !config.publicPath.startsWith(cdnUrl)) {
+      throwConfigError(
+        "The publicPath in remix.config.js must be prepended with the value of `process.env.HYDROGEN_ASSET_BASE_URL`."
+      );
+    }
+    const expectedServerBuildPath = path.join(
+      BUILD_DIR,
+      WORKER_SUBDIR,
+      "index.js"
     );
+    if (config.serverBuildPath !== path.resolve(root, expectedServerBuildPath)) {
+      throwConfigError(
+        `The serverBuildPath in remix.config.js must be "${expectedServerBuildPath}".`
+      );
+    }
+    const expectedAssetsBuildDirectory = path.join(BUILD_DIR, CLIENT_SUBDIR);
+    if (!config.assetsBuildDirectory.startsWith(
+      path.resolve(root, expectedAssetsBuildDirectory)
+    )) {
+      throwConfigError(
+        `The assetsBuildDirectory in remix.config.js must be in "${expectedAssetsBuildDirectory}".`
+      );
+    }
   }
   if (process.env.LOCAL_DEV) {
     const packagesPath = fileURLToPath(new URL("../../..", import.meta.url));

package/dist/lib/flags.js

@@ -2,7 +2,7 @@ import { Flags } from '@oclif/core';
 import { camelize } from '@shopify/cli-kit/common/string';
 import { renderInfo } from '@shopify/cli-kit/node/ui';
 import { normalizeStoreFqdn } from '@shopify/cli-kit/node/context/fqdn';
-import { colors } from './colors.js';
+import colors from '@shopify/cli-kit/node/colors';
 
 const commonFlags = {
   path: Flags.string({
@@ -28,8 +28,7 @@ const commonFlags = {
   ["env-branch"]: Flags.string({
     description: "Specify an environment's branch name when using remote environment variables.",
     env: "SHOPIFY_HYDROGEN_ENVIRONMENT_BRANCH",
-    char: "e",
-    hidden: true
+    char: "e"
   })
 };
 function flagsToCamelObject(obj) {

package/dist/lib/graphql/admin/link-storefront.d.ts

@@ -1,11 +1,14 @@
+import { AdminSession } from '@shopify/cli-kit/node/session';
+
 declare const LinkStorefrontQuery = "#graphql\n  query LinkStorefront {\n    hydrogenStorefronts {\n      id\n      title\n      productionUrl\n    }\n  }\n";
-interface HydrogenStorefront {
-    id: string;
-    title: string;
-    productionUrl: string;
-}
-interface LinkStorefrontSchema {
-    hydrogenStorefronts: HydrogenStorefront[];
-}
+declare function getStorefronts(shop: string): Promise<{
+    adminSession: AdminSession;
+    storefronts: {
+        parsedId: string;
+        id: string;
+        title: string;
+        productionUrl: string;
+    }[];
+}>;
 
-export { LinkStorefrontQuery, LinkStorefrontSchema };
+export { LinkStorefrontQuery, getStorefronts };

package/dist/lib/graphql/admin/link-storefront.js

@@ -1,3 +1,6 @@
+import { adminRequest, parseGid } from '../../graphql.js';
+import { getAdminSession } from '../../admin-session.js';
+
 const LinkStorefrontQuery = `#graphql
   query LinkStorefront {
     hydrogenStorefronts {
@@ -7,5 +10,19 @@ const LinkStorefrontQuery = `#graphql
     }
   }
 `;
+async function getStorefronts(shop) {
+  const adminSession = await getAdminSession(shop);
+  const { hydrogenStorefronts } = await adminRequest(
+    LinkStorefrontQuery,
+    adminSession
+  );
+  return {
+    adminSession,
+    storefronts: hydrogenStorefronts.map((storefront) => ({
+      ...storefront,
+      parsedId: parseGid(storefront.id)
+    }))
+  };
+}
 
-export { LinkStorefrontQuery };
+export { LinkStorefrontQuery, getStorefronts };

package/dist/lib/graphql/admin/list-environments.d.ts

@@ -1,4 +1,5 @@
-declare const ListEnvironmentsQuery = "#graphql\n  query ListStorefronts($id: ID!) {\n    hydrogenStorefront(id: $id) {\n      id\n      productionUrl\n      environments {\n        branch\n        createdAt\n        id\n        name\n        type\n        url\n      }\n    }\n  }\n";
+import { AdminSession } from '@shopify/cli-kit/node/session';
+
 type EnvironmentType = 'PREVIEW' | 'PRODUCTION' | 'CUSTOM';
 interface Environment {
     branch: string | null;
@@ -13,8 +14,8 @@ interface HydrogenStorefront {
     environments: Environment[];
     productionUrl: string;
 }
-interface ListEnvironmentsSchema {
-    hydrogenStorefront: HydrogenStorefront | null;
-}
+declare function getStorefrontEnvironments(adminSession: AdminSession, storefrontId: string): Promise<{
+    storefront: HydrogenStorefront | null;
+}>;
 
-export { Environment, EnvironmentType, ListEnvironmentsQuery, ListEnvironmentsSchema };
+export { Environment, getStorefrontEnvironments };

package/dist/lib/graphql/admin/list-environments.js

@@ -1,3 +1,5 @@
+import { adminRequest } from '../../graphql.js';
+
 const ListEnvironmentsQuery = `#graphql
   query ListStorefronts($id: ID!) {
     hydrogenStorefront(id: $id) {
@@ -14,5 +16,13 @@ const ListEnvironmentsQuery = `#graphql
     }
   }
 `;
+async function getStorefrontEnvironments(adminSession, storefrontId) {
+  const { hydrogenStorefront } = await adminRequest(
+    ListEnvironmentsQuery,
+    adminSession,
+    { id: storefrontId }
+  );
+  return { storefront: hydrogenStorefront };
+}
 
-export { ListEnvironmentsQuery };
+export { getStorefrontEnvironments };

package/dist/lib/graphql/admin/list-storefronts.d.ts

@@ -1,4 +1,5 @@
-declare const ListStorefrontsQuery = "#graphql\n  query ListStorefronts {\n    hydrogenStorefronts {\n      id\n      title\n      productionUrl\n      currentProductionDeployment {\n        id\n        createdAt\n        commitMessage\n      }\n    }\n  }\n";
+import { AdminSession } from '@shopify/cli-kit/node/session';
+
 interface Deployment {
     id: string;
     createdAt: string;
@@ -10,8 +11,15 @@ interface HydrogenStorefront {
     productionUrl?: string;
     currentProductionDeployment: Deployment | null;
 }
-interface ListStorefrontsSchema {
-    hydrogenStorefronts: HydrogenStorefront[];
-}
+declare function getStorefrontsWithDeployment(shop: string): Promise<{
+    adminSession: AdminSession;
+    storefronts: {
+        parsedId: string;
+        id: string;
+        title: string;
+        productionUrl?: string | undefined;
+        currentProductionDeployment: Deployment | null;
+    }[];
+}>;
 
-export { Deployment, ListStorefrontsQuery, ListStorefrontsSchema };
+export { Deployment, HydrogenStorefront, getStorefrontsWithDeployment };

package/dist/lib/graphql/admin/list-storefronts.js

@@ -1,3 +1,6 @@
+import { adminRequest, parseGid } from '../../graphql.js';
+import { getAdminSession } from '../../admin-session.js';
+
 const ListStorefrontsQuery = `#graphql
   query ListStorefronts {
     hydrogenStorefronts {
@@ -12,5 +15,19 @@ const ListStorefrontsQuery = `#graphql
     }
   }
 `;
+async function getStorefrontsWithDeployment(shop) {
+  const adminSession = await getAdminSession(shop);
+  const { hydrogenStorefronts } = await adminRequest(
+    ListStorefrontsQuery,
+    adminSession
+  );
+  return {
+    adminSession,
+    storefronts: hydrogenStorefronts.map((storefront) => ({
+      ...storefront,
+      parsedId: parseGid(storefront.id)
+    }))
+  };
+}
 
-export { ListStorefrontsQuery };
+export { getStorefrontsWithDeployment };

package/dist/lib/graphql/admin/pull-variables.d.ts

@@ -1,3 +1,5 @@
+import { AdminSession } from '@shopify/cli-kit/node/session';
+
 declare const PullVariablesQuery = "#graphql\n  query PullVariables($id: ID!, $branch: String) {\n    hydrogenStorefront(id: $id) {\n      id\n      environmentVariables(branchName: $branch) {\n        id\n        isSecret\n        key\n        value\n      }\n    }\n  }\n";
 interface EnvironmentVariable {
     id: string;
@@ -12,5 +14,8 @@ interface HydrogenStorefront {
 interface PullVariablesSchema {
     hydrogenStorefront: HydrogenStorefront | null;
 }
+declare function getStorefrontEnvVariables(adminSession: AdminSession, storefrontId: string, envBranch?: string): Promise<{
+    storefront: HydrogenStorefront | null;
+}>;
 
-export { EnvironmentVariable, PullVariablesQuery, PullVariablesSchema };
+export { EnvironmentVariable, PullVariablesQuery, PullVariablesSchema, getStorefrontEnvVariables };

package/dist/lib/graphql/admin/pull-variables.js

@@ -1,3 +1,5 @@
+import { adminRequest } from '../../graphql.js';
+
 const PullVariablesQuery = `#graphql
   query PullVariables($id: ID!, $branch: String) {
     hydrogenStorefront(id: $id) {
@@ -11,5 +13,16 @@ const PullVariablesQuery = `#graphql
     }
   }
 `;
+async function getStorefrontEnvVariables(adminSession, storefrontId, envBranch) {
+  const { hydrogenStorefront } = await adminRequest(
+    PullVariablesQuery,
+    adminSession,
+    {
+      id: storefrontId,
+      branch: envBranch
+    }
+  );
+  return { storefront: hydrogenStorefront };
+}
 
-export { PullVariablesQuery };
+export { PullVariablesQuery, getStorefrontEnvVariables };

package/dist/lib/mini-oxygen.js

@@ -1,7 +1,7 @@
 import { outputInfo, outputContent, outputToken } from '@shopify/cli-kit/node/output';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 import { fileExists } from '@shopify/cli-kit/node/fs';
-import { colors } from './colors.js';
+import colors from '@shopify/cli-kit/node/colors';
 
 async function startMiniOxygen({
   root,

package/dist/lib/process.d.ts

@@ -0,0 +1,6 @@
+import { exec } from 'node:child_process';
+
+declare const execAsync: typeof exec.__promisify__;
+declare function supressNodeExperimentalWarnings(): void;
+
+export { execAsync, supressNodeExperimentalWarnings };

package/dist/lib/process.js

@@ -0,0 +1,17 @@
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+
+const execAsync = promisify(exec);
+function supressNodeExperimentalWarnings() {
+  const warningListener = process.listeners("warning")[0];
+  if (warningListener) {
+    process.removeAllListeners("warning");
+    process.prependListener("warning", (warning) => {
+      if (warning.name != "ExperimentalWarning") {
+        warningListener(warning);
+      }
+    });
+  }
+}
+
+export { execAsync, supressNodeExperimentalWarnings };

package/dist/lib/pull-environment-variables.d.ts

@@ -1,4 +1,5 @@
 import { EnvironmentVariable } from './graphql/admin/pull-variables.js';
+import '@shopify/cli-kit/node/session';
 
 interface Arguments {
     envBranch?: string;

package/dist/lib/pull-environment-variables.js

@@ -1,12 +1,11 @@
 import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
 import { outputContent, outputToken, outputInfo } from '@shopify/cli-kit/node/output';
 import { linkStorefront } from '../commands/hydrogen/link.js';
-import { adminRequest } from './graphql.js';
 import { getHydrogenShop } from './shop.js';
 import { getAdminSession } from './admin-session.js';
 import { getConfig } from './shopify-config.js';
 import { renderMissingLink, renderMissingStorefront } from './render-errors.js';
-import { PullVariablesQuery } from './graphql/admin/pull-variables.js';
+import { getStorefrontEnvVariables } from './graphql/admin/pull-variables.js';
 
 async function pullRemoteEnvironmentVariables({
   envBranch,
@@ -35,20 +34,11 @@ async function pullRemoteEnvironmentVariables({
   if (!configStorefront) {
     return [];
   }
-  if (!silent) {
-    outputInfo(
-      `Fetching environment variables from ${configStorefront.title}...`
-    );
-  }
-  const result = await adminRequest(
-    PullVariablesQuery,
+  const { storefront } = await getStorefrontEnvVariables(
     adminSession,
-    {
-      id: configStorefront.id,
-      branch: envBranch
-    }
+    configStorefront.id,
+    envBranch
   );
-  const storefront = result.hydrogenStorefront;
   if (!storefront) {
     if (!silent) {
       renderMissingStorefront({ adminSession, storefront: configStorefront });

package/dist/lib/remix-version-interop.js

@@ -13,7 +13,7 @@ function isRemixV2() {
 async function getV2Flags(root) {
   const isV2 = isRemixV2();
   const futureFlags = {
-    ...!isV2 && (await getRemixConfig(root)).future
+    ...!isV2 && (await getRemixConfig(root, true)).future
   };
   return {
     isV2Meta: isV2 || !!futureFlags.v2_meta,

package/dist/lib/shell.d.ts

@@ -1,12 +1,11 @@
 type UnixShell = 'zsh' | 'bash' | 'fish';
 type WindowsShell = 'PowerShell' | 'PowerShell 7+' | 'CMD';
 type Shell = UnixShell | WindowsShell;
+declare const ALIAS_NAME = "h2";
 declare const isWindows: () => boolean;
 declare const isGitBash: () => boolean;
-declare function homeFileExists(filepath: string): false | Promise<boolean>;
-declare function supportsShell(shell: UnixShell): boolean;
-declare function hasAlias(aliasName: string, filepath: string): boolean;
-declare function shellWriteFile(filepath: string, content: string, append?: boolean): boolean;
-declare function shellRunScript(script: string, shellBin: string): boolean;
+declare function shellWriteAlias(shell: UnixShell, aliasName: string, content: string): Promise<boolean>;
+declare function shellRunScript(script: string, shellBin: string): Promise<boolean>;
+declare function getCliCommand(): Promise<"h2" | "yarn shopify hydrogen" | "pnpm shopify hydrogen" | "npx shopify hydrogen">;
 
-export { Shell, UnixShell, WindowsShell, hasAlias, homeFileExists, isGitBash, isWindows, shellRunScript, shellWriteFile, supportsShell };
+export { ALIAS_NAME, Shell, UnixShell, WindowsShell, getCliCommand, isGitBash, isWindows, shellRunScript, shellWriteAlias };

package/dist/lib/shell.js

@@ -1,14 +1,16 @@
-import os from 'os';
-import path from 'path';
-import { execSync } from 'child_process';
+import os from 'node:os';
 import { fileExists } from '@shopify/cli-kit/node/fs';
+import { joinPath } from '@shopify/cli-kit/node/path';
 import { outputDebug } from '@shopify/cli-kit/node/output';
+import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
+import { execAsync } from './process.js';
 
+const ALIAS_NAME = "h2";
 const isWindows = () => process.platform === "win32";
 const isGitBash = () => !!process.env.MINGW_PREFIX;
 function resolveFromHome(filepath) {
   if (filepath[0] === "~") {
-    return path.join(os.homedir(), filepath.slice(1));
+    return joinPath(os.homedir(), filepath.slice(1));
   }
   return filepath;
 }
@@ -19,33 +21,44 @@ function homeFileExists(filepath) {
     return false;
   }
 }
-function supportsShell(shell) {
+async function supportsShell(shell) {
   try {
-    execSync(`which ${shell}`, { stdio: "ignore" });
+    await execAsync(`which ${shell}`);
     return true;
   } catch {
     return false;
   }
 }
-function hasAlias(aliasName, filepath) {
+function getShellAliasDefinitionFile(shell) {
+  if (shell === "bash")
+    return "~/.bashrc";
+  if (shell === "zsh")
+    return "~/.zshrc";
+  return `~/.config/fish/functions/${ALIAS_NAME}.fish`;
+}
+async function hasAliasDefinition(aliasName, shell) {
+  const filepath = getShellAliasDefinitionFile(shell);
   try {
-    const result = execSync(
-      `grep 'alias ${aliasName}' ${resolveFromHome(filepath)}`,
-      { stdio: "pipe" }
-    ).toString();
-    return !!result;
+    if (shell === "fish") {
+      return await homeFileExists(filepath);
+    }
+    const result = await execAsync(
+      `grep 'alias ${aliasName}' ${resolveFromHome(filepath)}`
+    );
+    return !!result.stdout;
   } catch {
     return false;
   }
 }
-function shellWriteFile(filepath, content, append = false) {
+async function shellWriteFile(shell, content, append = false) {
+  const filepath = getShellAliasDefinitionFile(shell);
   content = `"${content}"`;
   content = content.replaceAll("\n", "\\n");
   if (!isWindows()) {
     content = content.replaceAll("$", "\\$");
   }
   try {
-    execSync(
+    await execAsync(
       `printf ${content} ${append ? ">>" : ">"} ${resolveFromHome(filepath)}`
     );
     return true;
@@ -57,9 +70,16 @@ function shellWriteFile(filepath, content, append = false) {
     return false;
   }
 }
-function shellRunScript(script, shellBin) {
+async function shellWriteAlias(shell, aliasName, content) {
+  if (!await supportsShell(shell))
+    return false;
+  if (await hasAliasDefinition(aliasName, shell))
+    return true;
+  return await shellWriteFile(shell, content, shell !== "fish");
+}
+async function shellRunScript(script, shellBin) {
   try {
-    execSync(script, { shell: shellBin, stdio: "ignore" });
+    await execAsync(script, { shell: shellBin });
     return true;
   } catch (error) {
     outputDebug(
@@ -69,5 +89,33 @@ function shellRunScript(script, shellBin) {
     return false;
   }
 }
+function isKnownUnixShell(shell) {
+  return ["zsh", "bash", "fish"].includes(shell);
+}
+async function hasCliAlias() {
+  try {
+    if (isWindows() && !isGitBash()) {
+      await execAsync(`Get-Alias -Name ${ALIAS_NAME}`);
+    } else {
+      const shell = os.userInfo().shell?.split("/").pop() ?? "bash";
+      if (!isKnownUnixShell(shell))
+        return false;
+      return await hasAliasDefinition(ALIAS_NAME, shell);
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function getCliCommand() {
+  if (await hasCliAlias()) {
+    return ALIAS_NAME;
+  }
+  let cli = "npx";
+  const pkgManager = await getPackageManager(process.cwd()).catch(() => null);
+  if (pkgManager === "pnpm" || pkgManager === "yarn")
+    cli = pkgManager;
+  return `${cli} shopify hydrogen`;
+}
 
-export { hasAlias, homeFileExists, isGitBash, isWindows, shellRunScript, shellWriteFile, supportsShell };
+export { ALIAS_NAME, getCliCommand, isGitBash, isWindows, shellRunScript, shellWriteAlias };

package/dist/lib/shell.test.d.ts

@@ -0,0 +1 @@
+