@tinacms/cli 1.6.12 → 1.6.13

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.6.12";
+var version = "1.6.13";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -2811,7 +2811,7 @@ ${dangerText(e.message)}
     }
     const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
     if (!skipCloudChecks) {
-      const { hasUpstream } = await this.checkClientInfo(
+      const { hasUpstream, timestamp } = await this.checkClientInfo(
         configManager,
         codegen2.productionUrl,
         this.previewBaseBranch
@@ -2839,14 +2839,16 @@ ${dangerText(e.message)}
       await this.checkGraphqlSchema(
         configManager,
         database,
-        codegen2.productionUrl
+        codegen2.productionUrl,
+        timestamp
       );
       await this.checkTinaSchema(
         configManager,
         database,
         codegen2.productionUrl,
         this.previewName,
-        this.verbose
+        this.verbose,
+        timestamp
       );
     }
     await buildProductionSpa(configManager, database, codegen2.productionUrl);
@@ -2965,11 +2967,13 @@ ${dangerText(e.message)}
     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"
       });
@@ -3011,7 +3015,8 @@ ${dangerText(e.message)}
         prog: "\u2705"
       });
       return {
-        hasUpstream
+        hasUpstream,
+        timestamp
       };
     }
     for (let i = 0; i <= 5; i++) {
@@ -3101,14 +3106,14 @@ ${dangerText(e.message)}
       throw e;
     }
   }
-  async checkGraphqlSchema(configManager, database, apiURL) {
+  async checkGraphqlSchema(configManager, database, apiURL, timestamp) {
     const bar2 = new import_progress2.default(
       "Checking local GraphQL Schema matches server. :prog",
       1
     );
     const { config: config2 } = configManager;
     const token = config2.token;
-    const remoteSchema = await fetchRemoteGraphqlSchema({
+    const { remoteSchema, remoteVersion } = await fetchRemoteGraphqlSchema({
       url: apiURL,
       token
     });
@@ -3138,11 +3143,21 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
           prog: "\u274C"
         });
         let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to GitHub to update your remote GraphQL schema.`;
-        if (config2 == null ? void 0 : config2.branch) {
-          errorMessage += `
+        errorMessage += `
 
-Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
+Additional info:
+
+`;
+        if (config2 == null ? void 0 : config2.branch) {
+          errorMessage += `        Branch: ${config2.branch}, Client ID: ${config2.clientId}
+`;
         }
+        errorMessage += `        Local GraphQL version: ${configManager.getTinaGraphQLVersion()} / Remote GraphQL version: ${remoteVersion}
+`;
+        errorMessage += `        Last indexed at: ${new Date(
+          timestamp
+        ).toUTCString()}
+`;
         throw new Error(errorMessage);
       }
     } catch (e) {
@@ -3157,7 +3172,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
       }
     }
   }
-  async checkTinaSchema(configManager, database, apiURL, previewName, verbose) {
+  async checkTinaSchema(configManager, database, apiURL, previewName, verbose, timestamp) {
     const bar2 = new import_progress2.default(
       "Checking local Tina Schema matches server. :prog",
       1
@@ -3206,11 +3221,19 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
         prog: "\u274C"
       });
       let errorMessage = `The local Tina schema doesn't match the remote Tina schema. Please push up your changes to GitHub to update your remote tina schema.`;
-      if (config2 == null ? void 0 : config2.branch) {
-        errorMessage += `
+      errorMessage += `
 
-Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
+Additional info:
+
+`;
+      if (config2 == null ? void 0 : config2.branch) {
+        errorMessage += `        Branch: ${config2.branch}, Client ID: ${config2.clientId}
+`;
       }
+      errorMessage += `        Last indexed at: ${new Date(
+        timestamp
+      ).toUTCString()}
+`;
       throw new Error(errorMessage);
     }
   }
@@ -3280,7 +3303,10 @@ var fetchRemoteGraphqlSchema = async ({
     body
   });
   const data = await res.json();
-  return data == null ? void 0 : data.data;
+  return {
+    remoteSchema: data == null ? void 0 : data.data,
+    remoteVersion: res.headers.get("tinacms-grapqhl-version")
+  };
 };
 var fetchSchemaSha = async ({
   url,

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

@@ -21,19 +21,23 @@ export declare class BuildCommand extends BaseCommand {
     execute(): Promise<number | void>;
     checkClientInfo(configManager: ConfigManager, apiURL: string, previewBaseBranch?: string): Promise<{
         hasUpstream: boolean;
+        timestamp: number;
     }>;
     syncProject(configManager: ConfigManager, apiURL: string, options?: {
         upstreamBranch?: string;
         previewBaseBranch?: string;
         previewName?: string;
     }): Promise<void>;
-    checkGraphqlSchema(configManager: ConfigManager, database: Database, apiURL: string): Promise<void>;
-    checkTinaSchema(configManager: ConfigManager, database: Database, apiURL: string, previewName: string, verbose: boolean): Promise<void>;
+    checkGraphqlSchema(configManager: ConfigManager, database: Database, apiURL: string, timestamp: number): Promise<void>;
+    checkTinaSchema(configManager: ConfigManager, database: Database, apiURL: string, previewName: string, verbose: boolean, timestamp: number): Promise<void>;
 }
 export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {
     url: string;
     token?: string;
-}) => Promise<any>;
+}) => Promise<{
+    remoteSchema: any;
+    remoteVersion: string;
+}>;
 export declare const fetchSchemaSha: ({ url, token, }: {
     url: string;
     token?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -85,11 +85,11 @@
     "yup": "^1.4.0",
     "zod": "^3.23.8",
     "@tinacms/graphql": "1.5.8",
-    "@tinacms/app": "2.1.12",
-    "@tinacms/schema-tools": "1.6.8",
+    "@tinacms/app": "2.1.13",
     "@tinacms/metrics": "1.0.8",
-    "tinacms": "2.5.0",
-    "@tinacms/search": "1.0.35"
+    "@tinacms/schema-tools": "1.6.8",
+    "@tinacms/search": "1.0.35",
+    "tinacms": "2.5.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"