@shopify/cli-hydrogen 4.2.1 → 5.0.1

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

@@ -1,32 +1,24 @@
 import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest';
 import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
-import { ListStorefrontsQuery } from '../../lib/graphql/admin/list-storefronts.js';
-import { getAdminSession } from '../../lib/admin-session.js';
-import { adminRequest } from '../../lib/graphql.js';
+import { getStorefrontsWithDeployment } from '../../lib/graphql/admin/list-storefronts.js';
 import { listStorefronts, formatDeployment } from './list.js';
 
-vi.mock("../../lib/admin-session.js");
-vi.mock("../../lib/graphql.js", async () => {
-  const original = await vi.importActual(
-    "../../lib/graphql.js"
-  );
-  return {
-    ...original,
-    adminRequest: vi.fn()
-  };
+const SHOP_NAME = "my-shop";
+vi.mock("../../lib/graphql/admin/list-storefronts.js", async () => {
+  return { getStorefrontsWithDeployment: vi.fn() };
 });
 vi.mock("../../lib/shop.js", () => ({
-  getHydrogenShop: () => "my-shop"
+  getHydrogenShop: () => SHOP_NAME
 }));
 describe("list", () => {
   const ADMIN_SESSION = {
     token: "abc123",
-    storeFqdn: "my-shop"
+    storeFqdn: SHOP_NAME
   };
   beforeEach(async () => {
-    vi.mocked(getAdminSession).mockResolvedValue(ADMIN_SESSION);
-    vi.mocked(adminRequest).mockResolvedValue({
-      hydrogenStorefronts: []
+    vi.mocked(getStorefrontsWithDeployment).mockResolvedValue({
+      adminSession: ADMIN_SESSION,
+      storefronts: []
     });
   });
   afterEach(() => {
@@ -35,23 +27,23 @@ describe("list", () => {
   });
   it("makes a GraphQL call to fetch the storefronts", async () => {
     await listStorefronts({});
-    expect(adminRequest).toHaveBeenCalledWith(
-      ListStorefrontsQuery,
-      ADMIN_SESSION
-    );
+    expect(getStorefrontsWithDeployment).toHaveBeenCalledWith(SHOP_NAME);
   });
   describe("and there are storefronts", () => {
     beforeEach(() => {
-      vi.mocked(adminRequest).mockResolvedValue({
-        hydrogenStorefronts: [
+      vi.mocked(getStorefrontsWithDeployment).mockResolvedValue({
+        adminSession: ADMIN_SESSION,
+        storefronts: [
           {
             id: "gid://shopify/HydrogenStorefront/1",
+            parsedId: "1",
             title: "Hydrogen",
             productionUrl: "https://example.com",
             currentProductionDeployment: null
           },
           {
             id: "gid://shopify/HydrogenStorefront/2",
+            parsedId: "2",
             title: "Demo Store",
             productionUrl: "https://demo.example.com",
             currentProductionDeployment: {
@@ -67,14 +59,13 @@ describe("list", () => {
       const outputMock = mockAndCaptureOutput();
       await listStorefronts({});
       expect(outputMock.info()).toMatch(
-        /Found 2 Hydrogen storefronts on my-shop/g
-      );
-      expect(outputMock.info()).toMatch(
-        /1   Hydrogen    https:\/\/example.com/g
-      );
-      expect(outputMock.info()).toMatch(
-        /2   Demo Store  https:\/\/demo.example.com  March 22, 2023, Update README.md/g
+        /Showing 2 Hydrogen storefronts for the store my-shop/g
       );
+      expect(outputMock.info()).toMatch(/Hydrogen \(id: 1\)/g);
+      expect(outputMock.info()).toMatch(/https:\/\/example.com/g);
+      expect(outputMock.info()).toMatch(/Demo Store \(id: 2\)/g);
+      expect(outputMock.info()).toMatch(/https:\/\/demo.example.com/g);
+      expect(outputMock.info()).toMatch(/3\/22\/2023, Update README.md/g);
     });
   });
   describe("and there are no storefronts", () => {
@@ -100,17 +91,18 @@ describe("formatDeployment", () => {
       commitMessage: "Update README.md\n\nThis is a description of why the change was made."
     };
     expect(formatDeployment(deployment)).toStrictEqual(
-      "March 22, 2023, Update README.md"
+      "3/22/2023, Update README.md"
     );
   });
   describe("when there is no commit message", () => {
     it("only returns the date", () => {
       const deployment = {
         id: "gid://shopify/HydrogenStorefrontDeployment/1",
+        parsedId: "1",
         createdAt,
         commitMessage: null
       };
-      expect(formatDeployment(deployment)).toStrictEqual("March 22, 2023");
+      expect(formatDeployment(deployment)).toStrictEqual("3/22/2023");
     });
   });
 });

package/dist/commands/hydrogen/shortcut.js

@@ -1,8 +1,7 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess, renderFatalError } from '@shopify/cli-kit/node/ui';
-import { isWindows, isGitBash, supportsShell, hasAlias, shellWriteFile, homeFileExists, shellRunScript } from '../../lib/shell.js';
+import { ALIAS_NAME, isWindows, isGitBash, shellWriteAlias, shellRunScript } from '../../lib/shell.js';
 
-const ALIAS_NAME = "h2";
 class Shortcut extends Command {
   static description = `Creates a global \`${ALIAS_NAME}\` shortcut for the Hydrogen CLI`;
   async run() {
@@ -38,13 +37,13 @@ end
 `;
 async function createShortcutsForUnix() {
   const shells = [];
-  if (supportsShell("zsh") && (hasAlias(ALIAS_NAME, "~/.zshrc") || shellWriteFile("~/.zshrc", BASH_ZSH_COMMAND, true))) {
+  if (await shellWriteAlias("zsh", ALIAS_NAME, BASH_ZSH_COMMAND)) {
     shells.push("zsh");
   }
-  if (supportsShell("bash") && (hasAlias(ALIAS_NAME, "~/.bashrc") || shellWriteFile("~/.bashrc", BASH_ZSH_COMMAND, true))) {
+  if (await shellWriteAlias("bash", ALIAS_NAME, BASH_ZSH_COMMAND)) {
     shells.push("bash");
   }
-  if (supportsShell("fish") && await homeFileExists("~/.config/fish/functions") && shellWriteFile(`~/.config/fish/functions/${ALIAS_NAME}.fish`, FISH_FUNCTION)) {
+  if (await shellWriteAlias("fish", ALIAS_NAME, FISH_FUNCTION)) {
     shells.push("fish");
   }
   return shells;
@@ -62,10 +61,10 @@ if (!$profileContent -or $profileContent -NotLike '*Invoke-Local-H2*') {
 `;
 async function createShortcutsForWindows() {
   const shells = [];
-  if (shellRunScript(PS_APPEND_PROFILE_COMMAND, "powershell.exe")) {
+  if (await shellRunScript(PS_APPEND_PROFILE_COMMAND, "powershell.exe")) {
     shells.push("PowerShell");
   }
-  if (shellRunScript(PS_APPEND_PROFILE_COMMAND, "pwsh.exe")) {
+  if (await shellRunScript(PS_APPEND_PROFILE_COMMAND, "pwsh.exe")) {
     shells.push("PowerShell 7+");
   }
   return shells;

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

@@ -1,7 +1,7 @@
 import { describe, beforeEach, vi, afterEach, expect, it } from 'vitest';
 import { runCreateShortcut } from './shortcut.js';
 import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
-import { supportsShell, isWindows, isGitBash } from '../../lib/shell.js';
+import { shellWriteAlias, isWindows, isGitBash } from '../../lib/shell.js';
 import { execSync, exec } from 'child_process';
 
 describe("shortcut", () => {
@@ -10,18 +10,17 @@ describe("shortcut", () => {
     vi.resetAllMocks();
     vi.mock("child_process");
     vi.mock("../../lib/shell.js", async () => {
+      const original = await vi.importActual("../../lib/shell.js");
       return {
+        ...original,
         isWindows: vi.fn(),
         isGitBash: vi.fn(),
-        supportsShell: vi.fn(),
-        shellWriteFile: () => true,
-        shellRunScript: () => true,
-        hasAlias: () => false,
-        homeFileExists: () => Promise.resolve(true)
+        shellWriteAlias: vi.fn(),
+        shellRunScript: async () => true
       };
     });
-    vi.mocked(supportsShell).mockImplementation(
-      (shell) => !isWindows() || shell === "bash"
+    vi.mocked(shellWriteAlias).mockImplementation(
+      async (shell) => !isWindows() || shell === "bash"
     );
   });
   afterEach(() => {
@@ -50,7 +49,7 @@ describe("shortcut", () => {
   });
   it("warns when not finding shells", async () => {
     vi.mocked(isWindows).mockReturnValue(false);
-    vi.mocked(supportsShell).mockReturnValue(false);
+    vi.mocked(shellWriteAlias).mockResolvedValue(false);
     await runCreateShortcut();
     expect(outputMock.info()).toBeFalsy();
     expect(outputMock.error()).toBeTruthy();

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

@@ -3,7 +3,6 @@ import Command from '@shopify/cli-kit/node/base-command';
 
 declare class Unlink 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>;
     };

package/dist/commands/hydrogen/unlink.js

@@ -1,11 +1,11 @@
 import Command from '@shopify/cli-kit/node/base-command';
-import { outputWarn, outputSuccess } from '@shopify/cli-kit/node/output';
+import { renderSuccess } from '@shopify/cli-kit/node/ui';
+import { outputWarn } from '@shopify/cli-kit/node/output';
 import { commonFlags } from '../../lib/flags.js';
 import { getConfig, unsetStorefront } from '../../lib/shopify-config.js';
 
 class Unlink extends Command {
   static description = "Unlink a local project from a Hydrogen storefront.";
-  static hidden = true;
   static flags = {
     path: commonFlags.path
   };
@@ -23,7 +23,9 @@ async function unlinkStorefront({ path }) {
   }
   const storefrontTitle = configStorefront.title;
   await unsetStorefront(actualPath);
-  outputSuccess(`You are no longer linked to ${storefrontTitle}`);
+  renderSuccess({
+    body: ["You are no longer linked to", { bold: storefrontTitle }]
+  });
 }
 
 export { Unlink as default, unlinkStorefront };

package/dist/lib/admin-session.d.ts

@@ -1,4 +1,5 @@
 import { AdminSession } from '@shopify/cli-kit/node/session';
+export { AdminSession } from '@shopify/cli-kit/node/session';
 
 declare function getAdminSession(shop: string): Promise<AdminSession>;
 

package/dist/lib/codegen.d.ts

@@ -17,9 +17,10 @@ type ProjectDirs = {
     appDirectory: string;
 };
 type CodegenOptions = ProjectDirs & {
-    configFilePath?: string;
     watch?: boolean;
+    configFilePath?: string;
+    forceSfapiVersion?: string;
 };
-declare function generateTypes({ configFilePath, watch, ...dirs }: CodegenOptions): Promise<string[]>;
+declare function generateTypes({ watch, configFilePath, forceSfapiVersion, ...dirs }: CodegenOptions): Promise<string[]>;
 
 export { generateTypes, normalizeCodegenError, spawnCodegenProcess };

package/dist/lib/codegen.js

@@ -67,14 +67,15 @@ function spawnCodegenProcess({
   return child;
 }
 async function generateTypes({
-  configFilePath,
   watch,
+  configFilePath,
+  forceSfapiVersion,
   ...dirs
 }) {
   const { config: codegenConfig } = await loadCodegenConfig({
     configFilePath,
     searchPlaces: [dirs.rootDirectory]
-  }) || generateDefaultConfig(dirs);
+  }) || generateDefaultConfig(dirs, forceSfapiVersion);
   await addHooksToHydrogenOptions(codegenConfig, dirs);
   await generate(
     {
@@ -87,10 +88,7 @@ async function generateTypes({
   );
   return Object.keys(codegenConfig.generates);
 }
-function generateDefaultConfig({
-  rootDirectory,
-  appDirectory
-}) {
+function generateDefaultConfig({ rootDirectory, appDirectory }, forceSfapiVersion) {
   const tsDefaultGlob = "*!(*.d).{ts,tsx}";
   const appDirRelative = relativePath(rootDirectory, appDirectory);
   return {
@@ -105,7 +103,22 @@ function generateDefaultConfig({
           documents: [
             tsDefaultGlob,
             joinPath(appDirRelative, "**", tsDefaultGlob)
-          ]
+          ],
+          ...!!forceSfapiVersion && {
+            presetConfig: { importTypes: false },
+            schema: {
+              [`https://hydrogen-preview.myshopify.com/api/${forceSfapiVersion.split(":")[0]}/graphql.json`]: {
+                headers: {
+                  "content-type": "application/json",
+                  "X-Shopify-Storefront-Access-Token": forceSfapiVersion.split(":")[1] ?? "3b580e70970c4528da70c98e097c2fa0"
+                }
+              }
+            },
+            config: {
+              defaultScalarType: "string",
+              scalars: { JSON: "unknown" }
+            }
+          }
         }
       }
     }

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

@@ -1,10 +1,10 @@
 import { fileExists } from '@shopify/cli-kit/node/fs';
 import { resolvePath } from '@shopify/cli-kit/node/path';
-import { outputInfo, outputContent, outputToken } from '@shopify/cli-kit/node/output';
+import { linesToColumns } from '@shopify/cli-kit/common/string';
+import { outputInfo } from '@shopify/cli-kit/node/output';
 import { readAndParseDotEnv } from '@shopify/cli-kit/node/dot-env';
-import { colors } from './colors.js';
+import colors from '@shopify/cli-kit/node/colors';
 import { pullRemoteEnvironmentVariables } from './pull-environment-variables.js';
-import { getConfig } from './shopify-config.js';
 
 async function combinedEnvironmentVariables({
   envBranch,
@@ -28,47 +28,30 @@ async function combinedEnvironmentVariables({
   );
   const localKeys = new Set(Object.keys(localEnvironmentVariables));
   if ([...remoteKeys, ...localKeys].length) {
-    outputInfo(
-      `${colors.bold("Injecting environment variables into MiniOxygen...")}`
-    );
+    outputInfo("\nEnvironment variables injected into MiniOxygen:\n");
   }
-  let storefrontTitle = "";
-  if (remoteEnvironmentVariables.length) {
-    const { storefront } = await getConfig(root);
-    if (storefront) {
-      storefrontTitle = storefront.title;
-    }
-  }
-  remoteEnvironmentVariables.forEach(({ key, isSecret }) => {
-    if (localKeys.has(key)) {
-      outputIgnoringKey(key, `overwritten via ${colors.yellow(".env")}`);
-    } else if (isSecret) {
-      outputIgnoringKey(key, "value is marked as secret");
-    } else {
-      outputUsingKey(key, storefrontTitle);
+  let rows = [];
+  remoteEnvironmentVariables.filter(({ isSecret }) => !isSecret).forEach(({ key }) => {
+    if (!localKeys.has(key)) {
+      rows.push([key, "from Oxygen"]);
     }
   });
-  [...localKeys].forEach((keyName) => {
-    outputUsingKey(keyName, ".env");
+  localKeys.forEach((key) => {
+    rows.push([key, "from local .env"]);
+  });
+  remoteEnvironmentVariables.filter(({ isSecret }) => isSecret).forEach(({ key }) => {
+    if (!localKeys.has(key)) {
+      rows.push([
+        colors.dim(key),
+        colors.dim(`from Oxygen (Marked as secret)`)
+      ]);
+    }
   });
+  outputInfo(linesToColumns(rows));
   return {
     ...formattedRemoteVariables,
     ...localEnvironmentVariables
   };
 }
-function outputUsingKey(keyName, source) {
-  outputInfo(
-    outputContent`  Using ${outputToken.green(
-      keyName
-    )} from ${outputToken.yellow(source)}`.value
-  );
-}
-function outputIgnoringKey(keyName, reason) {
-  outputInfo(
-    outputContent`${colors.dim(
-      `  Ignoring ${colors.green(keyName)} (${reason})`
-    )}`.value
-  );
-}
 
 export { combinedEnvironmentVariables };

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

@@ -1,5 +1,7 @@
 import { ServerMode } from '@remix-run/dev/dist/config/serverModes.js';
+export { ServerMode } from '@remix-run/dev/dist/config/serverModes.js';
 import { RemixConfig } from '@remix-run/dev/dist/config.js';
+export { RemixConfig } from '@remix-run/dev/dist/config.js';
 
 declare function getProjectPaths(appPath?: string, entry?: string): {
     root: string;
@@ -8,7 +10,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.d.ts

@@ -6,6 +6,7 @@ declare const commonFlags: {
     force: _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>;
     "env-branch": _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>;
 };
 declare function flagsToCamelObject(obj: Record<string, any>): any;
 /**

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,13 @@ 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"
+  }),
+  sourcemap: Flags.boolean({
+    description: "Generate sourcemaps for the build.",
+    env: "SHOPIFY_HYDROGEN_FLAG_SOURCEMAP",
+    default: true,
+    allowNo: true
   })
 };
 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 };