@tinacms/cli 0.0.0-9b91b31-20241023063504 → 0.0.0-9c44130-20241030170642

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.6.10";
+var version = "1.6.11";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -977,17 +977,14 @@ var createConfig = async ({
   } else {
     await import_fs_extra2.default.outputFile(staticMediaPath, `[]`);
   }
-  const isBrowser = typeof window !== "undefined";
   const alias = {
     TINA_IMPORT: configManager.prebuildFilePath,
     SCHEMA_IMPORT: configManager.generatedGraphQLJSONPath,
     STATIC_MEDIA_IMPORT: staticMediaPath,
-    ...isBrowser && {
-      crypto: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-      fs: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-      os: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-      path: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts")
-    }
+    crypto: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
+    fs: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
+    os: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
+    path: import_node_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts")
   };
   if (configManager.shouldSkipSDK()) {
     alias["CLIENT_IMPORT"] = import_node_path2.default.join(
@@ -2540,6 +2537,7 @@ DevCommand.usage = import_clipanion2.Command.Usage({
 var import_clipanion3 = require("clipanion");
 var import_progress2 = __toESM(require("progress"));
 var import_fs_extra7 = __toESM(require("fs-extra"));
+var import_crypto = __toESM(require("crypto"));
 var import_graphql11 = require("@tinacms/graphql");
 
 // src/next/commands/build-command/server.ts
@@ -2842,6 +2840,13 @@ ${dangerText(e.message)}
         database,
         codegen2.productionUrl
       );
+      await this.checkTinaSchema(
+        configManager,
+        database,
+        codegen2.productionUrl,
+        this.previewName,
+        this.verbose
+      );
     }
     await buildProductionSpa(configManager, database, codegen2.productionUrl);
     await import_fs_extra7.default.outputFile(
@@ -3151,6 +3156,67 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
       }
     }
   }
+  async checkTinaSchema(configManager, database, apiURL, previewName, verbose) {
+    const bar2 = new import_progress2.default(
+      "Checking local Tina Schema matches server. :prog",
+      1
+    );
+    const { config: config2 } = configManager;
+    const token = config2.token;
+    const { clientId, branch, isLocalClient, host } = (0, import_schema_tools2.parseURL)(apiURL);
+    if (isLocalClient || !host || !clientId || !branch) {
+      if (verbose) {
+        logger.info(logText("Not using Tina Cloud, skipping Tina Schema check"));
+      }
+      return;
+    }
+    const { tinaSchema: remoteTinaSchemaSha } = await fetchSchemaSha({
+      url: `https://${host}/db/${clientId}/${previewName || branch}/schemaSha`,
+      token
+    });
+    console.log({ remoteTinaSchemaSha });
+    if (!remoteTinaSchemaSha) {
+      bar2.tick({
+        prog: "\u274C"
+      });
+      let errorMessage = `The remote Tina schema does not exist. Check indexing for this branch.`;
+      if (config2 == null ? void 0 : config2.branch) {
+        errorMessage += `
+
+Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
+      }
+      throw new Error(errorMessage);
+    }
+    if (!database.bridge) {
+      throw new Error(`No bridge configured`);
+    }
+    try {
+      const localTinaSchema = JSON.parse(
+        await database.bridge.get(configManager.generatedSchemaJSONPath)
+      );
+      localTinaSchema.version = void 0;
+      const localTinaSchemaSha = import_crypto.default.createHash("sha256").update(JSON.stringify(localTinaSchema)).digest("hex");
+      console.log({ localTinaSchemaSha });
+      if (localTinaSchemaSha !== remoteTinaSchemaSha) {
+        bar2.tick({
+          prog: "\u2705"
+        });
+      } else {
+        bar2.tick({
+          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 += `
+
+Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
+        }
+        throw new Error(errorMessage);
+      }
+    } catch (e) {
+      throw e;
+    }
+  }
 };
 BuildCommand.paths = [["build"]];
 BuildCommand.usage = import_clipanion3.Command.Usage({
@@ -3219,6 +3285,23 @@ var fetchRemoteGraphqlSchema = async ({
   const data = await res.json();
   return data == null ? void 0 : data.data;
 };
+var fetchSchemaSha = async ({
+  url,
+  token
+}) => {
+  console.log(url);
+  const headers = new Headers();
+  if (token) {
+    headers.append("X-API-KEY", token);
+  }
+  const res = await fetch(url, {
+    method: "GET",
+    headers,
+    cache: "no-cache"
+  });
+  const data = await res.json();
+  return data == null ? void 0 : data.data;
+};
 
 // src/next/commands/audit-command/index.ts
 var import_clipanion4 = require("clipanion");

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

@@ -28,8 +28,13 @@ export declare class BuildCommand extends BaseCommand {
         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>;
 }
 export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {
     url: string;
     token?: string;
 }) => Promise<any>;
+export declare const fetchSchemaSha: ({ url, token, }: {
+    url: string;
+    token?: string;
+}) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.0.0-9b91b31-20241023063504",
+  "version": "0.0.0-9c44130-20241030170642",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -28,7 +28,7 @@
     "@types/express": "^4.17.21",
     "@types/express-graphql": "^0.9.0",
     "@types/figlet": "1.2.0",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.4",
     "@types/jest": "26.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/listr": "0.14.2",
@@ -36,7 +36,7 @@
     "@types/multer": "^1.4.12",
     "@types/progress": "^2.0.7",
     "@types/prompts": "^2.4.9",
-    "@types/yup": "^0.29.14",
+    "@types/yup": "^0.32.0",
     "jest": "^29.7.0",
     "@tinacms/scripts": "1.3.0"
   },
@@ -83,14 +83,14 @@
     "typanion": "3.13.0",
     "typescript": "^5.6.2",
     "vite": "^4.5.5",
-    "yup": "^0.32.11",
+    "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/app": "0.0.0-9b91b31-20241023063504",
-    "@tinacms/graphql": "1.5.6",
+    "@tinacms/app": "2.1.11",
+    "@tinacms/graphql": "1.5.7",
+    "@tinacms/schema-tools": "1.6.7",
     "@tinacms/metrics": "1.0.7",
-    "@tinacms/search": "1.0.33",
-    "@tinacms/schema-tools": "1.6.6",
-    "tinacms": "0.0.0-9b91b31-20241023063504"
+    "@tinacms/search": "1.0.34",
+    "tinacms": "2.4.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"