Fix mock.shop notification (#1992)

* Fix notification about mock.shop + customer-account-push flag * Changesets
Shopify · Apr 15, 2024 · 9723eaf · 9723eaf
1 parent ffa57bd
commit 9723eaf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.changeset/dull-impalas-promise.md b/.changeset/dull-impalas-promise.md
@@ -0,0 +1,5 @@
+---
+'@shopify/cli-hydrogen': patch
+---
+
+Fix a warning when combining mock.shop and customer-account-push
diff --git a/packages/cli/src/commands/hydrogen/dev-vite.ts b/packages/cli/src/commands/hydrogen/dev-vite.ts
@@ -273,7 +273,7 @@ export async function runViteDev({
     cliCommand,
   });
 
-  const {logInjectedVariables, localVariables} = await envPromise;
+  const {logInjectedVariables, allVariables} = await envPromise;
 
   logInjectedVariables();
   console.log('');
@@ -308,7 +308,7 @@ export async function runViteDev({
     displayDevUpgradeNotice({targetPath: root});
   }
 
-  if (customerAccountPushFlag && isMockShop(localVariables)) {
+  if (customerAccountPushFlag && isMockShop(allVariables)) {
     notifyIssueWithTunnelAndMockShop(cliCommand);
   }
 

diff --git a/packages/cli/src/commands/hydrogen/dev.ts b/packages/cli/src/commands/hydrogen/dev.ts
@@ -267,8 +267,7 @@ export async function runDev({
   async function safeStartMiniOxygen() {
     if (miniOxygen) return;
 
-    const {allVariables, localVariables, logInjectedVariables} =
-      await envPromise;
+    const {allVariables, logInjectedVariables} = await envPromise;
 
     miniOxygen = await startMiniOxygen(
       {
@@ -316,7 +315,7 @@ export async function runDev({
       displayDevUpgradeNotice({targetPath: appPath});
     }
 
-    if (customerAccountPushFlag && isMockShop(localVariables)) {
+    if (customerAccountPushFlag && isMockShop(allVariables)) {
       notifyIssueWithTunnelAndMockShop(cliCommand);
     }
   }

diff --git a/packages/cli/src/lib/dev-shared.ts b/packages/cli/src/lib/dev-shared.ts
@@ -18,8 +18,9 @@ import {getGraphiQLUrl} from './graphiql-url.js';
 
 export function isMockShop(envVariables: Record<string, string>) {
   return (
-    envVariables.PUBLIC_STORE_DOMAIN &&
-    envVariables.PUBLIC_STORE_DOMAIN.includes('mock.shop')
+    // We fallback to mock.shop if the env var is not set
+    !envVariables.PUBLIC_STORE_DOMAIN ||
+    envVariables.PUBLIC_STORE_DOMAIN === 'mock.shop'
   );
 }