@tinacms/cli 0.0.0-af4eb2c-20250514032536 → 0.0.0-b25c5f0-20250618074247

package/dist/cmds/forestry-migrate/index.d.ts

@@ -1,4 +1,4 @@
-import type { Collection, TinaField } from '@tinacms/schema-tools';
+import type { Collection, TinaField, ContentFrontmatterFormat } from '@tinacms/schema-tools';
 export declare const stringifyLabel: (label: string) => string;
 export declare const stringifyLabelWithField: (label: string) => string;
 export declare const generateAllTemplates: ({ pathToForestryConfig, }: {
@@ -8,7 +8,7 @@ export declare const generateAllTemplates: ({ pathToForestryConfig, }: {
     templateObj: any;
 }>>;
 export declare const generateCollections: ({ pathToForestryConfig, usingTypescript, frontMatterFormat, }: {
-    frontMatterFormat?: "toml" | "yaml" | "json";
+    frontMatterFormat?: ContentFrontmatterFormat;
     pathToForestryConfig: string;
     usingTypescript: boolean;
 }) => Promise<{

package/dist/cmds/init/index.d.ts

@@ -1,4 +1,5 @@
 import { CLICommand } from '../index';
+import { ContentFrontmatterFormat } from '@tinacms/schema-tools';
 export interface Framework {
     name: 'next' | 'hugo' | 'jekyll' | 'other';
     reactive: boolean;
@@ -20,11 +21,10 @@ export type GeneratedFile = {
         parentPath: string;
     };
 };
-export type FrontmatterFormat = 'yaml' | 'toml' | 'json';
 export type InitEnvironment = {
     hasTinaDeps: boolean;
     forestryConfigExists: boolean;
-    frontMatterFormat: FrontmatterFormat;
+    frontMatterFormat: ContentFrontmatterFormat;
     gitIgnoreExists: boolean;
     gitIgnoreNodeModulesExists: boolean;
     gitIgnoreTinaEnvExists: boolean;

package/dist/cmds/init/prompts/index.d.ts

@@ -1,5 +1,6 @@
 import { Framework, InitEnvironment } from '../';
 import { Config, ImportStatement } from './types';
+import { ContentFrontmatterFormat } from '@tinacms/schema-tools';
 export * from './askTinaCloudSetup';
 export * from './types';
 export * from './gitProvider';
@@ -14,7 +15,7 @@ export declare const askForestryMigrate: ({ framework, env, }: {
     env: InitEnvironment;
 }) => Promise<{
     forestryMigrate: boolean;
-    frontMatterFormat?: "yaml" | "toml" | "json";
+    frontMatterFormat?: ContentFrontmatterFormat;
 }>;
 export declare const askTinaSetupPrompts: (params: {
     frameworkName: string;

package/dist/cmds/init/prompts/types.d.ts

@@ -1,3 +1,4 @@
+import { ContentFrontmatterFormat } from '@tinacms/schema-tools';
 import { Framework, GeneratedFileType } from '../';
 export type Config = {
     typescript: boolean;
@@ -5,7 +6,7 @@ export type Config = {
     framework: Framework;
     packageManager: 'pnpm' | 'yarn' | 'npm';
     forestryMigrate: boolean;
-    frontMatterFormat?: 'yaml' | 'toml' | 'json';
+    frontMatterFormat?: ContentFrontmatterFormat;
     hosting?: 'tina-cloud' | 'self-host';
     gitProvider?: PromptGitProvider;
     databaseAdapter?: PromptDatabaseAdapter;

package/dist/index.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(index_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.9.7";
+var version = "1.9.8";
 
 // src/next/commands/dev-command/index.ts
 var import_path5 = __toESM(require("path"));
@@ -1912,7 +1912,7 @@ var createConfig = async ({
       }
     },
     build: {
-      sourcemap: true,
+      sourcemap: false,
       outDir: configManager.outputFolderPath,
       emptyOutDir: true,
       rollupOptions
@@ -2942,45 +2942,63 @@ ${dangerText(e.message)}
     }
     const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
     if (!skipCloudChecks) {
-      const { hasUpstream, timestamp } = await this.checkClientInfo(
-        configManager,
-        codegen2.productionUrl,
-        this.previewBaseBranch
-      );
-      if (!hasUpstream && this.upstreamBranch) {
-        logger.warn(
-          `${dangerText(
-            `WARN: Upstream branch '${this.upstreamBranch}' specified but no upstream project was found.`
-          )}`
+      try {
+        const clientInfo = await this.checkClientInfo(
+          configManager,
+          codegen2.productionUrl,
+          this.previewBaseBranch
         );
+        if (clientInfo.detectedBotBranch) {
+          logger.warn(
+            `${warnText(
+              `WARN: Detected bot branch. Using schema/content from default branch '${clientInfo.defaultBranch}' instead of '${configManager.config.branch}'.`
+            )}`
+          );
+        }
+        if (!clientInfo.hasUpstream && this.upstreamBranch) {
+          logger.warn(
+            `${dangerText(
+              `WARN: Upstream branch '${this.upstreamBranch}' specified but no upstream project was found.`
+            )}`
+          );
+        }
+        if (clientInfo.hasUpstream || this.previewBaseBranch && this.previewName) {
+          await this.syncProject(configManager, codegen2.productionUrl, {
+            upstreamBranch: this.upstreamBranch,
+            previewBaseBranch: this.previewBaseBranch,
+            previewName: this.previewName
+          });
+        }
+        await waitForDB(
+          configManager.config,
+          codegen2.productionUrl,
+          this.previewName,
+          false
+        );
+        await this.checkGraphqlSchema(
+          configManager,
+          database,
+          codegen2.productionUrl,
+          clientInfo.timestamp
+        );
+        await this.checkTinaSchema(
+          configManager,
+          database,
+          codegen2.productionUrl,
+          this.previewName,
+          this.verbose,
+          clientInfo.timestamp
+        );
+      } catch (e) {
+        logger.error(`
+
+${dangerText(e.message)}
+`);
+        if (this.verbose) {
+          console.error(e);
+        }
+        process.exit(1);
       }
-      if (hasUpstream || this.previewBaseBranch && this.previewName) {
-        await this.syncProject(configManager, codegen2.productionUrl, {
-          upstreamBranch: this.upstreamBranch,
-          previewBaseBranch: this.previewBaseBranch,
-          previewName: this.previewName
-        });
-      }
-      await waitForDB(
-        configManager.config,
-        codegen2.productionUrl,
-        this.previewName,
-        false
-      );
-      await this.checkGraphqlSchema(
-        configManager,
-        database,
-        codegen2.productionUrl,
-        timestamp
-      );
-      await this.checkTinaSchema(
-        configManager,
-        database,
-        codegen2.productionUrl,
-        this.previewName,
-        this.verbose,
-        timestamp
-      );
     }
     await buildProductionSpa(configManager, database, codegen2.productionUrl);
     await import_fs_extra7.default.outputFile(
@@ -3093,86 +3111,88 @@ ${dangerText(e.message)}
     }
   }
   async checkClientInfo(configManager, apiURL, previewBaseBranch) {
+    const MAX_RETRIES = 5;
     const { config: config2 } = configManager;
     const token = config2.token;
     const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
-    const url = `https://${host}/db/${clientId}/status/${previewBaseBranch || branch}`;
     const bar2 = new import_progress2.default("Checking clientId and token. :prog", 1);
-    let branchKnown = false;
-    let hasUpstream = false;
-    let timestamp;
-    try {
-      const res = await request({
-        token,
-        url
-      });
-      timestamp = res.timestamp || 0;
-      bar2.tick({
-        prog: "\u2705"
-      });
-      if (!(res.status === "unknown")) {
-        branchKnown = true;
-      }
-      if (res.hasUpstream) {
-        hasUpstream = true;
+    const getBranchInfo = async () => {
+      const url = `https://${host}/db/${clientId}/status/${previewBaseBranch || branch}`;
+      const branchInfo2 = {
+        status: "unknown",
+        branchKnown: false,
+        hasUpstream: false,
+        timestamp: 0,
+        detectedBotBranch: false,
+        defaultBranch: void 0
+      };
+      try {
+        const res = await request({
+          token,
+          url
+        });
+        branchInfo2.status = res.status;
+        branchInfo2.branchKnown = res.status !== "unknown";
+        branchInfo2.timestamp = res.timestamp || 0;
+        branchInfo2.hasUpstream = res.hasUpstream;
+        branchInfo2.detectedBotBranch = res.json.detectedBotBranch;
+        branchInfo2.defaultBranch = res.json.defaultBranch;
+      } catch (e) {
+        summary({
+          heading: "Error when checking client information",
+          items: [
+            {
+              emoji: "\u274C",
+              heading: "You provided",
+              subItems: [
+                {
+                  key: "clientId",
+                  value: config2.clientId
+                },
+                {
+                  key: "branch",
+                  value: config2.branch
+                },
+                {
+                  key: "token",
+                  value: config2.token
+                }
+              ]
+            }
+          ]
+        });
+        throw e;
       }
-    } catch (e) {
-      summary({
-        heading: "Error when checking client information",
-        items: [
-          {
-            emoji: "\u274C",
-            heading: "You provided",
-            subItems: [
-              {
-                key: "clientId",
-                value: config2.clientId
-              },
-              {
-                key: "branch",
-                value: config2.branch
-              },
-              {
-                key: "token",
-                value: config2.token
-              }
-            ]
-          }
-        ]
-      });
-      throw e;
-    }
-    const branchBar = new import_progress2.default("Checking branch is on TinaCloud. :prog", 1);
-    if (branchKnown) {
+      return branchInfo2;
+    };
+    const branchInfo = await getBranchInfo();
+    bar2.tick({
+      prog: "\u2705"
+    });
+    const branchBar = new import_progress2.default(
+      `Checking branch '${config2.branch}' is on TinaCloud. :prog`,
+      1
+    );
+    if (branchInfo.branchKnown) {
       branchBar.tick({
         prog: "\u2705"
       });
-      return {
-        hasUpstream,
-        timestamp
-      };
+      return branchInfo;
     }
-    for (let i = 0; i <= 5; i++) {
-      await sleepAndCallFunc({
-        fn: async () => {
-          const res = await request({
-            token,
-            url
-          });
-          if (this.verbose) {
-            logger.info(
-              `Branch status: ${res.status}. Attempt: ${i + 1}. Trying again in 5 seconds.`
-            );
-          }
-          if (!(res.status === "unknown")) {
-            branchBar.tick({
-              prog: "\u2705"
-            });
-            return;
-          }
-        },
-        ms: 5e3
-      });
+    for (let i = 1; i <= MAX_RETRIES; i++) {
+      await timeout(5e3);
+      const branchInfo2 = await getBranchInfo();
+      if (this.verbose) {
+        logger.info(
+          `Branch status: ${branchInfo2.status}. Attempt: ${i}. Trying again in 5 seconds.`
+        );
+      }
+      if (branchInfo2.branchKnown) {
+        branchBar.tick({
+          prog: "\u2705"
+        });
+        return branchInfo2;
+      }
     }
     branchBar.tick({
       prog: "\u274C"
@@ -3180,7 +3200,7 @@ ${dangerText(e.message)}
     logger.error(
       `${dangerText(
         `ERROR: Branch '${branch}' is not on TinaCloud.`
-      )} Please make sure that branch '${branch}' exists in your repository and that you have pushed your all changes to the remote. View all all branches and there current status here: ${linkText(
+      )} Please make sure that branch '${branch}' exists in your repository and that you have pushed your all changes to the remote. View all branches and their current status here: ${linkText(
         `https://app.tina.io/projects/${clientId}/configuration`
       )}`
     );
@@ -3417,7 +3437,8 @@ Message from server: ${json.message}`;
   return {
     status: json?.status,
     timestamp: json?.timestamp,
-    hasUpstream: json?.hasUpstream || false
+    hasUpstream: json?.hasUpstream || false,
+    json
   };
 }
 var fetchRemoteGraphqlSchema = async ({
@@ -4463,6 +4484,7 @@ var import_path9 = __toESM(require("path"));
 var import_js_yaml2 = __toESM(require("js-yaml"));
 var import_minimatch = __toESM(require("minimatch"));
 var import_graphql16 = require("@tinacms/graphql");
+var import_schema_tools3 = require("@tinacms/schema-tools");
 
 // src/cmds/forestry-migrate/util/index.ts
 var import_fs_extra9 = __toESM(require("fs-extra"));
@@ -4956,7 +4978,7 @@ var transformForestryMatchToTinaMatch = (match) => {
 };
 function checkExt(ext) {
   const extReal = ext.replace(".", "");
-  if (["mdx", "md", "json", "yaml", "yml", "toml"].includes(extReal)) {
+  if (import_schema_tools3.CONTENT_FORMATS.includes(extReal)) {
     return extReal;
   } else {
     return false;

package/dist/next/commands/build-command/index.d.ts

@@ -20,8 +20,11 @@ export declare class BuildCommand extends BaseCommand {
     catch(error: any): Promise<void>;
     execute(): Promise<number | void>;
     checkClientInfo(configManager: ConfigManager, apiURL: string, previewBaseBranch?: string): Promise<{
+        branchKnown: boolean;
         hasUpstream: boolean;
         timestamp: number;
+        detectedBotBranch: boolean;
+        defaultBranch: string | undefined;
     }>;
     syncProject(configManager: ConfigManager, apiURL: string, options?: {
         upstreamBranch?: string;

package/dist/utils/sleep.d.ts

@@ -1,3 +1,4 @@
+export declare function timeout(ms: any): Promise<void>;
 export declare function sleepAndCallFunc<T>({ fn, ms, }: {
     fn: () => Promise<T>;
     ms: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.0.0-af4eb2c-20250514032536",
+  "version": "0.0.0-b25c5f0-20250618074247",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
     "@types/prompts": "^2.4.9",
     "@types/yup": "^0.32.0",
     "jest": "^29.7.0",
-    "@tinacms/scripts": "0.0.0-af4eb2c-20250514032536"
+    "@tinacms/scripts": "1.3.5"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.6.8",
@@ -89,12 +89,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.2.7",
-    "@tinacms/graphql": "1.5.17",
+    "@tinacms/app": "0.0.0-b25c5f0-20250618074247",
+    "@tinacms/graphql": "0.0.0-b25c5f0-20250618074247",
     "@tinacms/metrics": "1.0.9",
-    "@tinacms/schema-tools": "1.7.3",
-    "@tinacms/search": "1.0.44",
-    "tinacms": "2.7.7"
+    "@tinacms/schema-tools": "0.0.0-b25c5f0-20250618074247",
+    "@tinacms/search": "0.0.0-b25c5f0-20250618074247",
+    "tinacms": "0.0.0-b25c5f0-20250618074247"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"