@shopify/cli 3.65.1 → 3.65.3

package/dist/{chunk-GDARYUPU.js → chunk-K7KD247K.js}

@@ -7,13 +7,13 @@ import {
   handleDeprecations,
   logout,
   normalizeStoreFqdn
-} from "./chunk-YXPGPWR2.js";
+} from "./chunk-U2PN6QZ2.js";
 import {
   base_command_default
-} from "./chunk-EZ5DG73H.js";
+} from "./chunk-PEAIOYXD.js";
 import {
   fanoutHooks
-} from "./chunk-3REVOIEW.js";
+} from "./chunk-UBCH575K.js";
 import {
   findUpAndReadPackageJson,
   getPackageManager,
@@ -21,7 +21,7 @@ import {
   packageManagerFromUserAgent,
   readAndParsePackageJson,
   writePackageJSON
-} from "./chunk-J7BYFGNJ.js";
+} from "./chunk-3GSKXZGY.js";
 import {
   AbortError,
   BugError,
@@ -59,7 +59,7 @@ import {
   runWithTimer,
   source_default,
   writeFile
-} from "./chunk-EID6L4PR.js";
+} from "./chunk-T4Y7NDNJ.js";
 import {
   require_lib
 } from "./chunk-GEN4RXTD.js";
@@ -155554,21 +155554,21 @@ var require_main = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/flags.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/flags.js
 init_cjs_shims();
 var import_core = __toESM(require_lib(), 1);
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/index.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/index.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/assets.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/assets.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/build.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/build.js
 init_cjs_shims();
 import { fileURLToPath } from "node:url";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/process.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/process.js
 init_cjs_shims();
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
@@ -155585,7 +155585,7 @@ function supressNodeExperimentalWarnings() {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/build.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/build.js
 var monorepoPackagesPath = new URL("../../..", import.meta.url).pathname;
 var isHydrogenMonorepo = monorepoPackagesPath.endsWith(
   "/hydrogen/packages/"
@@ -155647,7 +155647,7 @@ async function getRepoNodeModules() {
   return nodeModulesPath;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/assets.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/assets.js
 var SETUP_CSS_STRATEGIES = [
   "tailwind",
   "vanilla-extract",
@@ -155691,14 +155691,14 @@ async function canWriteFiles(assetMap, directory, force) {
   return true;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/tailwind.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/tailwind.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/file.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/file.js
 init_cjs_shims();
 import { readdir } from "node:fs/promises";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/format-code.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/format-code.js
 init_cjs_shims();
 var prettier = __toESM(require_prettier(), 1);
 var DEFAULT_PRETTIER_CONFIG = {
@@ -155725,7 +155725,7 @@ async function formatCode(content, config = DEFAULT_PRETTIER_CONFIG, filePath =
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/file.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/file.js
 async function replaceFileContent(filepath, formatConfig, replacer) {
   let content = await replacer(await readFile(filepath));
   if (typeof content !== "string")
@@ -155830,10 +155830,10 @@ async function mergeTsConfig(sourceDir, targetDir) {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/replacers.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/replacers.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/ast.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/ast.js
 init_cjs_shims();
 async function importLangAstGrep(lang) {
   const astGrep = await import("@ast-grep/napi");
@@ -155843,7 +155843,7 @@ async function importLangAstGrep(lang) {
   return astGrep[lang];
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/replacers.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/replacers.js
 async function replaceRootLinks(appDirectory, formatConfig, importer) {
   const { filepath, astType } = await findFileWithExtension(appDirectory, "root");
   if (!filepath || !astType) {
@@ -155856,8 +155856,8 @@ async function replaceRootLinks(appDirectory, formatConfig, importer) {
     }
     const astGrep = await importLangAstGrep(astType);
     const root = astGrep.parse(content).root();
-    const importNodes = root.findAll({ rule: { kind: "import_statement" } });
-    const lastImportNode = importNodes.findLast((node) => node.text().includes(".css")) || importNodes.pop();
+    const importNodes = root.findAll({ rule: { kind: "import_statement" } }).reverse();
+    const lastImportNode = importNodes.find((node) => node.text().includes(".css")) || importNodes.shift();
     const linksReturnNode = root.find({
       utils: {
         "has-links-id": {
@@ -155977,7 +155977,7 @@ var vitePluginListRule = {
   }
 };
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/tailwind.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/tailwind.js
 var tailwindCssPath = "styles/tailwind.css";
 async function setupTailwind({ rootDirectory, appDirectory }, force = false) {
   const relativeAppDirectory = relativePath(rootDirectory, appDirectory);
@@ -156015,7 +156015,7 @@ async function setupTailwind({ rootDirectory, appDirectory }, force = false) {
   };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/vanilla-extract.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/vanilla-extract.js
 init_cjs_shims();
 async function setupVanillaExtract({
   rootDirectory
@@ -156037,7 +156037,7 @@ async function setupVanillaExtract({
   };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/index.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/css/index.js
 var STYLING_CHOICES = [...SETUP_CSS_STRATEGIES, "none"];
 var CSS_STRATEGY_NAME_MAP = {
   tailwind: "Tailwind (v4 alpha)",
@@ -156084,23 +156084,23 @@ async function renderCssPrompt(options) {
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/index.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/index.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/replacers.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/replacers.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/index.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/index.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/file.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/file.js
 init_cjs_shims();
 async function transpileFile(code, filepath, keepTypes = true) {
-  const { transpileTs } = await import("./morph-DN4AZJZW.js");
+  const { transpileTs } = await import("./morph-IQTWRBBT.js");
   return transpileTs(code, filepath, keepTypes);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/project.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/transpile/project.js
 init_cjs_shims();
 var DEFAULT_JS_CONFIG = {
   checkJs: false,
@@ -156234,12 +156234,22 @@ async function transpileProject(projectDir, keepTypes = true) {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/replacers.js
-async function replaceServerI18n({ rootDirectory, serverEntryPoint = "server" }, formatConfig, localeExtractImpl, isJs) {
-  const { filepath, astType } = await findEntryFile({
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/replacers.js
+async function replaceContextI18n({
+  rootDirectory,
+  contextCreate = joinPath("app", "lib", "context.ts")
+}, formatConfig, i18nStrategyFilePath) {
+  const createContextMethodName = "createAppLoadContext";
+  const { filepath, astType } = await findContextCreateFile({
     rootDirectory,
-    serverEntryPoint
+    contextCreate
   });
+  const localeExtractImpl = await readFile(i18nStrategyFilePath);
+  const i18nFileFinalPath = await replaceI18nStrategy(
+    { rootDirectory, contextCreate },
+    formatConfig,
+    i18nStrategyFilePath
+  );
   await replaceFileContent(filepath, formatConfig, async (content) => {
     const astGrep = await importLangAstGrep(astType);
     const root = astGrep.parse(content).root();
@@ -156250,15 +156260,11 @@ async function replaceServerI18n({ rootDirectory, serverEntryPoint = "server" },
           kind: "formal_parameters",
           stopBy: "end",
           inside: {
-            kind: "method_definition",
+            kind: "function_declaration",
             stopBy: "end",
             has: {
-              kind: "property_identifier",
-              regex: "^fetch$"
-            },
-            inside: {
-              kind: "export_statement",
-              stopBy: "end"
+              kind: "identifier",
+              regex: `^${createContextMethodName}$`
             }
           }
         }
@@ -156273,7 +156279,7 @@ async function replaceServerI18n({ rootDirectory, serverEntryPoint = "server" },
     }
     const i18nFunctionCall = `${i18nFunctionName}(${requestIdentifierName})`;
     const hydrogenImportPath = "@shopify/hydrogen";
-    const hydrogenImportName = "createStorefrontClient";
+    const hydrogenImportName = "createHydrogenContext";
     const importSpecifier = root.find({
       rule: {
         kind: "import_specifier",
@@ -156297,7 +156303,7 @@ async function replaceServerI18n({ rootDirectory, serverEntryPoint = "server" },
     importName = importAlias ?? importName;
     if (!importName) {
       throw new AbortError(
-        `Could not find a Hydrogen import in ${serverEntryPoint}`,
+        `Could not find a Hydrogen import in ${contextCreate}`,
         `Please import "${hydrogenImportName}" from "${hydrogenImportPath}"`
       );
     }
@@ -156318,40 +156324,10 @@ async function replaceServerI18n({ rootDirectory, serverEntryPoint = "server" },
     });
     if (!argumentObject) {
       throw new AbortError(
-        `Could not find a Hydrogen client instantiation with an inline object as argument in ${serverEntryPoint}`,
+        `Could not find a Hydrogen client instantiation with an inline object as argument in ${contextCreate}`,
         `Please add a call to ${importName}({...})`
       );
     }
-    const defaultExportObject = root.find({
-      rule: {
-        kind: "export_statement",
-        regex: "^export default \\{"
-      }
-    });
-    if (!defaultExportObject) {
-      throw new AbortError(
-        "Could not find a default export in the server entry point"
-      );
-    }
-    let localeExtractFn = localeExtractImpl.match(/^(\/\*\*.*?\*\/\n)?^function .+?^}/ms)?.[0] || "";
-    if (!localeExtractFn) {
-      throw new AbortError(
-        "Could not find the locale extract function. This is a bug in Hydrogen."
-      );
-    }
-    if (isJs) {
-      localeExtractFn = await transpileFile(
-        localeExtractFn,
-        "locale-extract-server.ts"
-      );
-    } else {
-      localeExtractFn = localeExtractFn.replace(/\/\*\*.*?\*\//gms, "");
-    }
-    const defaultExportEnd = defaultExportObject.range().end.index;
-    content = content.slice(0, defaultExportEnd) + `
-
-${localeExtractFn}
-` + content.slice(defaultExportEnd);
     const i18nProperty = argumentObject.find({
       rule: {
         kind: "property_identifier",
@@ -156373,113 +156349,64 @@ ${localeExtractFn}
       const firstPart = content.slice(0, end.index - 1);
       content = firstPart + ((/,\s*$/.test(firstPart) ? "" : ",") + `i18n: ${i18nFunctionCall}`) + content.slice(end.index - 1);
     }
+    const lastImport = root.findAll({ rule: { kind: "import_statement" } }).pop();
+    const lastImportRange = lastImport?.range() ?? {
+      end: { index: 0 }
+    };
+    const i18nFunctionImport = joinPath(
+      "~",
+      relativePath(
+        joinPath(rootDirectory, "app"),
+        i18nFileFinalPath.slice(0, -extname(i18nFileFinalPath).length)
+      )
+    );
+    content = content.slice(0, lastImportRange.end.index) + `import {getLocaleFromRequest} from "${i18nFunctionImport}";` + content.slice(lastImportRange.end.index);
     return content;
   });
 }
-async function replaceRemixEnv({ rootDirectory }, formatConfig, localeExtractImpl) {
-  let envPath = joinPath(rootDirectory, "env.d.ts");
-  if (!await fileExists(envPath)) {
-    envPath = "remix.env.d.ts";
-    if (!await fileExists(envPath)) {
-      return;
-    }
-  }
-  const i18nType = localeExtractImpl.match(
-    /^(export )?(type \w+ =\s+\{.*?\};)\n/ms
-  )?.[2];
-  const i18nTypeName = i18nType?.match(/^type (\w+)/)?.[1];
-  if (!i18nTypeName) {
-    return;
+async function replaceI18nStrategy({
+  rootDirectory,
+  contextCreate = joinPath("app", "lib", "context.ts")
+}, formatConfig, i18nStrategyFilePath) {
+  const isJs = contextCreate?.endsWith(".js") || false;
+  const i18nPath = joinPath(
+    rootDirectory,
+    dirname(contextCreate),
+    isJs ? "i18n.js" : "i18n.ts"
+  );
+  if (await fileExists(i18nPath)) {
+    throw new AbortError(
+      `${i18nPath} already exist. Renamed or remove the existing file before continue.`
+    );
   }
-  await replaceFileContent(envPath, formatConfig, async (content) => {
-    if (content.includes(`Storefront<`))
-      return;
-    const astGrep = await importLangAstGrep("ts");
-    const root = astGrep.parse(content).root();
-    const storefrontTypeNode = root.find({
-      rule: {
-        kind: "property_signature",
-        has: {
-          kind: "type_annotation",
-          has: {
-            regex: "^Storefront$"
-          }
-        },
-        inside: {
-          kind: "interface_declaration",
-          stopBy: "end",
-          regex: "AppLoadContext"
-        }
-      }
-    });
-    if (storefrontTypeNode) {
-      const storefrontTypeNodeRange = storefrontTypeNode.range();
-      content = content.slice(0, storefrontTypeNodeRange.end.index) + `<${i18nTypeName}>` + content.slice(storefrontTypeNodeRange.end.index);
-    }
-    const ambientDeclarationContentNode = root.find({
-      rule: {
-        kind: "statement_block",
-        inside: {
-          kind: "ambient_declaration"
-        }
-      }
-    });
-    const i18nTypeDeclaration = `
-    /**
-     * The I18nLocale used for Storefront API query context.
-     */
-    ${i18nType}`;
-    if (ambientDeclarationContentNode) {
-      const { end } = ambientDeclarationContentNode.range();
-      content = content.slice(0, end.index - 1) + `
-
-${i18nTypeDeclaration}
-` + content.slice(end.index - 1);
-    } else {
-      content = content + `
-
-declare global {
-${i18nTypeDeclaration}
-}`;
-    }
-    const importImplTypes = localeExtractImpl.match(
-      /import\s+type\s+[^;]+?;/
-    )?.[0];
-    if (importImplTypes) {
-      const importPlace = root.findAll({
-        rule: {
-          kind: "import_statement",
-          has: {
-            kind: "string_fragment",
-            stopBy: "end",
-            regex: `^@shopify/hydrogen$`
-          }
-        }
-      }).pop() ?? root.findAll({ rule: { kind: "import_statement" } }).pop() ?? root.findAll({ rule: { kind: "comment", regex: "^/// <reference" } }).pop();
-      const importPlaceRange = importPlace?.range() ?? { end: { index: 0 } };
-      content = content.slice(0, importPlaceRange.end.index) + importImplTypes.replace(
-        /'[^']+'/,
-        `'@shopify/hydrogen/storefront-api-types'`
-      ) + content.slice(importPlaceRange.end.index);
+  await copyFile(i18nStrategyFilePath, i18nPath);
+  await replaceFileContent(i18nPath, formatConfig, async (content) => {
+    content = content.replace(/\.\/mock-i18n-types\.js/, "@shopify/hydrogen");
+    if (isJs) {
+      content = await transpileFile(content, i18nStrategyFilePath);
     }
     return content;
   });
+  return i18nPath;
 }
-async function findEntryFile({
+async function findContextCreateFile({
   rootDirectory,
-  serverEntryPoint = "server"
+  contextCreate = joinPath("app", "lib", "context.ts")
 }) {
-  const match = serverEntryPoint.match(/\.([jt]sx?)$/)?.[1];
-  const { filepath, astType } = match ? { filepath: resolvePath(rootDirectory, serverEntryPoint), astType: match } : await findFileWithExtension(rootDirectory, serverEntryPoint);
+  const match = contextCreate.match(/\.([jt]sx?)$/)?.[1];
+  const { filepath, astType } = match ? { filepath: resolvePath(rootDirectory, contextCreate), astType: match } : await findFileWithExtension(rootDirectory, joinPath(contextCreate));
   if (!filepath || !astType) {
     throw new AbortError(
-      `Could not find a server entry point at ${serverEntryPoint}`
+      `Could not find a context create file at ${resolvePath(
+        rootDirectory,
+        contextCreate
+      )}`
     );
   }
   return { filepath, astType };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/index.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/i18n/index.js
 var SETUP_I18N_STRATEGIES = [
   "subfolders",
   "domains",
@@ -156496,11 +156423,8 @@ async function setupI18nStrategy(strategy, options) {
   if (!await fileExists(templatePath)) {
     throw new Error("Unknown strategy");
   }
-  const template = await readFile(templatePath);
   const formatConfig = await getCodeFormatOptions(options.rootDirectory);
-  const isJs = options.serverEntryPoint?.endsWith(".js") ?? false;
-  await replaceServerI18n(options, formatConfig, template, isJs);
-  await replaceRemixEnv(options, formatConfig, template);
+  await replaceContextI18n(options, formatConfig, templatePath);
 }
 async function renderI18nPrompt(options) {
   const i18nStrategies = Object.entries({
@@ -156517,7 +156441,7 @@ async function renderI18nPrompt(options) {
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/flags.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/flags.js
 var DEFAULT_APP_PORT = 3e3;
 var DEFAULT_INSPECTOR_PORT = 9229;
 var commonFlags = {
@@ -156580,6 +156504,13 @@ var commonFlags = {
       }
     })
   },
+  envFile: {
+    "env-file": import_core.Flags.string({
+      description: "Path to an environment file to override existing environment variables. Defaults to the '.env' located in your project path `--path`.",
+      required: false,
+      default: ".env"
+    })
+  },
   sourcemap: {
     sourcemap: import_core.Flags.boolean({
       description: "Controls whether sourcemaps are generated. Default to `true`. Deactivate `--no-sourcemaps`.",
@@ -156730,7 +156661,7 @@ function overrideFlag(flags, extra) {
   );
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/import-utils.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/import-utils.js
 init_cjs_shims();
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
@@ -156756,13 +156687,13 @@ function importLocal(packageName, path3) {
   return import(pathToFileURL(realPath).href);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/request-events.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/request-events.js
 init_cjs_shims();
 import path from "node:path";
 import { EventEmitter } from "node:events";
 import { ReadableStream } from "node:stream/web";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphiql-url.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphiql-url.js
 init_cjs_shims();
 function getGraphiQLUrl({
   host = "",
@@ -156781,7 +156712,7 @@ function getGraphiQLUrl({
   return url;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/request-events.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/request-events.js
 var import_source_map_support = __toESM(require_source_map_support(), 1);
 var H2O_BINDING_NAME = "H2O_LOG_EVENT";
 var ResponseConstructor;
@@ -156919,7 +156850,7 @@ function handleDebugNetworkRequest(request) {
   return request.method === "DELETE" ? clearHistory() : streamRequestEvents(request);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/mini-oxygen/common.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/mini-oxygen/common.js
 init_cjs_shims();
 var SUBREQUEST_PROFILER_ENDPOINT = "/debug-network-server";
 function handleMiniOxygenImportFail() {
@@ -156960,21 +156891,21 @@ function logRequestLine({
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/dev-shared.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/dev-shared.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/customer-account/push.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/customer-account/push.js
 init_cjs_shims();
 var import_core3 = __toESM(require_lib(), 1);
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/link.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/link.js
 init_cjs_shims();
 var import_core2 = __toESM(require_lib(), 1);
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/link-storefront.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/link-storefront.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/client.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/client.js
 init_cjs_shims();
 async function adminRequest(query, session, variables) {
   const api = "Admin";
@@ -157017,7 +156948,7 @@ async function adminRequest(query, session, variables) {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/gid.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/gid.js
 init_cjs_shims();
 var GID_REGEXP = /gid:\/\/shopify\/\w*\/(\d+)/;
 function parseGid(gid) {
@@ -157028,7 +156959,7 @@ function parseGid(gid) {
   throw new AbortError(`Invalid Global ID: ${gid}`);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/link-storefront.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/link-storefront.js
 var LinkStorefrontQuery = `#graphql
   query LinkStorefront {
     hydrogenStorefronts {
@@ -157049,7 +156980,7 @@ async function getStorefronts(adminSession) {
   }));
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/shopify-config.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/shopify-config.js
 init_cjs_shims();
 var SHOPIFY_DIR = ".shopify";
 var SHOPIFY_DIR_PROJECT = "project.json";
@@ -157155,7 +157086,7 @@ async function setCustomerAccountConfig(root, customerAccountConfig) {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/create-storefront.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/create-storefront.js
 init_cjs_shims();
 var CreateStorefrontMutation = `#graphql
   mutation CreateStorefront($title: String!) {
@@ -157189,7 +157120,7 @@ async function createStorefront(adminSession, title) {
   return { jobId, storefront: hydrogenStorefront };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/fetch-job.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/fetch-job.js
 init_cjs_shims();
 var FetchJobQuery = `#graphql
   query FetchJob($id: ID!) {
@@ -157227,7 +157158,7 @@ function waitForJob(adminSession, jobId) {
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/string.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/string.js
 init_cjs_shims();
 function titleize(name = "") {
   return name.replace(/[\W_]+/g, " ").split(" ").filter((word) => word.length > 0).map(
@@ -157235,7 +157166,7 @@ function titleize(name = "") {
   ).join(" ");
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/shell.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/shell.js
 init_cjs_shims();
 import os from "node:os";
 var ALIAS_NAME = "h2";
@@ -157399,10 +157330,10 @@ async function getCliCommand(directory = process.cwd(), forcePkgManager) {
   return `${cli} shopify hydrogen`;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/auth.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/auth.js
 init_cjs_shims();
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/business-platform/user-account.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/business-platform/user-account.js
 init_cjs_shims();
 
 // ../cli-kit/dist/public/node/api/business-platform.js
@@ -157446,7 +157377,7 @@ async function businessPlatformOrganizationsRequest(query, token, organizationId
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/business-platform/user-account.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/business-platform/user-account.js
 var CurrentUserAccountQuery = `#graphql
   query currentUserAccount {
     currentUserAccount {
@@ -157526,7 +157457,7 @@ async function getUserAccount(token) {
   };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/log.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/log.js
 init_cjs_shims();
 var originalConsole = { ...console };
 var methodsReplaced = /* @__PURE__ */ new Set();
@@ -157721,16 +157652,10 @@ function enhanceAuthLogs(hideInitialLog = false) {
         return;
       }
     ],
-    [
-      ([first2]) => typeof first2 === "string" && first2.includes("Open this link to start the auth process"),
-      ([first2]) => {
-        return [first2.replace("\u{1F449} ", "").replace(": ", ":\n")];
-      }
-    ],
     [
       ([first2]) => typeof first2 === "string" && first2.includes("Logged in."),
       () => {
-        process.stdout.write(ansi_escapes_default.eraseLines(hideInitialLog ? 4 : 5));
+        process.stdout.write(ansi_escapes_default.eraseLines(hideInitialLog ? 5 : 6));
         return;
       }
     ]
@@ -157875,7 +157800,7 @@ function isH2Verbose() {
   return !!(process.env.DEBUG === "*" || process.env.DEBUG?.includes("h2:*"));
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/auth.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/auth.js
 async function logout2(root) {
   await logout();
   await resetConfig(root);
@@ -157928,7 +157853,7 @@ function renderLoginSuccess(config) {
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/onboarding/common.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/onboarding/common.js
 init_cjs_shims();
 import { symlink, readdir as readdir4 } from "node:fs/promises";
 
@@ -161945,11 +161870,11 @@ async function isClean(directory) {
   return (await esm_default({ baseDir: directory }).status()).isClean();
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/routes/generate.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/routes/generate.js
 init_cjs_shims();
 import { readdir as readdir3 } from "node:fs/promises";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-version-interop.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-version-interop.js
 init_cjs_shims();
 import { createRequire as createRequire2 } from "module";
 function convertRouteToV1(route) {
@@ -161965,13 +161890,13 @@ function isV1RouteConventionInstalled() {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-config.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-config.js
 init_cjs_shims();
 import { createRequire as createRequire4 } from "node:module";
 import path2 from "node:path";
 import { readdir as readdir2 } from "node:fs/promises";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-version-check.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-version-check.js
 init_cjs_shims();
 import { createRequire as createRequire3 } from "node:module";
 var REQUIRED_REMIX_VERSION = "^2.1.0";
@@ -162020,12 +161945,22 @@ function getRemixPackageVersion(require22, name, root) {
   return result;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/vite-config.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/vite-config.js
 init_cjs_shims();
 async function hasViteConfig(root) {
   const result = await findFileWithExtension(root, "vite.config");
   return !!result.filepath;
 }
+async function isViteProject(root) {
+  const isVite = await hasViteConfig(root);
+  if (isVite && await hasRemixConfigFile(root)) {
+    renderWarning({
+      headline: "Both Vite and Remix config files found.",
+      body: "The remix.config.js file is not used in Vite projects. Please remove it to avoid conflicts."
+    });
+  }
+  return isVite;
+}
 async function getViteConfig(root, ssrEntryFlag) {
   const vite = await importVite(root);
   const command = "build";
@@ -162093,11 +162028,17 @@ function findOxygenPlugin(config) {
   return findPlugin(config, "oxygen:main");
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-config.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/remix-config.js
 async function hasRemixConfigFile(root) {
   const result = await findFileWithExtension(root, "remix.config");
   return !!result.filepath;
 }
+async function isClassicProject(root) {
+  const isVite = await isViteProject(root);
+  if (isVite)
+    return false;
+  return hasRemixConfigFile(root);
+}
 var BUILD_DIR = "dist";
 var CLIENT_SUBDIR = "client";
 var WORKER_SUBDIR = "worker";
@@ -162131,7 +162072,7 @@ function getRawRemixConfig(root) {
   });
 }
 async function getRemixConfig(root, mode = process.env.NODE_ENV) {
-  if (!await hasRemixConfigFile(root)) {
+  if (await isViteProject(root)) {
     return (await getViteConfig(root)).remixConfig;
   }
   await muteRemixLogs(root);
@@ -162245,7 +162186,7 @@ async function assertEntryFileExists(root, fileRelative) {
   }
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/routes/generate.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/setups/routes/generate.js
 var NO_LOCALE_PATTERNS = [/robots\.txt/];
 var ROUTE_MAP = {
   home: ["_index", "$"],
@@ -162510,7 +162451,7 @@ async function copyRouteTemplate({
   await writeFile(routePath, templateContent);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/onboarding/common.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/onboarding/common.js
 var LANGUAGES = {
   js: "JavaScript",
   ts: "TypeScript"
@@ -163040,7 +162981,7 @@ function generateRandomName() {
   return `${colorNames} ${geographicalFeature}`;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/link.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/link.js
 var Link = class _Link extends base_command_default {
   static descriptionWithMarkdown = `Links your local development environment to a remote Hydrogen storefront. You can link an unlimited number of development environments to a single Hydrogen storefront.
 
@@ -163186,7 +163127,7 @@ async function createNewStorefront(root, session, storefronts) {
   return storefront;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/customer-application-update.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/customer-application-update.js
 init_cjs_shims();
 var CUSTOMER_APPLICATION_URLS_REPLACE = `#graphql
   mutation CustomerApplicationUrlsReplace($storefrontId: ID!, $urlsReplaceInput: HydrogenStorefrontCustomerApplicationUrlsReplaceInput!) {
@@ -163214,7 +163155,7 @@ async function replaceCustomerApplicationUrls(adminSession, storefrontId, urlsRe
   return { success, userErrors };
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/customer-account/push.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/commands/hydrogen/customer-account/push.js
 var CustomerAccountPush = class _CustomerAccountPush extends base_command_default {
   static description = "Push project configuration to admin";
   static flags = {
@@ -163373,7 +163314,7 @@ async function getStorefrontId(root, storefrontIdFromFlag) {
   return newConfig.storefront?.id;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/environment-variables.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/environment-variables.js
 init_cjs_shims();
 
 // ../cli-kit/dist/public/node/dot-env.js
@@ -163462,7 +163403,7 @@ function createDotEnvFileLine(key, value, quote2) {
   return `${key}=${value}`;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/pull-variables.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/pull-variables.js
 init_cjs_shims();
 var PullVariablesQuery = `#graphql
   query PullVariables($id: ID!, $handle: String) {
@@ -163490,7 +163431,7 @@ async function getStorefrontEnvVariables(adminSession, storefrontId, envHandle)
   return hydrogenStorefront;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/list-environments.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/graphql/admin/list-environments.js
 init_cjs_shims();
 var ListEnvironmentsQuery = `#graphql
   query ListStorefronts($id: ID!) {
@@ -163518,7 +163459,7 @@ async function getStorefrontEnvironments(adminSession, storefrontId) {
   return hydrogenStorefront;
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/common.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/common.js
 init_cjs_shims();
 function orderEnvironmentsBySafety(environments) {
   return [
@@ -163566,7 +163507,7 @@ function environmentNotFound(criterion, value) {
   );
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/environment-variables.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/environment-variables.js
 var createEmptyRemoteVars = () => ({
   remoteVariables: {},
   remoteSecrets: {}
@@ -163575,6 +163516,7 @@ async function getAllEnvironmentVariables({
   root,
   envHandle,
   envBranch,
+  envFile,
   fetchRemote = true,
   localVariables: inlineLocalVariables
 }) {
@@ -163590,7 +163532,7 @@ async function getAllEnvironmentVariables({
       }
     ) : createEmptyRemoteVars(),
     // Get local vars
-    inlineLocalVariables ? { variables: inlineLocalVariables } : getLocalVariables(root)
+    inlineLocalVariables ? { variables: inlineLocalVariables } : getLocalVariables(root, envFile)
   ]);
   const remoteSecretKeys = Object.keys(remoteSecrets);
   const remotePublicKeys = Object.keys(remoteVariables);
@@ -163601,7 +163543,7 @@ async function getAllEnvironmentVariables({
       outputInfo(
         linesToColumns([
           ...remotePublicKeys.filter((key) => !localKeys.includes(key)).map((key) => [key, "from Oxygen"]),
-          ...localKeys.map((key) => [key, "from local .env"]),
+          ...localKeys.map((key) => [key, `from local ${envFile}`]),
           // Ensure secret variables always get added to the bottom of the list
           ...remoteSecretKeys.filter((key) => !localKeys.includes(key)).map((key) => [
             source_default.dim(key),
@@ -163640,14 +163582,14 @@ async function getRemoteVariables(root, envHandle, envBranch) {
   }
   return { remoteVariables, remoteSecrets };
 }
-async function getLocalVariables(root) {
-  const dotEnvPath = resolvePath(root, ".env");
+async function getLocalVariables(root, envFile) {
+  const dotEnvPath = resolvePath(root, envFile);
   return await fileExists(dotEnvPath).then(
     (exists2) => exists2 ? readAndParseDotEnv(dotEnvPath) : { variables: {} }
   );
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/tunneling.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/tunneling.js
 init_cjs_shims();
 async function startTunnelPlugin(config, port, provider) {
   const hooks = await fanoutHooks(config, "tunnel_start", { port, provider });
@@ -163688,7 +163630,7 @@ async function pollTunnelURL(tunnelClient) {
   });
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/dev-shared.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/dev-shared.js
 function isMockShop(envVariables) {
   return envVariables.PUBLIC_STORE_DOMAIN === "mock.shop" || // We fallback to mock.shop if the env var is falsy.
   // When it's undefined, it might be overwritten by remote variables.
@@ -163708,22 +163650,24 @@ function notifyIssueWithTunnelAndMockShop(cliCommand) {
     ]
   });
 }
-function getDevConfigInBackground(root, customerAccountPushFlag) {
-  return getLocalVariables(root).then(async ({ variables: localVariables }) => {
-    const customerAccountPush = customerAccountPushFlag && !isMockShop(localVariables);
-    if (customerAccountPush) {
-      await getStorefrontId(root);
+function getDevConfigInBackground(root, customerAccountPushFlag, envFile) {
+  return getLocalVariables(root, envFile).then(
+    async ({ variables: localVariables }) => {
+      const customerAccountPush = customerAccountPushFlag && !isMockShop(localVariables);
+      if (customerAccountPush) {
+        await getStorefrontId(root);
+      }
+      const { shop, storefront } = await getConfig(root);
+      const storefrontId = storefront?.id;
+      return {
+        storefrontId,
+        customerAccountPush,
+        fetchRemote: !!shop && !!storefrontId,
+        localVariables,
+        storefrontTitle: storefront?.title
+      };
     }
-    const { shop, storefront } = await getConfig(root);
-    const storefrontId = storefront?.id;
-    return {
-      storefrontId,
-      customerAccountPush,
-      fetchRemote: !!shop && !!storefrontId,
-      localVariables,
-      storefrontTitle: storefront?.title
-    };
-  });
+  );
 }
 var TUNNEL_DOMAIN = Object.freeze({
   ORIGINAL: ".trycloudflare.com",
@@ -163821,10 +163765,6 @@ export {
   overrideFlag,
   importVite,
   importLocal,
-  hasViteConfig,
-  getViteConfig,
-  findHydrogenPlugin,
-  findOxygenPlugin,
   muteDevLogs,
   enhanceAuthLogs,
   enhanceH2Logs,
@@ -163833,12 +163773,17 @@ export {
   setH2OVerbose,
   isH2Verbose,
   checkRemixVersions,
-  hasRemixConfigFile,
+  isClassicProject,
   getProjectPaths,
   handleRemixImportFail,
   getRawRemixConfig,
   getRemixConfig,
   assertOxygenChecks,
+  hasViteConfig,
+  isViteProject,
+  getViteConfig,
+  findHydrogenPlugin,
+  findOxygenPlugin,
   adminRequest,
   parseGid,
   getStorefronts,
@@ -163903,4 +163848,4 @@ export {
   getDebugBannerLine,
   getUtilityBannerlines
 };
-//# sourceMappingURL=chunk-GDARYUPU.js.map
+//# sourceMappingURL=chunk-K7KD247K.js.map