@faststore/cli 4.5.0-dev.6 → 4.5.0

package/dist/index.js

@@ -315,7 +315,7 @@ async function checkDeps(basePath) {
 
 // src/commands/cms-sync.ts
 import { Args as Args2, Command as Command2, Flags as Flags2 } from "@oclif/core";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import { spawn } from "child_process";
 import { existsSync as existsSync9 } from "fs";
 import path9 from "path";
@@ -539,15 +539,127 @@ function generateAndUploadSchema({
 }
 
 // src/utils/generate.ts
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 import fsExtra4 from "fs-extra";
 import path7 from "path";
 import ora from "ora";
 import { pathToFileURL as pathToFileURL5 } from "url";
 
 // src/utils/createNextjsPages.ts
-import fs from "fs";
+import fs2 from "fs";
 import path5 from "path";
+import chalk6 from "chalk";
+
+// src/utils/readMyAccountCmsRoutes.ts
+import fs from "fs";
+function readStringProp(objectLiteral, propName) {
+  const pattern = new RegExp(
+    `${propName}\\s*:\\s*(['"\`])((?:\\\\.|(?!\\1).)*)\\1`,
+    "m"
+  );
+  const match = pattern.exec(objectLiteral);
+  return match?.[2];
+}
+function readMyAccountCmsRoutes(navigationFilePath) {
+  if (!fs.existsSync(navigationFilePath)) {
+    return [];
+  }
+  let sourceText;
+  try {
+    sourceText = fs.readFileSync(navigationFilePath, "utf8");
+  } catch {
+    logger.warn(
+      `[my-account-cms] Could not read navigation file at ${navigationFilePath}`
+    );
+    return [];
+  }
+  const withoutLineComments = sourceText.replaceAll(/^\s*\/\/.*$/gm, "");
+  const routesMatch = /getMyAccountRoutes\s*\(\s*\{[\s\S]*?routes\s*:\s*\[([\s\S]*?)\]/.exec(
+    withoutLineComments
+  );
+  if (!routesMatch) {
+    logger.warn(
+      `[my-account-cms] Could not statically parse routes in ${navigationFilePath}; skipping CMS page generation`
+    );
+    return [];
+  }
+  const routesBody = routesMatch[1];
+  const objectLiterals = routesBody.match(/\{[^{}]*\}/g) ?? [];
+  const routes = [];
+  for (const literal of objectLiterals) {
+    const contentType = readStringProp(literal, "contentType");
+    if (!contentType) {
+      continue;
+    }
+    const route = readStringProp(literal, "route");
+    const title = readStringProp(literal, "title");
+    if (!route || !title) {
+      logger.warn(
+        `[my-account-cms] Skipping CMS route entry missing route/title in ${navigationFilePath}`
+      );
+      continue;
+    }
+    routes.push({ route, title, contentType });
+  }
+  return routes;
+}
+
+// src/utils/templates/myAccountCmsPage.ts
+var myAccountCmsPageTemplate = ({
+  contentType,
+  routePath,
+  pagePath,
+  beforePath,
+  afterPath
+}) => `
+  import RenderSections, { RenderSectionsBase } from 'src/components/cms/RenderSections'
+  import ACCOUNT_COMPONENTS from 'src/components/cms/account/Components'
+  import { Layout } from 'src/components/account'
+  import {
+    myAccountCmsServerSideProps,
+    type MyAccountCmsPageProps,
+  } from 'src/experimental/myAccountCmsServerSideProps'
+  import PageProvider from 'src/sdk/overrides/PageProvider'
+  ${pagePath ? `import DynamicPage from '${pagePath}'` : ""}
+  ${beforePath ? `import { default as BeforeSection } from '${beforePath}'` : ""}
+  ${afterPath ? `import { default as AfterSection } from '${afterPath}'` : ""}
+
+  export const getServerSideProps = myAccountCmsServerSideProps('${contentType}', '${routePath}')
+
+  export default function Page({
+    globalSections: globalSectionsProp,
+    pageSections,
+    navigationLabels,
+    accountName,
+    isRepresentative,
+  }: MyAccountCmsPageProps) {
+    const { sections: globalSections, settings: globalSettings } =
+      globalSectionsProp ?? {}
+
+    return (
+      <PageProvider context={{ globalSettings, navigationLabels }}>
+        <RenderSections
+          globalSections={globalSections}
+          components={ACCOUNT_COMPONENTS}
+        >
+          <Layout
+            accountName={accountName}
+            isRepresentative={isRepresentative}
+            navigationLabels={navigationLabels}
+          >
+            ${beforePath ? "<BeforeSection />" : ""}
+            <RenderSectionsBase
+              sections={pageSections}
+              components={ACCOUNT_COMPONENTS}
+            />
+            ${pagePath ? "<DynamicPage />" : ""}
+            ${afterPath ? "<AfterSection />" : ""}
+          </Layout>
+        </RenderSections>
+      </PageProvider>
+    )
+  }
+`;
 
 // src/utils/templates/myAccountPage.ts
 var myAccountPageTemplate = (pagePath) => `
@@ -592,37 +704,133 @@ var myAccountPageTemplate = (pagePath) => `
 
 // src/utils/createNextjsPages.ts
 var ALLOWED_PREFIX_PAGES = ["/pvt/account"];
+var ACCOUNT_ROUTE_PREFIX = "/pvt/account";
 var createExternalPages = ({
   customizationPagesDir,
   corePagesDir,
-  baseCustomizationPagesDir
+  baseCustomizationPagesDir,
+  cmsHandledRoutes
 }) => {
-  fs.readdirSync(customizationPagesDir).forEach((file) => {
+  fs2.readdirSync(customizationPagesDir).forEach((file) => {
     const filePath = path5.join(customizationPagesDir, file);
     const destinationPath = path5.join(corePagesDir, file);
-    if (fs.statSync(filePath).isDirectory()) {
-      if (!fs.existsSync(destinationPath)) {
-        fs.mkdirSync(destinationPath, { recursive: true });
+    if (fs2.statSync(filePath).isDirectory()) {
+      if (!fs2.existsSync(destinationPath)) {
+        fs2.mkdirSync(destinationPath, { recursive: true });
       }
       return createExternalPages({
         customizationPagesDir: filePath,
         corePagesDir: destinationPath,
-        baseCustomizationPagesDir
+        baseCustomizationPagesDir,
+        cmsHandledRoutes
       });
     }
     const isReactFile = filePath.endsWith(".tsx");
-    const isDestinationAvailable = !fs.existsSync(destinationPath) && !fs.existsSync(
+    const isDestinationAvailable = !fs2.existsSync(destinationPath) && !fs2.existsSync(
       path5.join(destinationPath.replace(".tsx", ""), "index.tsx")
     );
     if (isReactFile && isDestinationAvailable) {
-      const externalPagePath = `src/customizations/src/pages${filePath.replace(baseCustomizationPagesDir, "").replace(".tsx", "")}`;
+      const relativePagePath = filePath.replace(baseCustomizationPagesDir, "").replaceAll(/\\/g, "/").replace(/\.tsx$/, "");
+      const normalizedRoute = normalizeAccountRoute(relativePagePath);
+      if (cmsHandledRoutes.has(normalizedRoute)) {
+        return;
+      }
+      const externalPagePath = `src/customizations/src/pages${relativePagePath}`;
       const content = myAccountPageTemplate(externalPagePath);
-      fs.writeFileSync(destinationPath, content);
+      fs2.writeFileSync(destinationPath, content);
     }
   });
 };
 function isAllowedPrefixPage(file) {
-  return ALLOWED_PREFIX_PAGES.some((prefix) => file.startsWith(prefix));
+  return ALLOWED_PREFIX_PAGES.some(
+    (prefix) => file === prefix || file.startsWith(`${prefix}/`)
+  );
+}
+function normalizeAccountRoute(routeOrRelativePath) {
+  const withSlash = routeOrRelativePath.startsWith("/") ? routeOrRelativePath : `/${routeOrRelativePath}`;
+  const withPvt = withSlash.startsWith("/pvt") ? withSlash : `/pvt${withSlash}`;
+  return withPvt.replace(/\/index$/, "") || withPvt;
+}
+function routeToPageFilePath(corePagesDir, route) {
+  const relative = route.replace(/^\//, "");
+  return path5.join(corePagesDir, `${relative}.tsx`);
+}
+function routeToCustomizationPagePath(customizationPagesDir, route) {
+  const relative = route.replace(/^\//, "");
+  if (!relative) return null;
+  const asFile = path5.join(customizationPagesDir, `${relative}.tsx`);
+  if (fs2.existsSync(asFile)) return asFile;
+  const asIndex = path5.join(customizationPagesDir, relative, "index.tsx");
+  if (fs2.existsSync(asIndex)) return asIndex;
+  return null;
+}
+function routeToExtensionImportBase(route) {
+  return route.replace(ACCOUNT_ROUTE_PREFIX, "").replace(/^\//, "");
+}
+function resolveExtensionPaths(tmpDir, route) {
+  const relative = routeToExtensionImportBase(route);
+  if (!relative) return {};
+  const extensionsDir = path5.join(
+    tmpDir,
+    "src/customizations/src/myAccount/extensions",
+    relative
+  );
+  const beforeFile = path5.join(extensionsDir, "before.tsx");
+  const afterFile = path5.join(extensionsDir, "after.tsx");
+  const importBase = `src/customizations/src/myAccount/extensions/${relative}`;
+  return {
+    ...fs2.existsSync(beforeFile) ? { beforePath: `${importBase}/before` } : {},
+    ...fs2.existsSync(afterFile) ? { afterPath: `${importBase}/after` } : {}
+  };
+}
+function destinationExists(destinationPath) {
+  if (fs2.existsSync(destinationPath)) return true;
+  const asIndex = path5.join(destinationPath.replace(/\.tsx$/, ""), "index.tsx");
+  return fs2.existsSync(asIndex);
+}
+function generateCmsPages({
+  routes,
+  corePagesDir,
+  customizationPagesDir,
+  tmpDir
+}) {
+  const handled = /* @__PURE__ */ new Set();
+  for (const { route, contentType } of routes) {
+    const normalizedRoute = normalizeAccountRoute(route);
+    if (!isAllowedPrefixPage(normalizedRoute)) {
+      logger.warn(
+        `${chalk6.yellow("warning")} - Skipping CMS route ${normalizedRoute}: only ${ALLOWED_PREFIX_PAGES.join(", ")} prefixes are allowed`
+      );
+      continue;
+    }
+    const destinationPath = routeToPageFilePath(corePagesDir, normalizedRoute);
+    if (destinationExists(destinationPath)) {
+      logger.warn(
+        `${chalk6.yellow("warning")} - Skipping CMS route ${normalizedRoute}: native page takes precedence`
+      );
+      continue;
+    }
+    const customizationTsx = fs2.existsSync(customizationPagesDir) ? routeToCustomizationPagePath(customizationPagesDir, normalizedRoute) : null;
+    const pagePath = customizationTsx ? `src/customizations/src/pages${customizationTsx.replace(customizationPagesDir, "").replaceAll(/\\/g, "/").replace(/\.tsx$/, "")}` : void 0;
+    const { beforePath, afterPath } = resolveExtensionPaths(
+      tmpDir,
+      normalizedRoute
+    );
+    const content = myAccountCmsPageTemplate({
+      contentType,
+      routePath: normalizedRoute,
+      pagePath,
+      beforePath,
+      afterPath
+    });
+    fs2.mkdirSync(path5.dirname(destinationPath), { recursive: true });
+    fs2.writeFileSync(destinationPath, content);
+    handled.add(normalizedRoute);
+    logger.log(
+      `${chalk6.green("success")} - Generated CMS My Account page for ${normalizedRoute} (${contentType}${pagePath ? ", hybrid" : ""})`
+    );
+  }
+  return handled;
 }
 function createNextJsPages(basePath) {
   const { tmpDir } = withBasePath(basePath);
@@ -631,18 +839,30 @@ function createNextJsPages(basePath) {
     tmpDir,
     "src/customizations/src/pages"
   );
-  if (!fs.existsSync(customizationPagesDir)) {
+  const navigationFilePath = path5.join(
+    tmpDir,
+    "src/customizations/src/myAccount/navigation.ts"
+  );
+  const cmsRoutes = readMyAccountCmsRoutes(navigationFilePath);
+  const cmsHandledRoutes = generateCmsPages({
+    routes: cmsRoutes,
+    corePagesDir,
+    customizationPagesDir,
+    tmpDir
+  });
+  if (!fs2.existsSync(customizationPagesDir)) {
     return;
   }
   const allPagesAreAllowed = ({
-    basePath: basePath2,
+    basePath: pagesBase,
     dirPath
   }) => {
-    const items = fs.readdirSync(dirPath, { withFileTypes: true });
+    const items = fs2.readdirSync(dirPath, { withFileTypes: true });
+    if (items.length === 0) return true;
     return items.every((item) => {
       const itemPath = path5.join(dirPath, item.name);
       if (item.isDirectory()) {
-        return allPagesAreAllowed({ basePath: basePath2, dirPath: itemPath });
+        return allPagesAreAllowed({ basePath: pagesBase, dirPath: itemPath });
       }
       if (!item.isFile()) {
         return false;
@@ -651,7 +871,7 @@ function createNextJsPages(basePath) {
       if (!isNextPage) {
         return false;
       }
-      const relativePath = path5.relative(basePath2, itemPath);
+      const relativePath = path5.relative(pagesBase, itemPath);
       const normalizedPath = "/" + relativePath.replace(/\\/g, "/").replace(/\.(js|jsx|ts|tsx)$/, "");
       return isAllowedPrefixPage(normalizedPath);
     });
@@ -668,7 +888,8 @@ function createNextJsPages(basePath) {
   createExternalPages({
     customizationPagesDir,
     corePagesDir,
-    baseCustomizationPagesDir: customizationPagesDir
+    baseCustomizationPagesDir: customizationPagesDir,
+    cmsHandledRoutes
   });
 }
 
@@ -965,12 +1186,12 @@ function createTmpFolder(basePath) {
     }
     mkdirsSync(tmpDir);
     logger.log(
-      `${chalk6.green("success")} - Temporary folder ${chalk6.dim(
+      `${chalk7.green("success")} - Temporary folder ${chalk7.dim(
         tmpFolderName
       )} created`
     );
   } catch (err) {
-    logger.error(`${chalk6.red("error")} - ${err}`);
+    logger.error(`${chalk7.red("error")} - ${err}`);
   }
 }
 function buildFaststorePackageJson(coreManifest, voltaConfig) {
@@ -1048,7 +1269,7 @@ function copyCoreFiles(basePath) {
     });
     filterAndCopyPackageJson(basePath);
     disableTsConfigStrictRules(basePath);
-    logger.log(`${chalk6.green("success")} - Core files copied`);
+    logger.log(`${chalk7.green("success")} - Core files copied`);
   } catch (e) {
     logger.error(e);
   }
@@ -1088,7 +1309,7 @@ function copyPublicFiles(basePath) {
           }
         }
       });
-      logger.log(`${chalk6.green("success")} - Public files copied`);
+      logger.log(`${chalk7.green("success")} - Public files copied`);
     }
   } catch (e) {
     logger.error(e);
@@ -1114,7 +1335,7 @@ async function copyCypressFiles(basePath) {
       userStoreConfig = (await import(pathToFileURL5(path7.resolve(userLegacyStoreConfigFile)).href))?.default;
     } else {
       logger.info(
-        `${chalk6.blue(
+        `${chalk7.blue(
           "info"
         )} - No store config file was found in the root directory`
       );
@@ -1124,7 +1345,7 @@ async function copyCypressFiles(basePath) {
         overwrite: true,
         dereference: true
       });
-      logger.log(`${chalk6.green("success")} - Cypress test files copied`);
+      logger.log(`${chalk7.green("success")} - Cypress test files copied`);
     }
     if (userStoreConfig?.experimental?.cypressVersion > 9) {
       copySync3(
@@ -1151,7 +1372,7 @@ function copyUserStarterToCustomizations(basePath) {
       createNextJsPages(basePath);
     }
   } catch (err) {
-    logger.error(`${chalk6.red("error")} - ${err}`);
+    logger.error(`${chalk7.red("error")} - ${err}`);
   }
   if (existsSync7(userStoreConfigFile)) {
     copySync3(userStoreConfigFile, tmpStoreConfigFile, { dereference: true });
@@ -1161,12 +1382,12 @@ function copyUserStarterToCustomizations(basePath) {
     });
   } else {
     logger.info(
-      `${chalk6.blue(
+      `${chalk7.blue(
         "info"
       )} - No store config file was found in the root directory`
     );
   }
-  logger.log(`${chalk6.green("success")} - Starter files copied`);
+  logger.log(`${chalk7.green("success")} - Starter files copied`);
 }
 async function createCmsWebhookUrlsJsonFile(basePath) {
   const {
@@ -1181,7 +1402,7 @@ async function createCmsWebhookUrlsJsonFile(basePath) {
     userStoreConfig = (await import(pathToFileURL5(path7.resolve(userLegacyStoreConfigFile)).href))?.default;
   } else {
     logger.info(
-      `${chalk6.blue(
+      `${chalk7.blue(
         "info"
       )} - No store config file was found in the root directory`
     );
@@ -1190,12 +1411,12 @@ async function createCmsWebhookUrlsJsonFile(basePath) {
     const { webhookUrls } = userStoreConfig?.vtexHeadlessCms;
     try {
       writeJsonSync(tmpCMSWebhookUrlsFile, { urls: webhookUrls }, { spaces: 2 });
-      logger.log(`${chalk6.green("success")} - CMS webhook URLs file created`);
+      logger.log(`${chalk7.green("success")} - CMS webhook URLs file created`);
     } catch (err) {
-      logger.error(`${chalk6.red("error")} - ${err}`);
+      logger.error(`${chalk7.red("error")} - ${err}`);
     }
   } else {
-    logger.info(`${chalk6.blue("info")} - No CMS webhook URLs were provided`);
+    logger.info(`${chalk7.blue("info")} - No CMS webhook URLs were provided`);
   }
 }
 async function copyTheme(basePath) {
@@ -1211,7 +1432,7 @@ async function copyTheme(basePath) {
   const storeConfig = userStoreConfigFilePath && (importedStoreConfig?.default || importedStoreConfig);
   if (!storeConfig)
     logger.info(
-      `${chalk6.blue(
+      `${chalk7.blue(
         "info"
       )} - No store config file was found in the root directory`
     );
@@ -1224,19 +1445,19 @@ async function copyTheme(basePath) {
       try {
         copyFileSync(customTheme, tmpThemesCustomizationsFile);
         logger.log(
-          `${chalk6.green("success")} - ${storeConfig.theme} theme has been applied`
+          `${chalk7.green("success")} - ${storeConfig.theme} theme has been applied`
         );
       } catch (err) {
-        logger.error(`${chalk6.red("error")} - ${err}`);
+        logger.error(`${chalk7.red("error")} - ${err}`);
       }
     } else {
       logger.info(
-        `${chalk6.blue("info")} - The ${storeConfig.theme} theme was added to the config file but the ${storeConfig.theme}.scss file does not exist in the themes folder. Read more: https://developers.vtex.com/docs/guides/faststore/themes-overview`
+        `${chalk7.blue("info")} - The ${storeConfig.theme} theme was added to the config file but the ${storeConfig.theme}.scss file does not exist in the themes folder. Read more: https://developers.vtex.com/docs/guides/faststore/themes-overview`
       );
     }
   } else if (existsSync7(userThemesFileDir) && readdirSync3(userThemesFileDir).length > 0) {
     logger.info(
-      `${chalk6.blue(
+      `${chalk7.blue(
         "info"
       )} - The theme needs to be added to the config file to be applied. Read more: https://www.faststore.dev/docs/themes/overview`
     );
@@ -1252,9 +1473,9 @@ function updateBuildTime(basePath) {
       `const buildTime = '${newBuildTime}';`
     );
     writeFileSync2(tmpSeoConfig, config);
-    logger.log(`${chalk6.green("success")} - Build time updated`, newBuildTime);
+    logger.log(`${chalk7.green("success")} - Build time updated`, newBuildTime);
   } catch (error) {
-    logger.error(`${chalk6.red("error")} - Updating build time:`, error);
+    logger.error(`${chalk7.red("error")} - Updating build time:`, error);
   }
 }
 async function checkDependencies(basePath, packagesToCheck) {
@@ -1272,13 +1493,13 @@ async function checkDependencies(basePath, packagesToCheck) {
     const rootVersion = rootPackageJson.devDependencies[packageName] || rootPackageJson.dependencies[packageName];
     if (!coreVersion || !rootVersion) {
       logger.warn(
-        `${chalk6.yellow(
+        `${chalk7.yellow(
           "warning"
         )} - Package ${packageName} not found in both core or root dependencies.`
       );
     } else if (coreVersion !== rootVersion) {
       logger.warn(
-        `${chalk6.yellow(
+        `${chalk7.yellow(
           "warning"
         )} - Version mismatch detected for ${packageName}.
           Core: ${coreVersion}, Customization: ${rootVersion}. Please align both versions to prevent issues`
@@ -1386,7 +1607,7 @@ async function generate(options) {
 }
 
 // src/utils/hcms.ts
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 import path8 from "path";
 import { confirm } from "@inquirer/prompts";
 import fsExtra5 from "fs-extra";
@@ -1497,7 +1718,7 @@ async function mergeCMSFile(fileName, basePath) {
     } catch (err) {
       if (err instanceof SyntaxError) {
         console.info(
-          `${chalk7.red(
+          `${chalk8.red(
             "error"
           )} - ${fileName} is a malformed JSON file, ignoring its contents.`
         );
@@ -1515,10 +1736,10 @@ async function mergeCMSFile(fileName, basePath) {
       JSON.stringify(output)
     );
     console.log(
-      `${chalk7.green("success")} - CMS file ${chalk7.dim(fileName)} created`
+      `${chalk8.green("success")} - CMS file ${chalk8.dim(fileName)} created`
     );
   } catch (err) {
-    console.error(`${chalk7.red("error")} - ${err}`);
+    console.error(`${chalk8.red("error")} - ${err}`);
   }
 }
 async function mergeCMSFiles(basePath) {
@@ -1526,13 +1747,13 @@ async function mergeCMSFiles(basePath) {
     await mergeCMSFile("content-types.json", basePath);
     await mergeCMSFile("sections.json", basePath);
   } catch (err) {
-    console.error(`${chalk7.red("error")} - ${err}`);
+    console.error(`${chalk8.red("error")} - ${err}`);
   }
 }
 
 // src/utils/vtex.ts
 import { execSync as execSync2 } from "child_process";
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 function runCapture(cmd) {
   try {
     return execSync2(`${cmd} 2>&1`, { stdio: "pipe" }).toString();
@@ -1573,8 +1794,8 @@ function getLoggedVtexAccount() {
 function assertVtexReadyForAccount(account) {
   if (!isVtexCliInstalled()) {
     logger.error(
-      `${chalk8.red("[Error]")} - The VTEX toolbelt (\`vtex\`) was not found. Install it with ${chalk8.bold("npm i -g vtex")} and try again.
-${chalk8.dim("Docs: https://developers.vtex.com/docs/guides/vtex-io-documentation-vtex-io-cli-installation-and-command-reference")}`
+      `${chalk9.red("[Error]")} - The VTEX toolbelt (\`vtex\`) was not found. Install it with ${chalk9.bold("npm i -g vtex")} and try again.
+${chalk9.dim("Docs: https://developers.vtex.com/docs/guides/vtex-io-documentation-vtex-io-cli-installation-and-command-reference")}`
     );
     process.exit(1);
     return;
@@ -1583,16 +1804,16 @@ ${chalk8.dim("Docs: https://developers.vtex.com/docs/guides/vtex-io-documentatio
   const loginHint = account ? `vtex login ${account}` : "vtex login <account>";
   if (!loggedAccount) {
     logger.error(
-      `${chalk8.red("[Error]")} - You are not logged into the VTEX toolbelt.
-${chalk8.cyan("Required Action:")} log into the store account by running ${chalk8.bold(loginHint)}.`
+      `${chalk9.red("[Error]")} - You are not logged into the VTEX toolbelt.
+${chalk9.cyan("Required Action:")} log into the store account by running ${chalk9.bold(loginHint)}.`
     );
     process.exit(1);
     return;
   }
   if (account && loggedAccount.toLowerCase() !== account.toLowerCase()) {
     logger.error(
-      `${chalk8.red("[Error]")} - You are logged into ${chalk8.bold(loggedAccount)}, but this store targets ${chalk8.bold(account)} (\`api.storeId\` in discovery.config.js).
-${chalk8.cyan("Required Action:")} switch accounts with ${chalk8.bold(`vtex switch ${account}`)} or ${chalk8.bold(loginHint)}.`
+      `${chalk9.red("[Error]")} - You are logged into ${chalk9.bold(loggedAccount)}, but this store targets ${chalk9.bold(account)} (\`api.storeId\` in discovery.config.js).
+${chalk9.cyan("Required Action:")} switch accounts with ${chalk9.bold(`vtex switch ${account}`)} or ${chalk9.bold(loginHint)}.`
     );
     process.exit(1);
   }
@@ -1620,7 +1841,7 @@ var CmsSync = class _CmsSync extends Command2 {
     const storeConfig = existsSync9(userStoreConfigFile) ? (await import(pathToFileURL7(path9.resolve(userStoreConfigFile)).href)).default : null;
     const source = resolveContentSource(storeConfig?.contentSource?.type);
     logger.info(
-      `${chalk9.blue("[Info]")} - Detected contentSource "${source}" \u2014 ${CONTENT_SOURCE_ACTION[source]}`
+      `${chalk10.blue("[Info]")} - Detected contentSource "${source}" \u2014 ${CONTENT_SOURCE_ACTION[source]}`
     );
     switch (source) {
       case "CMS":
@@ -1667,7 +1888,7 @@ var CmsSync = class _CmsSync extends Command2 {
     let merge;
     if (isMyAccountEnabled(storeConfig)) {
       logger.info(
-        `${chalk9.blue("[Info]")} - Merging My Account sections and content-types into the schema`
+        `${chalk10.blue("[Info]")} - Merging My Account sections and content-types into the schema`
       );
       merge = prepareMyAccountMergeDir(basePath);
     }
@@ -1699,7 +1920,7 @@ var CmsSync = class _CmsSync extends Command2 {
 };
 
 // src/commands/create.ts
-import fs2 from "fs";
+import fs3 from "fs";
 import degit from "degit";
 import { Args as Args3, Command as Command3 } from "@oclif/core";
 import { confirm as confirm2 } from "@inquirer/prompts";
@@ -1715,7 +1936,7 @@ var Create = class _Create extends Command3 {
   async run() {
     const { args } = await this.parse(_Create);
     const discoveryPath = args.path ?? "./discovery";
-    const discoveryFolderExists = fs2.existsSync(discoveryPath);
+    const discoveryFolderExists = fs3.existsSync(discoveryPath);
     if (discoveryFolderExists) {
       const confirmOverride = await confirm2({
         message: `It looks like you already have a discovery folder named "${discoveryPath}" in your store. Do you want to override it?`
@@ -1737,7 +1958,7 @@ var Create = class _Create extends Command3 {
 
 // src/commands/dev.ts
 import { Args as Args4, Command as Command4, Flags as Flags3 } from "@oclif/core";
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import { spawn as spawn2, spawnSync as spawnSync3 } from "child_process";
 import chokidar from "chokidar";
 import dotenv from "dotenv";
@@ -1768,7 +1989,7 @@ async function storeDev(rootDir, tmpDir, coreDir, port) {
       envVars = dotenv.parse(readFileSync3(vtexEnvPath));
     } catch (err) {
       logger.log(
-        `${chalk10.yellow("warn")} - Error parsing vtex.env file: ${err}`
+        `${chalk11.yellow("warn")} - Error parsing vtex.env file: ${err}`
       );
     }
   }
@@ -1785,7 +2006,7 @@ async function storeDev(rootDir, tmpDir, coreDir, port) {
   );
   if (!success) {
     logger.log(
-      `${chalk10.yellow("warn")} - Failed to copy @generated schema back to node_modules, autocomplete and DX might be impacted.`
+      `${chalk11.yellow("warn")} - Failed to copy @generated schema back to node_modules, autocomplete and DX might be impacted.`
     );
     logger.log(
       `Attempted to copy from ${path10.join(tmpDir, "@generated")} to ${path10.join(coreDir, "@generated")}`
@@ -1905,15 +2126,15 @@ var Dev = class _Dev extends Command4 {
 
 // src/commands/generate.ts
 import { Args as Args5, Command as Command5 } from "@oclif/core";
-import chalk11 from "chalk";
+import chalk12 from "chalk";
 
 // src/utils/file.ts
-import fs3 from "fs";
+import fs4 from "fs";
 import path11 from "path";
 function saveFile(fileLocation) {
-  fs3.mkdirSync(path11.dirname(fileLocation), { recursive: true });
+  fs4.mkdirSync(path11.dirname(fileLocation), { recursive: true });
   return (content) => {
-    fs3.writeFileSync(fileLocation, content);
+    fs4.writeFileSync(fileLocation, content);
   };
 }
 
@@ -1925,7 +2146,7 @@ import {
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { printSchemaWithDirectives } from "@graphql-tools/utils";
 import { buildASTSchema, Kind, parse } from "graphql";
-import fs4, { existsSync as existsSync11 } from "fs";
+import fs5, { existsSync as existsSync11 } from "fs";
 import path12 from "path";
 var schemaFileName = "schema.graphql";
 async function genTsTypes(at) {
@@ -2036,7 +2257,7 @@ async function getTypeDefsFromFolder(root, customPath) {
       extensions: ["graphql"]
     }
   }).map(
-    (typeDef) => parse(fs4.readFileSync(typeDef, { encoding: "utf-8" }))
+    (typeDef) => parse(fs5.readFileSync(typeDef, { encoding: "utf-8" }))
   );
 }
 
@@ -2057,7 +2278,7 @@ var Generate = class _Generate extends Command5 {
     await generate({ setup: true, basePath });
     genTsTypes(args.path ?? tmpDir);
     logger.log(
-      `${chalk11.green(
+      `${chalk12.green(
         "success"
       )} - GraphQL schema, types, and optimizations successfully generated \u{1F389}`
     );
@@ -2066,7 +2287,7 @@ var Generate = class _Generate extends Command5 {
 
 // src/commands/prepare.ts
 import { Args as Args6, Command as Command6 } from "@oclif/core";
-import fs5 from "fs";
+import fs6 from "fs";
 import path13 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var Prepare = class _Prepare extends Command6 {
@@ -2093,16 +2314,16 @@ var Prepare = class _Prepare extends Command6 {
   }
 };
 function copyFolder(sourceDir, targetDir) {
-  if (!fs5.existsSync(targetDir)) {
-    fs5.mkdirSync(targetDir, { recursive: true });
+  if (!fs6.existsSync(targetDir)) {
+    fs6.mkdirSync(targetDir, { recursive: true });
   }
-  const files = fs5.readdirSync(sourceDir);
+  const files = fs6.readdirSync(sourceDir);
   for (const file of files) {
     const sourcePath = path13.join(sourceDir, file);
     const targetPath = path13.join(targetDir, file);
-    const stat = fs5.statSync(sourcePath);
+    const stat = fs6.statSync(sourcePath);
     if (stat.isFile()) {
-      fs5.copyFileSync(sourcePath, targetPath);
+      fs6.copyFileSync(sourcePath, targetPath);
       console.log(`Copied file: ${sourcePath} -> ${targetPath}`);
     } else if (stat.isDirectory()) {
       copyFolder(sourcePath, targetPath);
@@ -2219,7 +2440,7 @@ var Test = class _Test extends Command8 {
 // src/commands/generate-types.ts
 import path15 from "path";
 import { Args as Args9, Command as Command9 } from "@oclif/core";
-import chalk12 from "chalk";
+import chalk13 from "chalk";
 var Generate2 = class _Generate extends Command9 {
   static hidden = true;
   static flags = {};
@@ -2236,7 +2457,7 @@ var Generate2 = class _Generate extends Command9 {
       path15.isAbsolute(args.path) ? args.path : path15.resolve(process.env.PWD ?? process.cwd(), args.path)
     );
     logger.log(
-      `${chalk12.green(
+      `${chalk13.green(
         "success"
       )} - GraphQL schema, types, and optimizations successfully generated \u{1F389}`
     );
@@ -2245,7 +2466,7 @@ var Generate2 = class _Generate extends Command9 {
 
 // src/commands/cache-graphql.ts
 import { Args as Args10, Command as Command10, Flags as Flags4 } from "@oclif/core";
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 import fsExtra7 from "fs-extra";
 import graphql from "graphql";
 import path16 from "path";
@@ -2300,13 +2521,13 @@ var CacheGraphql = class _CacheGraphql extends Command10 {
     );
     const saveCachedOperationsFile = saveFile(cachedOperationsPath);
     if (fsExtra7.pathExistsSync(tmpDir))
-      logger.info(`${chalk13.blue("[Info]")} - .faststore Path at: ${tmpDir}`);
-    logger.info(`${chalk13.blue("[Info]")} - Config file location: ${configPath}`);
+      logger.info(`${chalk14.blue("[Info]")} - .faststore Path at: ${tmpDir}`);
+    logger.info(`${chalk14.blue("[Info]")} - Config file location: ${configPath}`);
     logger.info(
-      `${chalk13.blue("[Info]")} - Persisted documents at: ${persistedDocumentsPath}`
+      `${chalk14.blue("[Info]")} - Persisted documents at: ${persistedDocumentsPath}`
     );
     logger.info(
-      `${chalk13.blue("[Info]")} - Cached operations output: ${cachedOperationsPath}`
+      `${chalk14.blue("[Info]")} - Cached operations output: ${cachedOperationsPath}`
     );
     const { default: persistedDocuments } = await import(pathToFileURL8(persistedDocumentsPath).href, { with: { type: "json" } });
     const cachedQueries = getQueries(persistedDocuments);
@@ -2315,7 +2536,7 @@ var CacheGraphql = class _CacheGraphql extends Command10 {
 `
     );
     logger.info(
-      `${chalk13.green("[Success]")} - GraphQL queries cached with success: \u{1F389}
+      `${chalk14.green("[Success]")} - GraphQL queries cached with success: \u{1F389}
       Queries: ${cachedQueries.join(", ")}`
     );
   }
@@ -2352,7 +2573,7 @@ var CacheGraphql = class _CacheGraphql extends Command10 {
   }
   errorFileNotFound(fileName, rootDir) {
     logger.error(
-      `${chalk13.red("[Error]")} - Couldn't find ${fileName} at ${rootDir}`
+      `${chalk14.red("[Error]")} - Couldn't find ${fileName} at ${rootDir}`
     );
     process.exit(1);
   }
@@ -2383,7 +2604,7 @@ var getQueries = (persistedDocuments) => {
 // src/commands/generate-i18n.ts
 import { Args as Args11, Command as Command11, Flags as Flags5 } from "@oclif/core";
 import { FastStoreSDK } from "@vtex/faststore-sdk";
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 import dotenv2 from "dotenv";
 import fsExtra8 from "fs-extra";
 import { existsSync as existsSync13 } from "fs";
@@ -2432,7 +2653,7 @@ var GenerateI18n = class _GenerateI18n extends Command11 {
   }
   errorFileNotFound(fileName, rootDir) {
     logger.error(
-      `${chalk14.red("[Error]")} - Couldn't find ${fileName} at ${rootDir}`
+      `${chalk15.red("[Error]")} - Couldn't find ${fileName} at ${rootDir}`
     );
     process.exit(1);
   }
@@ -2451,13 +2672,13 @@ var GenerateI18n = class _GenerateI18n extends Command11 {
     const { VTEX_ACCOUNT, FS_DISCOVERY_APP_KEY, FS_DISCOVERY_APP_TOKEN } = process.env;
     const hasCredentials = VTEX_ACCOUNT && FS_DISCOVERY_APP_KEY && FS_DISCOVERY_APP_TOKEN;
     if (!hasCredentials) {
-      logger.error(`${chalk14.red("[Error]")} - Missing VTEX credentials.
+      logger.error(`${chalk15.red("[Error]")} - Missing VTEX credentials.
 
-      ${chalk14.cyan("Required Action:")}
+      ${chalk15.cyan("Required Action:")}
 
-      Check your FastStore WebOps Settings page - to work in production, it should contain the following variables: ${chalk14.cyan("VTEX_ACCOUNT")}, ${chalk14.cyan("FS_DISCOVERY_APP_KEY")}, ${chalk14.cyan("FS_DISCOVERY_APP_TOKEN")}.
+      Check your FastStore WebOps Settings page - to work in production, it should contain the following variables: ${chalk15.cyan("VTEX_ACCOUNT")}, ${chalk15.cyan("FS_DISCOVERY_APP_KEY")}, ${chalk15.cyan("FS_DISCOVERY_APP_TOKEN")}.
 
-      If running locally, please check your ${chalk14.bold("vtex.env")} file, it should also contain those variables.
+      If running locally, please check your ${chalk15.bold("vtex.env")} file, it should also contain those variables.
       `);
       process.exit(1);
     }
@@ -2473,8 +2694,8 @@ var GenerateI18n = class _GenerateI18n extends Command11 {
     }
     const saveConfigFile = saveFile(configPath);
     if (fsExtra8.pathExistsSync(tmpDir))
-      logger.info(`${chalk14.blue("[Info]")} - .faststore Path at: ${tmpDir}`);
-    logger.info(`${chalk14.blue("[Info]")} - Config file location: ${configPath}`);
+      logger.info(`${chalk15.blue("[Info]")} - .faststore Path at: ${tmpDir}`);
+    logger.info(`${chalk15.blue("[Info]")} - Config file location: ${configPath}`);
     const discoveryConfig = await import(pathToFileURL9(configPath).href);
     const faststore = new FastStoreSDK({
       account: VTEX_ACCOUNT,
@@ -2503,7 +2724,7 @@ var GenerateI18n = class _GenerateI18n extends Command11 {
       )
     );
     logger.info(
-      `${chalk14.green("success")} - i18n configuration successfully generated \u{1F389}`
+      `${chalk15.green("success")} - i18n configuration successfully generated \u{1F389}`
     );
   }
 };