@shopify/cli-hydrogen 5.1.0 → 5.1.2

package/dist/commands/hydrogen/build.js

@@ -5,11 +5,11 @@ import { rmdir, fileSize, glob, removeFile, copyFile } from '@shopify/cli-kit/no
 import { resolvePath, relativePath, joinPath } from '@shopify/cli-kit/node/path';
 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 { getProjectPaths, getRemixConfig, assertOxygenChecks } from '../../lib/remix-config.js';
 import { commonFlags, deprecated, flagsToCamelObject } from '../../lib/flags.js';
 import { checkLockfileStatus } from '../../lib/check-lockfile.js';
 import { findMissingRoutes } from '../../lib/missing-routes.js';
-import { warnOnce } from '../../lib/log.js';
+import { muteRemixLogs, createRemixLogger } from '../../lib/log.js';
 import { codegen } from '../../lib/codegen.js';
 
 const LOG_WORKER_BUILT = "\u{1F4E6} Worker built";
@@ -42,12 +42,12 @@ class Build extends Command {
     await runBuild({
       ...flagsToCamelObject(flags),
       useCodegen: flags["codegen-unstable"],
-      path: directory
+      directory
     });
   }
 }
 async function runBuild({
-  path: appPath,
+  directory,
   useCodegen = false,
   codegenConfigPath,
   sourcemap = false,
@@ -56,8 +56,8 @@ async function runBuild({
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "production";
   }
-  const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(appPath);
-  await checkLockfileStatus(root);
+  const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(directory);
+  await Promise.all([checkLockfileStatus(root), muteRemixLogs()]);
   console.time(LOG_WORKER_BUILT);
   outputInfo(`
 \u{1F3D7}\uFE0F  Building in ${process.env.NODE_ENV} mode...`);
@@ -68,15 +68,16 @@ async function runBuild({
     import('@remix-run/dev/dist/compiler/fileWatchCache.js'),
     rmdir(buildPath, { force: true })
   ]);
+  assertOxygenChecks(remixConfig);
   await Promise.all([
     copyPublicFiles(publicPath, buildPathClient),
     build({
       config: remixConfig,
       options: {
         mode: process.env.NODE_ENV,
-        onWarning: warnOnce,
         sourcemap
       },
+      logger: createRemixLogger(),
       fileWatchCache: createFileWatchCache()
     }).catch((thrown) => {
       logThrown(thrown);
@@ -124,7 +125,9 @@ This build is missing ${missingRoutes.length} route${missingRoutes.length > 1 ?
       );
     }
   }
-  process.exit(0);
+  if (!process.env.SHOPIFY_UNIT_TEST) {
+    process.exit(0);
+  }
 }
 async function copyPublicFiles(publicPath, buildPathClient) {
   return copyFile(publicPath, buildPathClient);

package/dist/commands/hydrogen/check.js

@@ -1,7 +1,7 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 import { commonFlags } from '../../lib/flags.js';
-import { getRemixConfig } from '../../lib/config.js';
+import { getRemixConfig } from '../../lib/remix-config.js';
 import { logMissingRoutes, findMissingRoutes } from '../../lib/missing-routes.js';
 import { Args } from '@oclif/core';
 
@@ -29,8 +29,8 @@ class GenerateRoute extends Command {
   }
 }
 async function runCheckRoutes({ directory }) {
-  const remixConfig = await getRemixConfig(directory, true);
+  const remixConfig = await getRemixConfig(directory);
   logMissingRoutes(findMissingRoutes(remixConfig));
 }
 
-export { GenerateRoute as default };
+export { GenerateRoute as default, runCheckRoutes };

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

@@ -2,7 +2,7 @@ import path from 'path';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
 import { Flags } from '@oclif/core';
-import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
+import { getProjectPaths, getRemixConfig } from '../../lib/remix-config.js';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { codegen } from '../../lib/codegen.js';
 
@@ -29,17 +29,17 @@ class Codegen extends Command {
     const directory = flags.path ? path.resolve(flags.path) : process.cwd();
     await runCodegen({
       ...flagsToCamelObject(flags),
-      path: directory
+      directory
     });
   }
 }
 async function runCodegen({
-  path: appPath,
+  directory,
   codegenConfigPath,
   forceSfapiVersion,
   watch
 }) {
-  const { root } = getProjectPaths(appPath);
+  const { root } = getProjectPaths(directory);
   const remixConfig = await getRemixConfig(root);
   console.log("");
   const generatedFiles = await codegen({

package/dist/commands/hydrogen/dev.js

@@ -5,8 +5,8 @@ import { fileExists } from '@shopify/cli-kit/node/fs';
 import { renderFatalError } from '@shopify/cli-kit/node/ui';
 import colors from '@shopify/cli-kit/node/colors';
 import { copyPublicFiles } from './build.js';
-import { getProjectPaths, getRemixConfig } from '../../lib/config.js';
-import { muteDevLogs, warnOnce, enhanceH2Logs } from '../../lib/log.js';
+import { getProjectPaths, assertOxygenChecks, getRemixConfig } from '../../lib/remix-config.js';
+import { muteDevLogs, muteRemixLogs, createRemixLogger, enhanceH2Logs } 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';
@@ -16,6 +16,7 @@ import { addVirtualRoutes } from '../../lib/virtual-routes.js';
 import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { getConfig } from '../../lib/shopify-config.js';
+import { checkRemixVersions } from '../../lib/remix-version-check.js';
 
 const LOG_REBUILDING = "\u{1F9F1} Rebuilding...";
 const LOG_REBUILT = "\u{1F680} Rebuilt";
@@ -67,6 +68,7 @@ async function runDev({
   if (!process.env.NODE_ENV)
     process.env.NODE_ENV = "development";
   muteDevLogs();
+  await muteRemixLogs();
   if (debug)
     (await import('node:inspector')).open();
   const { root, publicPath, buildPathClient, buildPathWorkerFile } = getProjectPaths(appPath);
@@ -86,7 +88,11 @@ async function runDev({
     return [fileRelative, path.resolve(root, fileRelative)];
   };
   const serverBundleExists = () => fileExists(buildPathWorkerFile);
-  const { shop, storefront } = await getConfig(root);
+  const [remixConfig, { shop, storefront }] = await Promise.all([
+    reloadConfig(),
+    getConfig(root)
+  ]);
+  assertOxygenChecks(remixConfig);
   const fetchRemote = !!shop && !!storefront?.id;
   const envPromise = getAllEnvironmentVariables({ root, fetchRemote, envBranch });
   const [{ watch }, { createFileWatchCache }] = await Promise.all([
@@ -120,11 +126,11 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
     if (useCodegen) {
       spawnCodegenProcess({ ...remixConfig, configFilePath: codegenConfigPath });
     }
+    checkRemixVersions();
     const showUpgrade = await checkingHydrogenVersion;
     if (showUpgrade)
       showUpgrade();
   }
-  const remixConfig = await reloadConfig();
   const fileWatchCache = createFileWatchCache();
   let skipRebuildLogs = false;
   await watch(
@@ -132,10 +138,10 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
       config: remixConfig,
       options: {
         mode: process.env.NODE_ENV,
-        onWarning: warnOnce,
         sourcemap
       },
-      fileWatchCache
+      fileWatchCache,
+      logger: createRemixLogger()
     },
     {
       reloadConfig,

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

@@ -1,39 +1,30 @@
 import { fileURLToPath } from 'node:url';
 import { vi, describe, beforeEach, it, expect } from 'vitest';
-import { temporaryDirectoryTask } from 'tempy';
 import { runInit } from './init.js';
 import { exec } from '@shopify/cli-kit/node/system';
 import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
-import { readFile, writeFile, isDirectory } from '@shopify/cli-kit/node/fs';
-import { basename, joinPath } from '@shopify/cli-kit/node/path';
+import { writeFile, inTemporaryDirectory, readFile, isDirectory, removeFile, fileExists } from '@shopify/cli-kit/node/fs';
+import { joinPath, basename } from '@shopify/cli-kit/node/path';
 import { checkHydrogenVersion } from '../../lib/check-version.js';
 import { handleProjectLocation } from '../../lib/onboarding/common.js';
 import glob from 'fast-glob';
 import { getSkeletonSourceDir } from '../../lib/build.js';
 import { execAsync } from '../../lib/process.js';
 import { rmdir, symlink } from 'fs-extra';
+import { runCheckRoutes } from './check.js';
+import { runCodegen } from './codegen-unstable.js';
+import { runBuild } from './build.js';
 
+const { renderTasksHook } = vi.hoisted(() => ({ renderTasksHook: vi.fn() }));
+vi.mock("../../lib/check-version.js");
 vi.mock("../../lib/template-downloader.js", async () => ({
-  getLatestTemplates: () => Promise.resolve({})
+  getLatestTemplates: () => Promise.resolve({
+    version: "",
+    templatesDir: fileURLToPath(
+      new URL("../../../../../templates", import.meta.url)
+    )
+  })
 }));
-vi.mock(
-  "@shopify/cli-kit/node/node-package-manager",
-  async (importOriginal) => {
-    const original = await importOriginal();
-    return {
-      ...original,
-      installNodeModules: vi.fn(),
-      getPackageManager: () => Promise.resolve("npm"),
-      packageManagerUsedForCreating: () => Promise.resolve("npm")
-    };
-  }
-);
-vi.mock("../../lib/check-version.js");
-const { renderTasksHook } = vi.hoisted(() => {
-  return {
-    renderTasksHook: vi.fn()
-  };
-});
 vi.mock("@shopify/cli-kit/node/ui", async () => {
   const original = await vi.importActual("@shopify/cli-kit/node/ui");
   return {
@@ -48,6 +39,30 @@ vi.mock("@shopify/cli-kit/node/ui", async () => {
     })
   };
 });
+vi.mock(
+  "@shopify/cli-kit/node/node-package-manager",
+  async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+      ...original,
+      getPackageManager: () => Promise.resolve("npm"),
+      packageManagerUsedForCreating: () => Promise.resolve("npm"),
+      installNodeModules: vi.fn(async ({ directory }) => {
+        renderTasksHook.mockImplementationOnce(async () => {
+          await writeFile(`${directory}/package-lock.json`, "{}");
+        });
+        await rmdir(joinPath(directory, "node_modules")).catch(() => {
+        });
+        await symlink(
+          fileURLToPath(
+            new URL("../../../../../node_modules", import.meta.url)
+          ),
+          joinPath(directory, "node_modules")
+        );
+      })
+    };
+  }
+);
 vi.mock("../../lib/onboarding/common.js", async (importOriginal) => {
   const original = await importOriginal();
   return Object.keys(original).reduce((acc, item) => {
@@ -65,10 +80,11 @@ describe("init", () => {
   const outputMock = mockAndCaptureOutput();
   beforeEach(() => {
     vi.clearAllMocks();
+    vi.unstubAllEnvs();
     outputMock.clear();
   });
   it("checks Hydrogen version", async () => {
-    await temporaryDirectoryTask(async (tmpDir) => {
+    await inTemporaryDirectory(async (tmpDir) => {
       const showUpgradeMock = vi.fn((param) => ({
         currentVersion: "1.0.0",
         newVersion: "1.0.1"
@@ -83,9 +99,89 @@ describe("init", () => {
       );
     });
   });
+  describe("remote templates", () => {
+    it("throws for unknown templates", async () => {
+      await inTemporaryDirectory(async (tmpDir) => {
+        await expect(
+          runInit({
+            path: tmpDir,
+            git: false,
+            language: "ts",
+            template: "https://github.com/some/repo"
+          })
+        ).rejects.toThrow("supported");
+      });
+    });
+    it("creates basic projects", async () => {
+      await inTemporaryDirectory(async (tmpDir) => {
+        await runInit({
+          path: tmpDir,
+          git: false,
+          language: "ts",
+          template: "hello-world"
+        });
+        const helloWorldFiles = await glob("**/*", {
+          cwd: getSkeletonSourceDir().replace("skeleton", "hello-world"),
+          ignore: ["**/node_modules/**", "**/dist/**"]
+        });
+        const projectFiles = await glob("**/*", { cwd: tmpDir });
+        const nonAppFiles = helloWorldFiles.filter(
+          (item) => !item.startsWith("app/")
+        );
+        expect(projectFiles).toEqual(expect.arrayContaining(nonAppFiles));
+        expect(projectFiles).toContain("app/root.tsx");
+        expect(projectFiles).toContain("app/entry.client.tsx");
+        expect(projectFiles).toContain("app/entry.server.tsx");
+        expect(projectFiles).not.toContain("app/components/Layout.tsx");
+        expect(projectFiles).not.toContain("app/routes/_index.tsx");
+        await expect(readFile(`${tmpDir}/package.json`)).resolves.toMatch(
+          `"name": "hello-world"`
+        );
+        const output = outputMock.info();
+        expect(output).toMatch("success");
+        expect(output).not.toMatch("warning");
+        expect(output).not.toMatch("Routes");
+        expect(output).toMatch(/Language:\s*TypeScript/);
+        expect(output).toMatch("Help");
+        expect(output).toMatch("Next steps");
+        expect(output).toMatch(
+          /Run `cd .*? &&[^\w]*?npm[^\w]*?install[^\w]*?&&[^\w]*?npm[^\w]*?run[^\w]*?dev`/ims
+        );
+      });
+    });
+    it("transpiles projects to JS", async () => {
+      await inTemporaryDirectory(async (tmpDir) => {
+        await runInit({
+          path: tmpDir,
+          git: false,
+          language: "js",
+          template: "hello-world"
+        });
+        const helloWorldFiles = await glob("**/*", {
+          cwd: getSkeletonSourceDir().replace("skeleton", "hello-world"),
+          ignore: ["**/node_modules/**", "**/dist/**"]
+        });
+        const projectFiles = await glob("**/*", { cwd: tmpDir });
+        expect(projectFiles).toEqual(
+          expect.arrayContaining(
+            helloWorldFiles.filter((item) => !item.endsWith(".d.ts")).map(
+              (item) => item.replace(/\.ts(x)?$/, ".js$1").replace(/tsconfig\.json$/, "jsconfig.json")
+            )
+          )
+        );
+        await expect(readFile(`${tmpDir}/server.js`)).resolves.toMatch(
+          /export default {\n\s+async fetch\(\s*request,\s*env,\s*executionContext,?\s*\)/
+        );
+        const output = outputMock.info();
+        expect(output).toMatch("success");
+        expect(output).not.toMatch("warning");
+        expect(output).toMatch(/Language:\s*JavaScript/);
+      });
+    });
+  });
   describe("local templates", () => {
     it("creates basic projects", async () => {
-      await temporaryDirectoryTask(async (tmpDir) => {
+      await inTemporaryDirectory(async (tmpDir) => {
         await runInit({
           path: tmpDir,
           git: false,
@@ -129,7 +225,7 @@ describe("init", () => {
       });
     });
     it("creates projects with route files", async () => {
-      await temporaryDirectoryTask(async (tmpDir) => {
+      await inTemporaryDirectory(async (tmpDir) => {
         await runInit({ path: tmpDir, git: false, routes: true, language: "ts" });
         const skeletonFiles = await glob("**/*", {
           cwd: getSkeletonSourceDir(),
@@ -152,7 +248,7 @@ describe("init", () => {
       });
     });
     it("transpiles projects to JS", async () => {
-      await temporaryDirectoryTask(async (tmpDir) => {
+      await inTemporaryDirectory(async (tmpDir) => {
         await runInit({ path: tmpDir, git: false, routes: true, language: "js" });
         const skeletonFiles = await glob("**/*", {
           cwd: getSkeletonSourceDir(),
@@ -182,7 +278,7 @@ describe("init", () => {
     });
     describe("styling libraries", () => {
       it("scaffolds Tailwind CSS", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -207,7 +303,7 @@ describe("init", () => {
         });
       });
       it("scaffolds CSS Modules", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -229,7 +325,7 @@ describe("init", () => {
         });
       });
       it("scaffolds Vanilla Extract", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -253,7 +349,7 @@ describe("init", () => {
     });
     describe("i18n strategies", () => {
       it("scaffolds i18n with domains strategy", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -273,7 +369,7 @@ describe("init", () => {
         });
       });
       it("scaffolds i18n with subdomains strategy", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -293,7 +389,7 @@ describe("init", () => {
         });
       });
       it("scaffolds i18n with subfolders strategy", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -315,10 +411,7 @@ describe("init", () => {
     });
     describe("git", () => {
       it("initializes a git repository and creates initial commits", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
-          renderTasksHook.mockImplementationOnce(async () => {
-            await writeFile(`${tmpDir}/package-lock.json`, "{}");
-          });
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: true,
@@ -345,10 +438,7 @@ describe("init", () => {
     });
     describe("project validity", () => {
       it("typechecks the project", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
-          renderTasksHook.mockImplementationOnce(async () => {
-            await writeFile(`${tmpDir}/package-lock.json`, "{}");
-          });
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: true,
@@ -358,21 +448,77 @@ describe("init", () => {
             routes: true,
             installDeps: true
           });
-          await rmdir(joinPath(tmpDir, "node_modules")).catch(() => {
-          });
-          await symlink(
-            fileURLToPath(
-              new URL("../../../../../node_modules", import.meta.url)
-            ),
-            joinPath(tmpDir, "node_modules")
-          );
           await expect(
-            exec("npm", ["run", "typecheck"], {
-              cwd: tmpDir
-            })
+            exec("npm", ["run", "typecheck"], { cwd: tmpDir })
           ).resolves.not.toThrow();
         });
       });
+      it("contains all standard routes", async () => {
+        await inTemporaryDirectory(async (tmpDir) => {
+          await runInit({
+            path: tmpDir,
+            git: true,
+            language: "ts",
+            i18n: "subfolders",
+            routes: true,
+            installDeps: true
+          });
+          outputMock.clear();
+          await runCheckRoutes({ directory: tmpDir });
+          const output = outputMock.info();
+          expect(output).toMatch("success");
+        });
+      });
+      it("supports codegen", async () => {
+        await inTemporaryDirectory(async (tmpDir) => {
+          await runInit({
+            path: tmpDir,
+            git: true,
+            language: "ts",
+            routes: true,
+            installDeps: true
+          });
+          outputMock.clear();
+          const codegenFile = `${tmpDir}/storefrontapi.generated.d.ts`;
+          const codegenFromTemplate = await readFile(codegenFile);
+          expect(codegenFromTemplate).toBeTruthy();
+          await removeFile(codegenFile);
+          expect(fileExists(codegenFile)).resolves.toBeFalsy();
+          await expect(runCodegen({ directory: tmpDir })).resolves.not.toThrow();
+          const output = outputMock.info();
+          expect(output).toMatch("success");
+          await expect(readFile(codegenFile)).resolves.toEqual(
+            codegenFromTemplate
+          );
+        });
+      });
+      it("builds the generated project", async () => {
+        await inTemporaryDirectory(async (tmpDir) => {
+          await runInit({
+            path: tmpDir,
+            git: true,
+            language: "ts",
+            styling: "postcss",
+            i18n: "subfolders",
+            routes: true,
+            installDeps: true
+          });
+          outputMock.clear();
+          vi.stubEnv("NODE_ENV", "production");
+          await expect(runBuild({ directory: tmpDir })).resolves.not.toThrow();
+          const expectedBundlePath = "dist/worker/index.js";
+          const output = outputMock.output();
+          expect(output).toMatch(expectedBundlePath);
+          expect(
+            fileExists(joinPath(tmpDir, expectedBundlePath))
+          ).resolves.toBeTruthy();
+          const mb = Number(
+            output.match(/index\.js\s+([\d.]+)\s+MB/)?.[1] || ""
+          );
+          expect(mb).toBeGreaterThan(0);
+          expect(mb).toBeLessThan(1);
+        });
+      });
     });
   });
 });

package/dist/commands/hydrogen/preview.js

@@ -1,6 +1,6 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { muteDevLogs } from '../../lib/log.js';
-import { getProjectPaths } from '../../lib/config.js';
+import { getProjectPaths } from '../../lib/remix-config.js';
 import { commonFlags } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen.js';
 

package/dist/commands/hydrogen/setup/css.js

@@ -4,7 +4,7 @@ import Command from '@shopify/cli-kit/node/base-command';
 import { renderTasks, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { getPackageManager, installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
 import { Args } from '@oclif/core';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../../lib/remix-config.js';
 import { SETUP_CSS_STRATEGIES, renderCssPrompt, setupCssStrategy, CSS_STRATEGY_NAME_MAP } from '../../../lib/setups/css/index.js';
 
 class SetupCSS extends Command {

package/dist/commands/hydrogen/setup/markets.js

@@ -3,7 +3,7 @@ import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderTasks, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { Args } from '@oclif/core';
-import { getRemixConfig } from '../../../lib/config.js';
+import { getRemixConfig } from '../../../lib/remix-config.js';
 import { SETUP_I18N_STRATEGIES, renderI18nPrompt, setupI18nStrategy, I18N_STRATEGY_NAME_MAP } from '../../../lib/setups/i18n/index.js';
 
 class SetupMarkets extends Command {

package/dist/commands/hydrogen/setup.js

@@ -5,7 +5,7 @@ import { resolvePath, basename } from '@shopify/cli-kit/node/path';
 import { copyFile } from '@shopify/cli-kit/node/fs';
 import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.js';
 import { renderI18nPrompt, setupI18nStrategy } from '../../lib/setups/i18n/index.js';
-import { getRemixConfig } from '../../lib/config.js';
+import { getRemixConfig } from '../../lib/remix-config.js';
 import { handleRouteGeneration, generateProjectEntries, handleCliShortcut, renderProjectReady } from '../../lib/onboarding/common.js';
 import { getCliCommand } from '../../lib/shell.js';
 import { generateProjectFile } from '../../lib/setups/routes/generate.js';
@@ -44,7 +44,7 @@ async function runSetup(options) {
       }
     }
   ];
-  const i18nStrategy = options.i18n ? options.i18n : await renderI18nPrompt({
+  const i18nStrategy = options.markets ? options.markets : await renderI18nPrompt({
     abortSignal: controller.signal,
     extraChoices: { none: "Set up later" }
   });
@@ -130,4 +130,4 @@ async function runSetup(options) {
   );
 }
 
-export { Setup as default };
+export { Setup as default, runSetup };

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

@@ -0,0 +1,62 @@
+import { fileURLToPath } from 'node:url';
+import { vi, describe, beforeEach, it, expect } from 'vitest';
+import { inTemporaryDirectory, copyFile, fileExists, readFile } from '@shopify/cli-kit/node/fs';
+import { joinPath } from '@shopify/cli-kit/node/path';
+import { mockAndCaptureOutput } from '@shopify/cli-kit/node/testing/output';
+import { runSetup } from './setup.js';
+import { renderConfirmationPrompt } from '@shopify/cli-kit/node/ui';
+
+vi.mock("../../lib/shell.js");
+vi.mock("@shopify/cli-kit/node/ui", async () => {
+  const original = await vi.importActual("@shopify/cli-kit/node/ui");
+  return {
+    ...original,
+    renderConfirmationPrompt: vi.fn(),
+    renderSelectPrompt: vi.fn(),
+    renderTextPrompt: vi.fn(),
+    renderInfo: vi.fn()
+  };
+});
+describe("setup", () => {
+  const outputMock = mockAndCaptureOutput();
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+  beforeEach(() => {
+    outputMock.clear();
+  });
+  it("sets up an i18n strategy and generates routes", async () => {
+    await inTemporaryDirectory(async (tmpDir) => {
+      await copyFile(
+        fileURLToPath(
+          new URL("../../../../../templates/hello-world", import.meta.url)
+        ),
+        tmpDir
+      );
+      await expect(
+        fileExists(joinPath(tmpDir, "app/routes/_index.tsx"))
+      ).resolves.toBeFalsy();
+      vi.mocked(renderConfirmationPrompt).mockResolvedValueOnce(true);
+      await expect(
+        runSetup({
+          directory: tmpDir,
+          markets: "subfolders",
+          installDeps: false
+        })
+      ).resolves.not.toThrow();
+      await expect(
+        fileExists(joinPath(tmpDir, "app/routes/($locale)._index.tsx"))
+      ).resolves.toBeTruthy();
+      const serverFile = await readFile(`${tmpDir}/server.ts`);
+      expect(serverFile).toMatch(/i18n: getLocaleFromRequest\(request\),/);
+      expect(serverFile).toMatch(/url.pathname/);
+      const output = outputMock.info();
+      expect(output).toMatch("success");
+      expect(output).not.toMatch("warning");
+      expect(output).toMatch(/Markets:\s*Subfolders/);
+      expect(output).toMatch("Routes");
+      expect(output).toMatch("Home (/ & /:catchAll)");
+      expect(output).toMatch("Account (/account/*)");
+    });
+  });
+});