@shopify/cli-hydrogen 12.0.0 → 12.0.2

package/dist/assets/hydrogen/starter/storefrontapi.generated.d.ts

@@ -36,6 +36,9 @@ export type CartLineFragment = Pick<
       Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
     >;
   };
+  parentRelationship?: StorefrontAPI.Maybe<{
+    parent: Pick<StorefrontAPI.CartLine, 'id'>;
+  }>;
 };
 
 export type CartLineComponentFragment = Pick<
@@ -66,6 +69,46 @@ export type CartLineComponentFragment = Pick<
       Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
     >;
   };
+  lineComponents: Array<
+    Pick<StorefrontAPI.CartLine, 'id' | 'quantity'> & {
+      attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
+      cost: {
+        totalAmount: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+        amountPerQuantity: Pick<
+          StorefrontAPI.MoneyV2,
+          'currencyCode' | 'amount'
+        >;
+        compareAtAmountPerQuantity?: StorefrontAPI.Maybe<
+          Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+        >;
+      };
+      merchandise: Pick<
+        StorefrontAPI.ProductVariant,
+        'id' | 'availableForSale' | 'requiresShipping' | 'title'
+      > & {
+        compareAtPrice?: StorefrontAPI.Maybe<
+          Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+        >;
+        price: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+        image?: StorefrontAPI.Maybe<
+          Pick<
+            StorefrontAPI.Image,
+            'id' | 'url' | 'altText' | 'width' | 'height'
+          >
+        >;
+        product: Pick<
+          StorefrontAPI.Product,
+          'handle' | 'title' | 'id' | 'vendor'
+        >;
+        selectedOptions: Array<
+          Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
+        >;
+      };
+      parentRelationship?: StorefrontAPI.Maybe<{
+        parent: Pick<StorefrontAPI.CartLine, 'id'>;
+      }>;
+    }
+  >;
 };
 
 export type CartApiQueryFragment = Pick<
@@ -124,6 +167,9 @@ export type CartApiQueryFragment = Pick<
               Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
             >;
           };
+          parentRelationship?: StorefrontAPI.Maybe<{
+            parent: Pick<StorefrontAPI.CartLine, 'id'>;
+          }>;
         })
       | (Pick<StorefrontAPI.ComponentizableCartLine, 'id' | 'quantity'> & {
           attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
@@ -159,6 +205,49 @@ export type CartApiQueryFragment = Pick<
               Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
             >;
           };
+          lineComponents: Array<
+            Pick<StorefrontAPI.CartLine, 'id' | 'quantity'> & {
+              attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
+              cost: {
+                totalAmount: Pick<
+                  StorefrontAPI.MoneyV2,
+                  'currencyCode' | 'amount'
+                >;
+                amountPerQuantity: Pick<
+                  StorefrontAPI.MoneyV2,
+                  'currencyCode' | 'amount'
+                >;
+                compareAtAmountPerQuantity?: StorefrontAPI.Maybe<
+                  Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+                >;
+              };
+              merchandise: Pick<
+                StorefrontAPI.ProductVariant,
+                'id' | 'availableForSale' | 'requiresShipping' | 'title'
+              > & {
+                compareAtPrice?: StorefrontAPI.Maybe<
+                  Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+                >;
+                price: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+                image?: StorefrontAPI.Maybe<
+                  Pick<
+                    StorefrontAPI.Image,
+                    'id' | 'url' | 'altText' | 'width' | 'height'
+                  >
+                >;
+                product: Pick<
+                  StorefrontAPI.Product,
+                  'handle' | 'title' | 'id' | 'vendor'
+                >;
+                selectedOptions: Array<
+                  Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
+                >;
+              };
+              parentRelationship?: StorefrontAPI.Maybe<{
+                parent: Pick<StorefrontAPI.CartLine, 'id'>;
+              }>;
+            }
+          >;
         })
     >;
   };
@@ -288,13 +377,6 @@ export type FooterQuery = {
   >;
 };
 
-export type StoreRobotsQueryVariables = StorefrontAPI.Exact<{
-  country?: StorefrontAPI.InputMaybe<StorefrontAPI.CountryCode>;
-  language?: StorefrontAPI.InputMaybe<StorefrontAPI.LanguageCode>;
-}>;
-
-export type StoreRobotsQuery = {shop: Pick<StorefrontAPI.Shop, 'id'>};
-
 export type FeaturedCollectionFragment = Pick<
   StorefrontAPI.Collection,
   'id' | 'title' | 'handle'
@@ -1194,10 +1276,6 @@ interface GeneratedQueryTypes {
     return: FooterQuery;
     variables: FooterQueryVariables;
   };
