@shopify/cli-hydrogen 8.2.0 → 8.4.0

package/dist/assets/hydrogen/virtual-routes/virtual-root.jsx

@@ -2,13 +2,14 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import {
   Links,
   Meta,
+  Outlet,
   Scripts,
   ScrollRestoration,
   isRouteErrorResponse,
   useRouteError
 } from "@remix-run/react";
 import favicon from "./assets/favicon.svg";
-import { PageLayout } from "./components/PageLayout.jsx";
+import { Layout } from "./components/Layout.jsx";
 import { useNonce } from "@shopify/hydrogen";
 import styles from "./assets/styles.css?url";
 const links = () => {
@@ -17,7 +18,7 @@ const links = () => {
     { rel: "icon", type: "image/svg+xml", href: favicon }
   ];
 };
-function Layout({ children }) {
+function App() {
   const nonce = useNonce();
   return /* @__PURE__ */ jsxs("html", { lang: "en", children: [
     /* @__PURE__ */ jsxs("head", { children: [
@@ -35,7 +36,7 @@ function Layout({ children }) {
       /* @__PURE__ */ jsx(Links, {})
     ] }),
     /* @__PURE__ */ jsxs("body", { children: [
-      /* @__PURE__ */ jsx(PageLayout, { children }),
+      /* @__PURE__ */ jsx(Layout, { children: /* @__PURE__ */ jsx(Outlet, {}) }),
       /* @__PURE__ */ jsx(ScrollRestoration, { nonce }),
       /* @__PURE__ */ jsx(Scripts, { nonce })
     ] })
@@ -51,14 +52,14 @@ function ErrorBoundary() {
   } else if (error instanceof Error) {
     errorMessage = error.message;
   }
-  return /* @__PURE__ */ jsxs("div", { className: "route-error", children: [
+  return /* @__PURE__ */ jsx(Layout, { children: /* @__PURE__ */ jsxs("div", { className: "route-error", children: [
     /* @__PURE__ */ jsx("h1", { children: "Please report this error" }),
     /* @__PURE__ */ jsx("h2", { children: errorStatus }),
     errorMessage && /* @__PURE__ */ jsx("fieldset", { children: /* @__PURE__ */ jsx("pre", { children: errorMessage }) })
-  ] });
+  ] }) });
 }
 export {
   ErrorBoundary,
-  Layout,
+  App as default,
   links
 };

package/dist/commands/hydrogen/build.js

@@ -6,7 +6,7 @@ import { removeFile, fileSize } from '@shopify/cli-kit/node/fs';
 import { getPackageManager } from '@shopify/cli-kit/node/node-package-manager';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { prepareDiffDirectory } from '../../lib/template-diff.js';
-import { hasViteConfig, getViteConfig } from '../../lib/vite-config.js';
+import { isViteProject, getViteConfig } from '../../lib/vite-config.js';
 import { checkLockfileStatus } from '../../lib/check-lockfile.js';
 import { findMissingRoutes } from '../../lib/missing-routes.js';
 import { runClassicCompilerBuild } from '../../lib/classic-compiler/build.js';
@@ -49,13 +49,14 @@ class Build extends Command {
       useCodegen: flags.codegen,
       directory
     };
-    const result = await hasViteConfig(directory) ? await runBuild(buildParams) : await runClassicCompilerBuild(buildParams);
+    const result = await isViteProject(directory) ? await runBuild(buildParams) : await runClassicCompilerBuild(buildParams);
     if (buildParams.watch) {
       if (diff || result?.close) {
         setupResourceCleanup(async () => {
           await result?.close();
           if (diff) {
             await diff.copyDiffBuild();
+            if (flags.codegen) await diff.copyDiffCodegen();
             await diff.cleanup();
           }
         });
@@ -63,6 +64,7 @@ class Build extends Command {
     } else {
       if (diff) {
         await diff.copyDiffBuild();
+        if (flags.codegen) await diff.copyDiffCodegen();
         await diff.cleanup();
       }
       process.exit(0);

package/dist/commands/hydrogen/codegen.js

@@ -1,11 +1,12 @@
-import path from 'path';
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
 import colors from '@shopify/cli-kit/node/colors';
+import { resolvePath } from '@shopify/cli-kit/node/path';
 import { Flags } from '@oclif/core';
 import { getProjectPaths, getRemixConfig } from '../../lib/remix-config.js';
 import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
 import { codegen } from '../../lib/codegen.js';
+import { prepareDiffDirectory } from '../../lib/template-diff.js';
 
 class Codegen extends Command {
   static descriptionWithMarkdown = "Automatically generates GraphQL types for your project\u2019s Storefront API queries.";
@@ -24,15 +25,22 @@ class Codegen extends Command {
       description: "Watch the project for changes to update types on file save.",
       required: false,
       default: false
-    })
+    }),
+    ...commonFlags.diff
   };
   async run() {
     const { flags } = await this.parse(Codegen);
-    const directory = flags.path ? path.resolve(flags.path) : process.cwd();
+    const originalDirectory = flags.path ? resolvePath(flags.path) : process.cwd();
+    const diff = flags.diff ? await prepareDiffDirectory(originalDirectory, flags.watch) : void 0;
+    const directory = diff?.targetDirectory ?? originalDirectory;
     await runCodegen({
       ...flagsToCamelObject(flags),
       directory
     });
+    if (diff) {
+      await diff.copyDiffCodegen();
+      await diff.cleanup();
+    }
   }
 }
 async function runCodegen({

package/dist/commands/hydrogen/debug/cpu.js

@@ -5,7 +5,7 @@ import { outputInfo } from '@shopify/cli-kit/node/output';
 import { writeFile } from '@shopify/cli-kit/node/fs';
 import colors from '@shopify/cli-kit/node/colors';
 import ansiEscapes from 'ansi-escapes';
-import { getProjectPaths, hasRemixConfigFile } from '../../../lib/remix-config.js';
+import { getProjectPaths, isClassicProject } from '../../../lib/remix-config.js';
 import { muteDevLogs } from '../../../lib/log.js';
 import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
 import { prepareDiffDirectory } from '../../../lib/template-diff.js';
@@ -50,7 +50,6 @@ async function runDebugCpu({ directory, entry, output }) {
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "production";
   muteDevLogs({ workerReload: false });
   let { buildPath, buildPathWorkerFile } = getProjectPaths(directory);
-  const isClassicProject = await hasRemixConfigFile(directory);
   outputInfo(
     "\u23F3\uFE0F Starting profiler for CPU startup... Profile will be written to:\n" + colors.dim(output)
   );
@@ -80,7 +79,7 @@ ${colors.dim(output)}`
 Waiting for changes...`);
     }
   };
-  if (isClassicProject) {
+  if (await isClassicProject(directory)) {
     return runClassicCompilerDebugCpu({
       directory,
       output,

package/dist/commands/hydrogen/deploy.js

@@ -12,13 +12,13 @@ import { ciPlatform } from '@shopify/cli-kit/node/context/local';
 import { parseToken, createDeploy } from '@shopify/oxygen-cli/deploy';
 import { findEnvironmentOrThrow, findEnvironmentByBranchOrThrow, orderEnvironmentsBySafety, createEnvironmentCliChoiceLabel } from '../../lib/common.js';
 import { execAsync } from '../../lib/process.js';
-import { commonFlags, flagsToCamelObject } from '../../lib/flags.js';
+import { commonFlags, overrideFlag, flagsToCamelObject } from '../../lib/flags.js';
 import { getOxygenDeploymentData } from '../../lib/get-oxygen-deployment-data.js';
 import { runClassicCompilerBuild } from '../../lib/classic-compiler/build.js';
 import { runBuild } from './build.js';
 import { getViteConfig } from '../../lib/vite-config.js';
 import { prepareDiffDirectory } from '../../lib/template-diff.js';
-import { hasRemixConfigFile } from '../../lib/remix-config.js';
+import { isClassicProject } from '../../lib/remix-config.js';
 import { packageManagers } from '../../lib/package-managers.js';
 import { setupResourceCleanup } from '../../lib/resource-cleanup.js';
 
@@ -35,9 +35,11 @@ class Deploy extends Command {
     ...commonFlags.entry,
     ...commonFlags.env,
     ...commonFlags.envBranch,
-    "env-file": Flags.string({
-      description: "Path to an environment file to override existing environment variables for the deployment.",
-      required: false
+    ...overrideFlag(commonFlags.envFile, {
+      "env-file": {
+        description: "Path to an environment file to override existing environment variables for the deployment.",
+        default: void 0
+      }
     }),
     preview: Flags.boolean({
       description: "Deploys to the Preview environment. Overrides --env-branch and Git metadata.",
@@ -329,7 +331,7 @@ ${changedFiles.trimEnd()}`;
   }
   let assetsDir = "dist/client";
   let workerDir = "dist/worker";
-  const isClassicCompiler = await hasRemixConfigFile(root);
+  const isClassicCompiler = await isClassicProject(root);
   if (!isClassicCompiler) {
     const viteConfig = await getViteConfig(root, ssrEntry).catch(() => null);
     if (viteConfig) {

package/dist/commands/hydrogen/dev.js

@@ -16,7 +16,7 @@ import { getDevConfigInBackground, TUNNEL_DOMAIN, startTunnelAndPushConfig, isMo
 import { getCliCommand } from '../../lib/shell.js';
 import { findPort } from '../../lib/find-port.js';
 import { logRequestLine } from '../../lib/mini-oxygen/common.js';
-import { hasViteConfig, findHydrogenPlugin, findOxygenPlugin } from '../../lib/vite-config.js';
+import { isViteProject, findHydrogenPlugin, findOxygenPlugin } from '../../lib/vite-config.js';
 import { runClassicCompilerDev } from '../../lib/classic-compiler/dev.js';
 import { importVite } from '../../lib/import-utils.js';
 import { createEntryPointErrorHandler } from '../../lib/deps-optimizer.js';
@@ -45,6 +45,7 @@ class Dev extends Command {
     ...commonFlags.inspectorPort,
     ...commonFlags.env,
     ...commonFlags.envBranch,
+    ...commonFlags.envFile,
     "disable-version-check": Flags.boolean({
       description: "Skip the version check when running `hydrogen dev`",
       default: false,
@@ -87,7 +88,7 @@ class Dev extends Command {
       path: directory,
       cliConfig: this.config
     };
-    const { close } = await hasViteConfig(directory) ? await runDev(devParams) : await runClassicCompilerDev(devParams);
+    const { close } = await isViteProject(directory) ? await runDev(devParams) : await runClassicCompilerDev(devParams);
     setupResourceCleanup(async () => {
       await close();
       if (diff) {
@@ -112,6 +113,7 @@ async function runDev({
   disableVersionCheck = false,
   inspectorPort,
   customerAccountPush: customerAccountPushFlag = false,
+  envFile,
   cliConfig,
   verbose
 }) {
@@ -122,7 +124,8 @@ async function runDev({
   const cliCommandPromise = getCliCommand(root);
   const backgroundPromise = getDevConfigInBackground(
     root,
-    customerAccountPushFlag
+    customerAccountPushFlag,
+    envFile
   );
   const envPromise = backgroundPromise.then(
     ({ fetchRemote, localVariables }) => getAllEnvironmentVariables({
@@ -130,7 +133,8 @@ async function runDev({
       envBranch,
       envHandle,
       fetchRemote,
-      localVariables
+      localVariables,
+      envFile
     })
   );
   if (debug && !inspectorPort) {
@@ -140,19 +144,17 @@ async function runDev({
   if (hydrogenPackagesPath) {
     await removeFile(joinPath(root, "node_modules/.vite"));
   }
-  const customLogger = vite.createLogger();
-  if (process.env.SHOPIFY_UNIT_TEST) {
-    customLogger.info = (msg) => collectLog("info", msg);
-    customLogger.warn = (msg) => collectLog("warn", msg);
-    customLogger.error = (msg) => collectLog("error", msg);
-  }
   const formatOptionsPromise = Promise.resolve().then(
     () => getCodeFormatOptions(root)
   );
   const viteServer = await vite.createServer({
     root,
-    customLogger,
     clearScreen: false,
+    customLogger: process.env.SHOPIFY_UNIT_TEST ? Object.assign(vite.createLogger(), {
+      info: (msg) => collectLog("info", msg),
+      warn: (msg) => collectLog("warn", msg),
+      error: (msg) => collectLog("error", msg)
+    }) : void 0,
     server: {
       host: host ? true : void 0,
       // Allow Vite to read files from the Hydrogen packages in local development.

package/dist/commands/hydrogen/env/pull.js

@@ -21,6 +21,7 @@ class EnvPull extends Command {
   static flags = {
     ...commonFlags.env,
     ...commonFlags.envBranch,
+    ...commonFlags.envFile,
     ...commonFlags.path,
     ...commonFlags.force
   };
@@ -33,6 +34,7 @@ async function runEnvPull({
   env: envHandle,
   envBranch,
   path: root = process.cwd(),
+  envFile,
   force
 }) {
   const [{ session, config }, cliCommand] = await Promise.all([
@@ -77,8 +79,8 @@ async function runEnvPull({
   }
   const variables = storefront.environmentVariables;
   if (!variables.length) return;
-  const fileName = colors.whiteBright(`.env`);
-  const dotEnvPath = resolvePath(root, ".env");
+  const fileName = colors.whiteBright(envFile);
+  const dotEnvPath = resolvePath(root, envFile);
   const fetchedEnv = {};
   variables.forEach(({ isSecret, key, value }) => {
     fetchedEnv[key] = isSecret ? `""` : value;
@@ -96,7 +98,7 @@ async function runEnvPull({
     const overwrite = await renderConfirmationPrompt({
       confirmationMessage: `Yes, confirm changes`,
       cancellationMessage: `No, make changes later`,
-      message: outputContent`We'll make the following changes to your .env file:
+      message: outputContent`We'll make the following changes to your ${fileName} file:
 
 ${outputToken.linesDiff(diff)}
 Continue?`.value

package/dist/commands/hydrogen/env/push.js

@@ -1,6 +1,5 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { diffLines } from 'diff';
-import { Flags } from '@oclif/core';
 import { commonFlags, flagsToCamelObject } from '../../../lib/flags.js';
 import { login } from '../../../lib/auth.js';
 import { getCliCommand } from '../../../lib/shell.js';
@@ -19,9 +18,7 @@ class EnvPush extends Command {
   static description = "Push environment variables from the local .env file to your linked Hydrogen storefront.";
   static flags = {
     ...commonFlags.env,
-    "env-file": Flags.string({
-      description: "Path to an environment file to override existing environment variables for the selected environment. Defaults to the '.env' located in your project path `--path`."
-    }),
+    ...commonFlags.envFile,
     ...commonFlags.path
   };
   async run() {
@@ -35,7 +32,7 @@ async function runEnvPush({
   path = process.cwd()
 }) {
   let validatedEnvironment;
-  const dotEnvPath = envFile || resolvePath(path, ".env");
+  const dotEnvPath = resolvePath(path, envFile);
   const { variables: localVariables } = await readAndParseDotEnv(dotEnvPath);
   const [{ session, config }, cliCommand] = await Promise.all([
     login(path),

package/dist/commands/hydrogen/login.js

@@ -1,6 +1,8 @@
 import Command from '@shopify/cli-kit/node/base-command';
+import { outputNewline } from '@shopify/cli-kit/node/output';
 import { commonFlags } from '../../lib/flags.js';
 import { login, renderLoginSuccess } from '../../lib/auth.js';
+import { enhanceAuthLogs } from '../../lib/log.js';
 
 class Login extends Command {
   static descriptionWithMarkdown = "Logs in to the specified shop and saves the shop domain to the project.";
@@ -18,6 +20,8 @@ async function runLogin({
   path: root = process.cwd(),
   shop: shopFlag
 }) {
+  outputNewline();
+  enhanceAuthLogs(true);
   const { config } = await login(root, shopFlag ?? true);
   renderLoginSuccess(config);
 }

package/dist/commands/hydrogen/logout.js

@@ -1,5 +1,6 @@
 import Command from '@shopify/cli-kit/node/base-command';
 import { renderSuccess } from '@shopify/cli-kit/node/ui';
+import { outputNewline } from '@shopify/cli-kit/node/output';
 import { commonFlags } from '../../lib/flags.js';
 import { logout } from '../../lib/auth.js';
 
@@ -15,6 +16,7 @@ class Logout extends Command {
   }
 }
 async function runLogout({ path: root = process.cwd() }) {
+  outputNewline();
   await logout(root);
   renderSuccess({ body: "You are logged out from Shopify." });
 }

package/dist/commands/hydrogen/preview.js

@@ -4,7 +4,7 @@ import { AbortError } from '@shopify/cli-kit/node/error';
 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, hasRemixConfigFile } from '../../lib/remix-config.js';
+import { getProjectPaths, isClassicProject } from '../../lib/remix-config.js';
 import { commonFlags, deprecated, overrideFlag, flagsToCamelObject, DEFAULT_APP_PORT } from '../../lib/flags.js';
 import { startMiniOxygen } from '../../lib/mini-oxygen/index.js';
 import { getAllEnvironmentVariables } from '../../lib/environment-variables.js';
@@ -27,6 +27,7 @@ class Preview extends Command {
     ...commonFlags.legacyRuntime,
     ...commonFlags.env,
     ...commonFlags.envBranch,
+    ...commonFlags.envFile,
     ...commonFlags.inspectorPort,
     ...commonFlags.debug,
     ...commonFlags.verbose,
@@ -65,6 +66,7 @@ class Preview extends Command {
       await close();
       if (diff) {
         await diff.copyDiffBuild();
+        if (flags.codegen) await diff.copyDiffCodegen();
         await diff.cleanup();
       }
     });
@@ -83,15 +85,16 @@ async function runPreview({
   watch = false,
   codegen: useCodegen = false,
   codegenConfigPath,
-  entry
+  entry,
+  envFile
 }) {
   if (!process.env.NODE_ENV)
     process.env.NODE_ENV = watch ? "development" : "production";
   if (verbose) setH2OVerbose();
   if (!isH2Verbose()) muteDevLogs();
   let { root, buildPath, buildPathWorkerFile, buildPathClient } = getProjectPaths(directory);
-  const isClassicProject = await hasRemixConfigFile(root);
-  if (watch && isClassicProject) {
+  const useClassicCompiler = await isClassicProject(root);
+  if (watch && useClassicCompiler) {
     throw new AbortError(
       "Preview in watch mode is not supported for classic Remix projects.",
       "Please use the dev command instead, which is the equivalent for classic projects."
@@ -109,7 +112,7 @@ async function runPreview({
     useCodegen,
     codegenConfigPath
   };
-  const buildProcess = shouldBuild ? isClassicProject ? await runClassicCompilerBuild({
+  const buildProcess = shouldBuild ? useClassicCompiler ? await runClassicCompilerBuild({
     ...buildOptions
   }).then(projectBuild.resolve) : await runBuild({
     ...buildOptions,
@@ -123,7 +126,7 @@ async function runPreview({
       await miniOxygen?.reload();
     }
   }) : projectBuild.resolve();
-  if (!isClassicProject) {
+  if (!useClassicCompiler) {
     const maybeResult = await getViteConfig(root).catch(() => null);
     buildPathWorkerFile = maybeResult?.serverOutFile ?? joinPath(buildPath, "server", "index.js");
   }
@@ -134,7 +137,8 @@ async function runPreview({
       root,
       fetchRemote,
       envBranch,
-      envHandle
+      envHandle,
+      envFile
     }
   );
   if (!appPort) {

package/dist/commands/hydrogen/setup.js

@@ -32,9 +32,7 @@ class Setup extends Command {
 }
 async function runSetup(options) {
   const controller = new AbortController();
-  const { rootDirectory, appDirectory, serverEntryPoint } = await getRemixConfig(
-    options.directory
-  );
+  const { rootDirectory, appDirectory } = await getRemixConfig(options.directory);
   const location = basename(rootDirectory);
   const cliCommandPromise = getCliCommand();
   let backgroundWorkPromise = Promise.resolve();
@@ -88,7 +86,7 @@ async function runSetup(options) {
   }
   if (i18n) {
     backgroundWorkPromise = backgroundWorkPromise.then(
-      () => setupI18nStrategy(i18n, { rootDirectory, serverEntryPoint })
+      () => setupI18nStrategy(i18n, { rootDirectory })
     );
   }
   let cliCommand = await Promise.resolve(cliCommandPromise);

package/dist/hooks/init.js

@@ -53,9 +53,12 @@ function commandNeedsVM(id = "", argv = []) {
 function isHydrogenProject(projectPath) {
   try {
     const require2 = createRequire(import.meta.url);
-    const { dependencies } = require2(joinPath(projectPath, "package.json"));
-    return !!dependencies["@shopify/hydrogen"] || // Diff examples only have this package as a dependency
-    !!dependencies["@shopify/cli-hydrogen"];
+    const { dependencies, scripts } = require2(joinPath(
+      projectPath,
+      "package.json"
+    ));
+    return !!dependencies?.["@shopify/hydrogen"] || // Diff examples don't have dependencies:
+    !!scripts?.dev?.includes("--diff");
   } catch {
     return false;
   }

package/dist/index.d.ts

@@ -39,6 +39,7 @@ declare class Codegen extends Command {
     static descriptionWithMarkdown: string;
     static description: string;
     static flags: {
+        diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'codegen-config-path': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'force-sfapi-version': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         watch: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
@@ -122,6 +123,7 @@ declare class Dev extends Command {
         'customer-account-push__unstable': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         diff: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'disable-version-check': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
+        'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'env-branch': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         env: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'inspector-port': _oclif_core_lib_interfaces_parser_js.OptionFlag<number | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
@@ -151,6 +153,7 @@ declare class EnvPull extends Command {
     static flags: {
         force: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'env-branch': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         env: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
     };
@@ -161,7 +164,7 @@ declare class EnvPush extends Command {
     static description: string;
     static flags: {
         path: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
-        'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         env: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
     };
     run(): Promise<void>;
@@ -256,6 +259,7 @@ declare class Preview extends Command {
         verbose: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         debug: _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;
         'inspector-port': _oclif_core_lib_interfaces_parser_js.OptionFlag<number | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
+        'env-file': _oclif_core_lib_interfaces_parser_js.OptionFlag<string, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'env-branch': _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         env: _oclif_core_lib_interfaces_parser_js.OptionFlag<string | undefined, _oclif_core_lib_interfaces_parser_js.CustomOptions>;
         'legacy-runtime': _oclif_core_lib_interfaces_parser_js.BooleanFlag<boolean>;

package/dist/lib/auth.js

@@ -1,20 +1,17 @@
-import { renderSelectPrompt, renderInfo, renderTasks, renderSuccess } from '@shopify/cli-kit/node/ui';
+import { renderSelectPrompt, renderSuccess } from '@shopify/cli-kit/node/ui';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { logout as logout$1, ensureAuthenticatedBusinessPlatform, ensureAuthenticatedAdmin } from '@shopify/cli-kit/node/session';
 import { normalizeStoreFqdn } from '@shopify/cli-kit/node/context/fqdn';
-import { outputContent, outputToken } from '@shopify/cli-kit/node/output';
-import colors from '@shopify/cli-kit/node/colors';
-import ansiEscapes from 'ansi-escapes';
 import { resetConfig, getConfig, setUserAccount } from './shopify-config.js';
 import { getUserAccount } from './graphql/business-platform/user-account.js';
-import { muteAuthLogs } from './log.js';
-import { deferPromise } from './defer.js';
+import { enhanceAuthLogs } from './log.js';
 
 async function logout(root) {
   await logout$1();
   await resetConfig(root);
 }
 async function login(root, shop) {
+  enhanceAuthLogs(false);
   const forcePrompt = shop === true;
   const existingConfig = root ? await getConfig(root) : {};
   let { email, shopName } = existingConfig;
@@ -22,7 +19,6 @@ async function login(root, shop) {
     shop = existingConfig.shop;
   }
   if (shop) shop = await normalizeStoreFqdn(shop);
-  const hideLoginInfo = showLoginInfo();
   if (!shop || !shopName || !email || forcePrompt || shop !== existingConfig.shop) {
     const token = await ensureAuthenticatedBusinessPlatform().catch(() => {
       throw new AbortError(
@@ -30,7 +26,6 @@ async function login(root, shop) {
       );
     });
     const userAccount = await getUserAccount(token);
-    await hideLoginInfo();
     const preselected = !forcePrompt && shop && userAccount.activeShops.find(({ fqdn }) => shop === fqdn);
     const selected = preselected || await renderSelectPrompt({
       message: "Select a shop to log in to",
@@ -48,64 +43,9 @@ async function login(root, shop) {
       `Ensure the shop that you specified is correct (you are trying to use: ${shop})`
     ]);
   });
-  await hideLoginInfo();
   const config = root ? await setUserAccount(root, { shop, shopName, email }) : { shop, shopName, email };
   return { session, config };
 }
-function showLoginInfo() {
-  const deferred = deferPromise();
-  console.log("");
-  let hasLoggedTimeout = false;
-  let hasLoggedPressKey = false;
-  const restoreLogs = muteAuthLogs({
-    onKeyTimeout: (link) => {
-      if (link) {
-        hasLoggedTimeout = true;
-        process.stdout.write(ansiEscapes.eraseLines(9));
-        try {
-          const secureLink = link.replace("http://", "https://");
-          const url = new URL(secureLink);
-          const label = url.origin + "/..." + url.search.slice(-14);
-          renderInfo({
-            headline: "Log in to Shopify",
-            body: outputContent`Timed out. Click to open your browser:\n${outputToken.link(
-              colors.white(label),
-              secureLink
-            )}`.value
-          });
-        } catch {
-        }
-      }
-    },
-    onPressKey: () => {
-      hasLoggedPressKey = true;
-      renderInfo({
-        headline: "Log in to Shopify",
-        body: "Press any key to login with your default browser"
-      });
-      process.stdin.once("data", () => {
-        renderTasks([
-          {
-            title: "Waiting for Shopify authentication",
-            task: async () => {
-              await deferred.promise;
-            }
-          }
-        ]);
-      });
-    }
-  });
-  deferred.promise.then(() => {
-    restoreLogs();
-    if (hasLoggedPressKey) {
-      process.stdout.write(ansiEscapes.eraseLines(hasLoggedTimeout ? 11 : 10));
-    }
-  });
-  return async () => {
-    deferred.resolve();
-    await new Promise((resolve) => setTimeout(resolve, 0));
-  };
-}
 function renderLoginSuccess(config) {
   renderSuccess({
     headline: "Shopify authentication complete",

package/dist/lib/classic-compiler/dev.js

@@ -36,6 +36,7 @@ async function runClassicCompilerDev({
   inspectorPort,
   customerAccountPush: customerAccountPushFlag = false,
   shouldLiveReload = true,
+  envFile,
   cliConfig,
   verbose
 }) {
@@ -71,7 +72,8 @@ async function runClassicCompilerDev({
   }
   const backgroundPromise = getDevConfigInBackground(
     root,
-    customerAccountPushFlag
+    customerAccountPushFlag,
+    envFile
   );
   const tunnelPromise = cliConfig && backgroundPromise.then(({ customerAccountPush, storefrontId }) => {
     if (customerAccountPush) {
@@ -91,7 +93,8 @@ async function runClassicCompilerDev({
       fetchRemote,
       envBranch,
       envHandle,
-      localVariables
+      localVariables,
+      envFile
     })
   );
   const [{ watch }, { createFileWatchCache }] = await Promise.all([
@@ -215,14 +218,15 @@ async function runClassicCompilerDev({
         const [relative, absolute] = getFilePaths(file);
         outputInfo(`
 \u{1F4C4} File changed: ${relative}`);
-        if (relative.endsWith(".env")) {
+        if (relative.endsWith(envFile)) {
           skipRebuildLogs = true;
           const { fetchRemote } = await backgroundPromise;
           const { allVariables, logInjectedVariables } = await getAllEnvironmentVariables({
             root,
             fetchRemote,
             envBranch,
-            envHandle
+            envHandle,
+            envFile
           });
           logInjectedVariables();
           await miniOxygen.reload({