@shopify/cli-hydrogen 5.1.1 → 5.2.0

package/dist/commands/hydrogen/build.js

@@ -1,7 +1,7 @@
 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, glob, removeFile, copyFile } from '@shopify/cli-kit/node/fs';
+import { rmdir, fileSize, glob, removeFile, fileExists, copyFile } from '@shopify/cli-kit/node/fs';
 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';
@@ -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,7 +56,7 @@ async function runBuild({
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "production";
   }
-  const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(appPath);
+  const { root, buildPath, buildPathClient, buildPathWorkerFile, publicPath } = getProjectPaths(directory);
   await Promise.all([checkLockfileStatus(root), muteRemixLogs()]);
   console.time(LOG_WORKER_BUILT);
   outputInfo(`
@@ -125,9 +125,14 @@ 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) {
+  if (!await fileExists(publicPath)) {
+    return;
+  }
   return copyFile(publicPath, buildPathClient);
 }
 

package/dist/commands/hydrogen/check.js

@@ -33,4 +33,4 @@ async function runCheckRoutes({ directory }) {
   logMissingRoutes(findMissingRoutes(remixConfig));
 }
 
-export { GenerateRoute as default };
+export { GenerateRoute as default, runCheckRoutes };

package/dist/commands/hydrogen/codegen-unstable.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

@@ -6,8 +6,8 @@ import { renderFatalError } from '@shopify/cli-kit/node/ui';
 import colors from '@shopify/cli-kit/node/colors';
 import { copyPublicFiles } from './build.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 { muteDevLogs, createRemixLogger, enhanceH2Logs } from '../../lib/log.js';
+import { commonFlags, deprecated, flagsToCamelObject, DEFAULT_PORT } 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';
@@ -16,6 +16,8 @@ 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 { findPort } from '../../lib/find-port.js';
+import { setupLiveReload } from '../../lib/live-reload.js';
 import { checkRemixVersions } from '../../lib/remix-version-check.js';
 
 const LOG_REBUILDING = "\u{1F9F1} Rebuilding...";
@@ -56,7 +58,7 @@ class Dev extends Command {
   }
 }
 async function runDev({
-  port,
+  port: portFlag = DEFAULT_PORT,
   path: appPath,
   useCodegen = false,
   codegenConfigPath,
@@ -68,7 +70,6 @@ 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);
@@ -102,14 +103,15 @@ async function runDev({
   let isInitialBuild = true;
   let initialBuildDurationMs = 0;
   let initialBuildStartTimeMs = Date.now();
+  const liveReload = remixConfig.future.v2_dev ? await setupLiveReload(remixConfig.devServerPort) : void 0;
   let miniOxygen;
   async function safeStartMiniOxygen() {
     if (miniOxygen)
       return;
     miniOxygen = await startMiniOxygen({
       root,
-      port,
-      watch: true,
+      port: await findPort(portFlag),
+      watch: !liveReload,
       buildPathWorkerFile,
       buildPathClient,
       env: await envPromise
@@ -145,13 +147,15 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
     },
     {
       reloadConfig,
-      onBuildStart() {
+      onBuildStart(ctx) {
         if (!isInitialBuild && !skipRebuildLogs) {
           outputInfo(LOG_REBUILDING);
           console.time(LOG_REBUILT);
         }
+        liveReload?.onBuildStart(ctx);
       },
-      async onBuildFinish() {
+      onBuildManifest: liveReload?.onBuildManifest,
+      async onBuildFinish(context, duration, succeeded) {
         if (isInitialBuild) {
           await copyingFiles;
           initialBuildDurationMs = Date.now() - initialBuildStartTimeMs;
@@ -162,16 +166,21 @@ View GraphiQL API browser: ${graphiqlUrl}`)]
           if (!miniOxygen)
             console.log("");
         }