-  '#graphql\n  query StoreRobots($country: CountryCode, $language: LanguageCode)\n   @inContext(country: $country, language: $language) {\n    shop {\n      id\n    }\n  }\n': {
-    return: StoreRobotsQuery;
-    variables: StoreRobotsQueryVariables;
-  };
   '#graphql\n  fragment FeaturedCollection on Collection {\n    id\n    title\n    image {\n      id\n      url\n      altText\n      width\n      height\n    }\n    handle\n  }\n  query FeaturedCollection($country: CountryCode, $language: LanguageCode)\n    @inContext(country: $country, language: $language) {\n    collections(first: 1, sortKey: UPDATED_AT, reverse: true) {\n      nodes {\n        ...FeaturedCollection\n      }\n    }\n  }\n': {
     return: FeaturedCollectionQuery;
     variables: FeaturedCollectionQueryVariables;

package/dist/assets/hydrogen/starter/vite.config.ts

@@ -2,13 +2,15 @@ import {defineConfig} from 'vite';
 import {hydrogen} from '@shopify/hydrogen/vite';
 import {oxygen} from '@shopify/mini-oxygen/vite';
 import {reactRouter} from '@react-router/dev/vite';
-import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
-  plugins: [hydrogen(), oxygen(), reactRouter(), tsconfigPaths()],
+  plugins: [hydrogen(), oxygen(), reactRouter()],
+  resolve: {
+    tsconfigPaths: true,
+  },
   build: {
     // Allow a strict Content-Security-Policy
-    // withtout inlining assets as base64:
+    // without inlining assets as base64:
     assetsInlineLimit: 0,
   },
   ssr: {
@@ -23,7 +25,11 @@ export default defineConfig({
        * Include 'example-dep' in the array below.
        * @see https://vitejs.dev/config/dep-optimization-options
        */
-      include: ['set-cookie-parser', 'cookie', 'react-router'],
+      include: [
+        'react-router > set-cookie-parser',
+        'react-router > cookie',
+        'react-router',
+      ],
     },
   },
   server: {

package/dist/assets/hydrogen/vite/package.json

@@ -8,7 +8,6 @@
     "isbot": "^5.1.21"
   },
   "devDependencies": {
-    "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^4.3.1"
+    "vite": "^8.0.1"
   }
 }

package/dist/assets/hydrogen/vite/vite.config.js

@@ -2,9 +2,11 @@ import {defineConfig} from 'vite';
 import {hydrogen} from '@shopify/hydrogen/vite';
 import {oxygen} from '@shopify/mini-oxygen/vite';
 import {vitePlugin as remix} from '@remix-run/dev';
-import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
+  resolve: {
+    tsconfigPaths: true,
+  },
   plugins: [
     hydrogen(),
     oxygen(),
@@ -17,11 +19,10 @@ export default defineConfig({
         v3_routeConfig: false,
       },
     }),
-    tsconfigPaths(),
   ],
   build: {
     // Allow a strict Content-Security-Policy
-    // withtout inlining assets as base64:
+    // without inlining assets as base64:
     assetsInlineLimit: 0,
   },
   ssr: {

package/dist/commands/hydrogen/deploy.js

@@ -46,7 +46,7 @@ class Deploy extends Command {
     }),
     force: Flags.boolean({
       char: "f",
-      description: "Forces a deployment to proceed if there are uncommited changes in its Git repository.",
+      description: "Forces a deployment to proceed if there are uncommitted changes in its Git repository.",
       default: false,
       env: "SHOPIFY_HYDROGEN_FLAG_FORCE",
       required: false
@@ -88,7 +88,7 @@ class Deploy extends Command {
       required: false
     }),
     "metadata-description": Flags.string({
-      description: "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.",
+      description: "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommitted changes.",
       required: false,
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION"
     }),
@@ -155,7 +155,7 @@ async function runDeploy(options) {
     env: envHandle,
     envBranch,
     environmentFile,
-    force: forceOnUncommitedChanges,
+    force: forceOnUncommittedChanges,
     forceClientSourcemap = false,
     noVerify,
     lockfileCheck,
@@ -175,7 +175,7 @@ async function runDeploy(options) {
     if (error instanceof GitDirectoryNotCleanError) {
       isCleanGit = false;
     }
-    if (!forceOnUncommitedChanges && !isCleanGit) {
+    if (!forceOnUncommittedChanges && !isCleanGit) {
       let errorMessage = "Uncommitted changes detected";
       let changedFiles = void 0;
       const nextSteps = [
@@ -193,15 +193,21 @@ async function runDeploy(options) {
         errorMessage += `:
 
 ${changedFiles.trimEnd()}`;
-        packageManagers.forEach(({ name, lockfile, installCommand }) => {
-          if (changedFiles.includes(lockfile)) {
-            nextSteps.push([
-              `If you are using ${name}, try running`,
-              { command: installCommand },
-              `to avoid changes to ${lockfile}.`
-            ]);
+        packageManagers.forEach(
+          ({ name, lockfile, alternativeLockfiles, installCommand }) => {
+            const allLockfiles = [lockfile, ...alternativeLockfiles || []];
+            const changedLockfile = allLockfiles.find(
+              (lf) => changedFiles.includes(lf)
+            );
+            if (changedLockfile) {
+              nextSteps.push([
+                `If you are using ${name}, try running`,
+                { command: installCommand },
+                `to avoid changes to ${changedLockfile}.`
+              ]);
+            }
           }
-        });
+        );
       }
       throw new AbortError(errorMessage, null, nextSteps);
     }
@@ -225,7 +231,7 @@ ${changedFiles.trimEnd()}`;
     renderWarning({
       headline: "No deployment description provided",
       body: [
-        "Deploying uncommited changes, but no description has been provided. Use the ",
+        "Deploying uncommitted changes, but no description has been provided. Use the ",
         { command: "--metadata-description" },
         "flag to provide a description. If no description is provided, the description defaults to ",
         { userInput: "<sha> with additional changes" },

package/dist/commands/hydrogen/dev.js

@@ -7,11 +7,10 @@ import { renderSuccess, renderInfo } from '@shopify/cli-kit/node/ui';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { removeFile } from '@shopify/cli-kit/node/fs';
 import { setH2OVerbose, isH2Verbose, muteDevLogs, enhanceH2Logs } from '../../lib/log.js';
-import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_INSPECTOR_PORT, DEFAULT_APP_PORT } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_APP_PORT, DEFAULT_INSPECTOR_PORT } from '../../lib/flags.js';
 import { spawnCodegenProcess } from '../../lib/codegen.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { displayDevUpgradeNotice } from './upgrade.js';
-import { checkReactRouterVersions } from '../../lib/react-router-version-check.js';
 import { getDevConfigInBackground, TUNNEL_DOMAIN, startTunnelAndPushConfig, isMockShop, notifyIssueWithTunnelAndMockShop, getUtilityBannerlines, getDebugBannerLine } from '../../lib/dev-shared.js';
 import { getCliCommand } from '../../lib/shell.js';
 import { findPort } from '../../lib/find-port.js';
@@ -104,6 +103,9 @@ async function runDev({
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
   if (verbose) setH2OVerbose();
   if (!isH2Verbose()) muteDevLogs();
+  if (appPort === 0) {
+    appPort = await findPort(DEFAULT_APP_PORT);
+  }
   const root = appPath ?? process.cwd();
   const cliCommandPromise = getCliCommand(root);
   const backgroundPromise = getDevConfigInBackground(
@@ -134,6 +136,8 @@ async function runDev({
   const viteServer = await vite.createServer({
     root,
     clearScreen: false,
+    // In unit tests, node_modules is a symlink. Avoid writing .vite cache inside it.
+    cacheDir: process.env.SHOPIFY_UNIT_TEST ? joinPath(root, ".vite") : void 0,
     customLogger: process.env.SHOPIFY_UNIT_TEST ? Object.assign(vite.createLogger(), {
       info: (msg) => collectLog("info", msg),
       warn: (msg) => collectLog("warn", msg),
@@ -197,7 +201,6 @@ async function runDev({
       "Add `hydrogen()` plugin to your Vite config."
     );
   }
-  h2Plugin.api?.getPluginOptions?.();
   const remixConfig = (await getViteConfig(root)).remixConfig;
   let codegenProcess;
   const setupCodegen = useCodegen ? () => {
@@ -236,9 +239,6 @@ async function runDev({
   viteServer.bindCLIShortcuts({ print: true });
   console.log("\n");
   const storefrontTitle = (await backgroundPromise).storefrontTitle;
-  if (!disableVersionCheck) {
-    await checkReactRouterVersions(root);
-  }
   showSuccessBanner({
     disableVirtualRoutes,
     debug,

package/dist/commands/hydrogen/generate/route.js

@@ -12,7 +12,7 @@ class GenerateRoute extends Command {
   static description = "Generates a standard Shopify route.";
   static flags = {
     adapter: Flags.string({
-      description: "Remix adapter used in the route. The default is `@shopify/remix-oxygen`.",
+      description: "React Router adapter used in the route. The default is `react-router`.",
       env: "SHOPIFY_HYDROGEN_FLAG_ADAPTER"
     }),
     typescript: Flags.boolean({

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

@@ -1,6 +1,6 @@
+import { PackageManager } from '@shopify/cli-kit/node/node-package-manager';
 import * as _oclif_core_lib_interfaces_parser_js from '@oclif/core/lib/interfaces/parser.js';
 import Command from '@shopify/cli-kit/node/base-command';
-import { PackageManager } from '@shopify/cli-kit/node/node-package-manager';
 
 declare const SETUP_I18N_STRATEGIES: readonly ["subfolders", "domains", "subdomains"];
 type I18nStrategy = (typeof SETUP_I18N_STRATEGIES)[number];
@@ -24,7 +24,6 @@ type InitOptions = {
     i18n?: I18nChoice;
     token?: string;
     force?: boolean;
-    routes?: boolean;
     shortcut?: boolean;
     installDeps?: boolean;
     git?: boolean;
@@ -41,7 +40,6 @@ declare class Init extends Command {
     static descriptionWithMarkdown: string;
     static description: string;
     static flags: {
-        routes: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         git: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         quickstart: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'package-manager': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
@@ -60,7 +58,7 @@ declare class Init extends Command {
 declare function runInit({ markets, ...options }?: InitOptions & {
     markets?: InitOptions['i18n'];
 }): Promise<{
-    language?: "ts" | "js";
+    language?: Language;
     packageManager: "npm" | "pnpm" | "yarn" | "bun" | "unknown";
     cssStrategy?: CssStrategy;
     cliCommand: CliCommand;

package/dist/commands/hydrogen/init.js

@@ -1,7 +1,7 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { Flags } from '@oclif/core';
 import { AbortError } from '@shopify/cli-kit/node/error';
-import { commonFlags, parseProcessFlags, flagsToCamelObject } from '../../lib/flags.js';
+import { commonFlags, flagsToCamelObject, parseProcessFlags } from '../../lib/flags.js';
 import { checkCurrentCLIVersion } from '../../lib/check-cli-version.js';
 import { STYLING_CHOICES } from '../../lib/setups/css/index.js';
 import { I18N_CHOICES } from '../../lib/setups/i18n/index.js';
@@ -36,11 +36,6 @@ class Init extends Command {
     ...commonFlags.styling,
     ...commonFlags.markets,
     ...commonFlags.shortcut,
-    routes: Flags.boolean({
-      description: "Generate routes for all pages.",
-      env: "SHOPIFY_HYDROGEN_FLAG_ROUTES",
-      allowNo: true
-    }),
     git: Flags.boolean({
       description: "Init Git and create initial commits.",
       env: "SHOPIFY_HYDROGEN_FLAG_GIT",
@@ -48,7 +43,7 @@ class Init extends Command {
       allowNo: true
     }),
     quickstart: Flags.boolean({
-      description: "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --routes --markets none`",
+      description: "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --markets none`",
       env: "SHOPIFY_HYDROGEN_FLAG_QUICKSTART",
       default: false
     }),
@@ -91,7 +86,6 @@ async function runInit({
     options.language ??= "js";
     options.mockShop ??= true;
     options.path ??= "./hydrogen-quickstart";
-    options.routes ??= true;
     options.shortcut ??= true;
     options.styling ??= "none";
   }

package/dist/commands/hydrogen/preview.js

@@ -5,7 +5,7 @@ import { outputInfo } from '@shopify/cli-kit/node/output';
 import { resolvePath, joinPath } from '@shopify/cli-kit/node/path';
 import { setH2OVerbose, isH2Verbose, muteDevLogs } from '../../lib/log.js';
 import { getProjectPaths, isClassicProject } from '../../lib/remix-config.js';
-import { overrideFlag, commonFlags, flagsToCamelObject, DEFAULT_APP_PORT } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject, DEFAULT_APP_PORT } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen/index.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
 import { getConfig } from '../../lib/shopify-config.js';

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

@@ -1,5 +1,5 @@
 import { resolvePath } from '@shopify/cli-kit/node/path';
-import { overrideFlag, commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject } from '../../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess, renderTasks, renderWarning } from '@shopify/cli-kit/node/ui';
 import { getPackageManager, installNodeModules } from '@shopify/cli-kit/node/node-package-manager';

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

@@ -45,7 +45,7 @@ async function runSetupMarkets({
     }
   ]);
   renderSuccess({
-    headline: `Makerts support setup complete with strategy ${I18N_STRATEGY_NAME_MAP[strategy].toLocaleLowerCase()}.`,
+    headline: `Markets support setup complete with strategy ${I18N_STRATEGY_NAME_MAP[strategy].toLowerCase()}.`,
     body: `You can now modify the supported locales in ${remixConfig.serverEntryPoint ?? "your server entry file."}
 `
   });

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

@@ -5,7 +5,7 @@ import { removeFile, moveFile, readFile, writeFile, fileExists } from '@shopify/
 import { readAndParsePackageJson, installNodeModules, getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
 import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
 import { getRawRemixConfig } from '../../../lib/remix-config.js';
-import { mergePackageJson, replaceFileContent } from '../../../lib/file.js';
+import { replaceFileContent, mergePackageJson } from '../../../lib/file.js';
 import { importLangAstGrep } from '../../../lib/ast.js';
 import { getAssetsDir } from '../../../lib/build.js';
 import { getCodeFormatOptions, formatCode } from '../../../lib/format-code.js';

package/dist/commands/hydrogen/setup.js

@@ -3,7 +3,7 @@ import { AbortController } from '@shopify/cli-kit/node/abort';
 import { renderTasks } from '@shopify/cli-kit/node/ui';
 import { resolvePath, basename, joinPath } from '@shopify/cli-kit/node/path';
 import { fileExists, glob, copyFile } from '@shopify/cli-kit/node/fs';
-import { overrideFlag, commonFlags, flagsToCamelObject } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.js';
 import { renderI18nPrompt, setupI18nStrategy } from '../../lib/setups/i18n/index.js';
 import { getRemixConfig } from '../../lib/remix-config.js';
 import { handleRouteGeneration, generateProjectEntries, handleCliShortcut, renderProjectReady } from '../../lib/onboarding/common.js';
@@ -49,39 +49,37 @@ async function runSetup(options) {
     extraChoices: { none: "Set up later" }
   });
   const i18n = i18nStrategy === "none" ? void 0 : i18nStrategy;
-  const { needsRouteGeneration, setupRoutes } = await handleRouteGeneration(controller);
+  const { setupRoutes } = handleRouteGeneration(controller);
   let routes;
-  if (needsRouteGeneration) {
-    const templateRoot = await getTemplateAppFile("..");
-    const [typescript, dtsFiles] = await Promise.all([
-      fileExists(joinPath(rootDirectory, "tsconfig.json")),
-      glob("*.d.ts", { cwd: templateRoot })
-    ]);
-    backgroundWorkPromise = backgroundWorkPromise.then(
-      () => Promise.all([
-        ...dtsFiles.map(
-          (filename) => copyFile(
-            joinPath(templateRoot, filename),
-            resolvePath(rootDirectory, filename)
-          )
-        ),
-        // Copy app entries
-        generateProjectEntries({
-          rootDirectory,
-          appDirectory,
-          typescript
-        })
-      ])
-    ).then(async () => {
-      routes = await setupRoutes(rootDirectory, typescript ? "ts" : "js", {
-        i18nStrategy: i18n,
-        // User might have added files before running this command.
-        // We should overwrite them to ensure the routes are set up correctly.
-        // Relies on Git to restore the files if needed.
-        overwriteFileDeps: true
-      });
+  const templateRoot = await getTemplateAppFile("..");
+  const [typescript, dtsFiles] = await Promise.all([
+    fileExists(joinPath(rootDirectory, "tsconfig.json")),
+    glob("*.d.ts", { cwd: templateRoot })
+  ]);
+  backgroundWorkPromise = backgroundWorkPromise.then(
+    () => Promise.all([
+      ...dtsFiles.map(
+        (filename) => copyFile(
+          joinPath(templateRoot, filename),
+          resolvePath(rootDirectory, filename)
+        )
+      ),
+      // Copy app entries
+      generateProjectEntries({
+        rootDirectory,
+        appDirectory,
+        typescript
+      })
+    ])
+  ).then(async () => {
+    routes = await setupRoutes(rootDirectory, typescript ? "ts" : "js", {
+      i18nStrategy: i18n,
+      // User might have added files before running this command.
+      // We should overwrite them to ensure the routes are set up correctly.
+      // Relies on Git to restore the files if needed.
+      overwriteFileDeps: true
     });
-  }
+  });
   if (i18n) {
     backgroundWorkPromise = backgroundWorkPromise.then(
       () => setupI18nStrategy(i18n, { rootDirectory })
@@ -93,7 +91,7 @@ async function runSetup(options) {
     cliCommand,
     options.shortcut
   );
-  if (!i18n && !needsRouteGeneration && !createShortcut) return;
+  if (!i18n && !createShortcut) return;
   if (createShortcut) {
     backgroundWorkPromise = backgroundWorkPromise.then(async () => {
       if (await createShortcut()) {