-        if (!miniOxygen) {
-          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."
-            });
+        if (!miniOxygen && !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."
+          });
+        }
+        if (succeeded) {
+          if (!miniOxygen) {
+            await safeStartMiniOxygen();
+          } else if (liveReload) {
+            await miniOxygen.reload({ worker: true });
           }
-          await safeStartMiniOxygen();
+          liveReload?.onAppReady(context);
         }
       },
       async onFileCreated(file) {

package/dist/commands/hydrogen/init.js

@@ -70,6 +70,9 @@ async function runInit(options = parseProcessFlags(process.argv, FLAG_MAP)) {
   supressNodeExperimentalWarnings();
   options.git ??= true;
   const showUpgrade = await checkHydrogenVersion(
+    // Resolving the CLI package from a local directory might fail because
+    // this code could be run from a global dependency (e.g. on `npm create`).
+    // Therefore, pass the known path to the package.json directly from here:
     fileURLToPath(new URL("../../../package.json", import.meta.url)),
     "cli"
   );

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,90 @@ 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(
+          // Output contains banner characters. USe [^\w]*? to match them.
+          /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,
@@ -124,12 +221,13 @@ describe("init", () => {
         expect(output).toMatch("Help");
         expect(output).toMatch("Next steps");
         expect(output).toMatch(
+          // Output contains banner characters. USe [^\w]*? to match them.
           /Run `cd .*? &&[^\w]*?npm[^\w]*?install[^\w]*?&&[^\w]*?npm[^\w]*?run[^\w]*?dev`/ims
         );
       });
     });
     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 +250,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 +280,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 +305,7 @@ describe("init", () => {
         });
       });
       it("scaffolds CSS Modules", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -229,7 +327,7 @@ describe("init", () => {
         });
       });
       it("scaffolds Vanilla Extract", async () => {
-        await temporaryDirectoryTask(async (tmpDir) => {
+        await inTemporaryDirectory(async (tmpDir) => {
           await runInit({
             path: tmpDir,
             git: false,
@@ -253,7 +351,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 +371,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 +391,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 +413,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 +440,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 +450,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,8 +1,9 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { muteDevLogs } from '../../lib/log.js';
 import { getProjectPaths } from '../../lib/remix-config.js';
-import { commonFlags } from '../../lib/flags.js';
+import { commonFlags, DEFAULT_PORT } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen.js';
+import { findPort } from '../../lib/find-port.js';
 
 class Preview extends Command {
   static description = "Runs a Hydrogen storefront in an Oxygen worker for production.";
@@ -16,7 +17,7 @@ class Preview extends Command {
   }
 }
 async function runPreview({
-  port,
+  port = DEFAULT_PORT,
   path: appPath
 }) {
   if (!process.env.NODE_ENV)
@@ -25,7 +26,7 @@ async function runPreview({
   const { root, buildPathWorkerFile, buildPathClient } = getProjectPaths(appPath);
   const miniOxygen = await startMiniOxygen({
     root,
-    port,
+    port: await findPort(port),
     buildPathClient,
     buildPathWorkerFile
   });

package/dist/commands/hydrogen/setup.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" }
   });
@@ -57,6 +57,8 @@ async function runSetup(options) {
     const typescript = !!remixConfig.tsconfigPath;
     backgroundWorkPromise = backgroundWorkPromise.then(
       () => Promise.all([
+        // When starting from hello-world, the server entry point won't
+        // include all the cart logic from skeleton, so we need to copy it.
         generateProjectFile("../server.ts", { ...remixConfig, typescript }),
         ...typescript ? [
           copyFile(
@@ -71,6 +73,7 @@ async function runSetup(options) {
             )
           )
         ] : [],
+        // Copy app entries
         generateProjectEntries({
           rootDirectory: remixConfig.rootDirectory,
           appDirectory: remixConfig.appDirectory,
@@ -130,4 +133,4 @@ async function runSetup(options) {
   );
 }
 
-export { Setup as default };
+export { Setup as default, runSetup };