@tinacms/cli 1.6.11 → 1.6.12

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.6.11";
+var version = "1.6.12";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -2209,7 +2209,7 @@ var BaseCommand = class extends import_clipanion.Command {
             pathFilter
           });
           const tinaPathUpdates = modified.filter(
-            (path13) => path13.startsWith(".tina/__generated__/_schema.json") || path13.startsWith("tina/tina-lock.json")
+            (path14) => path14.startsWith(".tina/__generated__/_schema.json") || path14.startsWith("tina/tina-lock.json")
           );
           if (tinaPathUpdates.length > 0) {
             res = await database.indexContent({
@@ -2537,6 +2537,8 @@ 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_path6 = __toESM(require("path"));
 var import_graphql11 = require("@tinacms/graphql");
 
 // src/next/commands/build-command/server.ts
@@ -2839,6 +2841,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(
@@ -3148,6 +3157,63 @@ 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
+    });
+    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`);
+    }
+    const localTinaSchema = JSON.parse(
+      await database.bridge.get(
+        import_path6.default.join(database.tinaDirectory, "__generated__", "_schema.json")
+      )
+    );
+    localTinaSchema.version = void 0;
+    const localTinaSchemaSha = import_crypto.default.createHash("sha256").update(JSON.stringify(localTinaSchema)).digest("hex");
+    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);
+    }
+  }
 };
 BuildCommand.paths = [["build"]];
 BuildCommand.usage = import_clipanion3.Command.Usage({
@@ -3216,6 +3282,21 @@ var fetchRemoteGraphqlSchema = async ({
   const data = await res.json();
   return data == null ? void 0 : data.data;
 };
+var fetchSchemaSha = async ({
+  url,
+  token
+}) => {
+  const headers = new Headers();
+  if (token) {
+    headers.append("X-API-KEY", token);
+  }
+  const res = await fetch(url, {
+    method: "GET",
+    headers,
+    cache: "no-cache"
+  });
+  return res.json();
+};
 
 // src/next/commands/audit-command/index.ts
 var import_clipanion4 = require("clipanion");
@@ -3469,25 +3550,25 @@ var import_clipanion6 = require("clipanion");
 
 // src/cmds/init/detectEnvironment.ts
 var import_fs_extra8 = __toESM(require("fs-extra"));
-var import_path6 = __toESM(require("path"));
+var import_path7 = __toESM(require("path"));
 var checkGitignoreForItem = async ({
   baseDir,
   line
 }) => {
-  const gitignoreContent = import_fs_extra8.default.readFileSync(import_path6.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = import_fs_extra8.default.readFileSync(import_path7.default.join(baseDir, ".gitignore")).toString();
   return gitignoreContent.split("\n").some((item) => item === line);
 };
 var makeGeneratedFile = async (name2, generatedFileType, parentPath, opts) => {
   const result = {
-    fullPathTS: import_path6.default.join(
+    fullPathTS: import_path7.default.join(
       parentPath,
       `${name2}.${(opts == null ? void 0 : opts.typescriptSuffix) || (opts == null ? void 0 : opts.extensionOverride) || "ts"}`
     ),
-    fullPathJS: import_path6.default.join(
+    fullPathJS: import_path7.default.join(
       parentPath,
       `${name2}.${(opts == null ? void 0 : opts.extensionOverride) || "js"}`
     ),
-    fullPathOverride: (opts == null ? void 0 : opts.extensionOverride) ? import_path6.default.join(parentPath, `${name2}.${opts == null ? void 0 : opts.extensionOverride}`) : "",
+    fullPathOverride: (opts == null ? void 0 : opts.extensionOverride) ? import_path7.default.join(parentPath, `${name2}.${opts == null ? void 0 : opts.extensionOverride}`) : "",
     generatedFileType,
     name: name2,
     parentPath,
@@ -3517,16 +3598,16 @@ var detectEnvironment = async ({
 }) => {
   var _a;
   const hasForestryConfig = await import_fs_extra8.default.pathExists(
-    import_path6.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+    import_path7.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
-  const sampleContentPath = import_path6.default.join(
+  const sampleContentPath = import_path7.default.join(
     baseDir,
     "content",
     "posts",
     "hello-world.md"
   );
-  const usingSrc = import_fs_extra8.default.pathExistsSync(import_path6.default.join(baseDir, "src")) && (import_fs_extra8.default.pathExistsSync(import_path6.default.join(baseDir, "src", "app")) || import_fs_extra8.default.pathExistsSync(import_path6.default.join(baseDir, "src", "pages")));
-  const tinaFolder = import_path6.default.join(baseDir, "tina");
+  const usingSrc = import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src")) && (import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src", "app")) || import_fs_extra8.default.pathExistsSync(import_path7.default.join(baseDir, "src", "pages")));
+  const tinaFolder = import_path7.default.join(baseDir, "tina");
   const tinaConfigExists = Boolean(
     await import_fs_extra8.default.pathExists(tinaFolder) && (await import_fs_extra8.default.readdir(tinaFolder)).find((x) => x.includes("config"))
   );
@@ -3540,12 +3621,12 @@ var detectEnvironment = async ({
     "next-api-handler": await makeGeneratedFile(
       "[...routes]",
       "next-api-handler",
-      import_path6.default.join(...pagesDir, "api", "tina")
+      import_path7.default.join(...pagesDir, "api", "tina")
     ),
     "reactive-example": await makeGeneratedFile(
       "[filename]",
       "reactive-example",
-      import_path6.default.join(...pagesDir, "demo", "blog"),
+      import_path7.default.join(...pagesDir, "demo", "blog"),
       {
         typescriptSuffix: "tsx"
       }
@@ -3553,13 +3634,13 @@ var detectEnvironment = async ({
     "users-json": await makeGeneratedFile(
       "index",
       "users-json",
-      import_path6.default.join(baseDir, "content", "users"),
+      import_path7.default.join(baseDir, "content", "users"),
       { extensionOverride: "json" }
     ),
     "sample-content": await makeGeneratedFile(
       "hello-world",
       "sample-content",
-      import_path6.default.join(baseDir, "content", "posts"),
+      import_path7.default.join(baseDir, "content", "posts"),
       { extensionOverride: "md" }
     )
   };
@@ -3585,13 +3666,13 @@ var detectEnvironment = async ({
       );
     }
   }
-  const hasGitIgnore = await import_fs_extra8.default.pathExists(import_path6.default.join(".gitignore"));
+  const hasGitIgnore = await import_fs_extra8.default.pathExists(import_path7.default.join(".gitignore"));
   const hasGitIgnoreNodeModules = hasGitIgnore && await checkGitignoreForItem({ baseDir, line: "node_modules" });
   const hasEnvTina = hasGitIgnore && await checkGitignoreForItem({ baseDir, line: ".env.tina" });
   const hasGitIgnoreEnv = hasGitIgnore && await checkGitignoreForItem({ baseDir, line: ".env" });
   let frontMatterFormat;
   if (hasForestryConfig) {
-    const hugoConfigPath = import_path6.default.join(rootPath, "config.toml");
+    const hugoConfigPath = import_path7.default.join(rootPath, "config.toml");
     if (await import_fs_extra8.default.pathExists(hugoConfigPath)) {
       const hugoConfig = await import_fs_extra8.default.readFile(hugoConfigPath, "utf8");
       const metaDataFormat = (_a = hugoConfig.match(/metaDataFormat = "(.*)"/)) == null ? void 0 : _a[1];
@@ -4199,18 +4280,18 @@ var CLICommand = class {
 };
 
 // src/cmds/init/apply.ts
-var import_path10 = __toESM(require("path"));
+var import_path11 = __toESM(require("path"));
 
 // src/cmds/forestry-migrate/index.ts
 var import_fs_extra10 = __toESM(require("fs-extra"));
-var import_path8 = __toESM(require("path"));
+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");
 
 // src/cmds/forestry-migrate/util/index.ts
 var import_fs_extra9 = __toESM(require("fs-extra"));
-var import_path7 = __toESM(require("path"));
+var import_path8 = __toESM(require("path"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_zod = __toESM(require("zod"));
 
@@ -4621,7 +4702,7 @@ var transformForestryFieldsToTinaFields = ({
   return tinaFields;
 };
 var getFieldsFromTemplates = ({ tem, pathToForestryConfig, skipBlocks = false }) => {
-  const templatePath = import_path7.default.join(
+  const templatePath = import_path8.default.join(
     pathToForestryConfig,
     ".forestry",
     "front_matter",
@@ -4696,8 +4777,8 @@ var generateAllTemplates = async ({
   pathToForestryConfig
 }) => {
   const allTemplates = (await import_fs_extra10.default.readdir(
-    import_path8.default.join(pathToForestryConfig, ".forestry", "front_matter", "templates")
-  )).map((tem) => import_path8.default.basename(tem, ".yml"));
+    import_path9.default.join(pathToForestryConfig, ".forestry", "front_matter", "templates")
+  )).map((tem) => import_path9.default.basename(tem, ".yml"));
   const templateMap = /* @__PURE__ */ new Map();
   const proms = allTemplates.map(async (tem) => {
     try {
@@ -4839,9 +4920,9 @@ var generateCollectionFromForestrySection = (args) => {
     return c;
   } else if (section.type === "document") {
     const filePath = section.path;
-    const extname = import_path8.default.extname(filePath);
-    const fileName = import_path8.default.basename(filePath, extname);
-    const dir = import_path8.default.dirname(filePath);
+    const extname = import_path9.default.extname(filePath);
+    const fileName = import_path9.default.basename(filePath, extname);
+    const dir = import_path9.default.dirname(filePath);
     const ext = checkExt(extname);
     if (ext) {
       const fields = [];
@@ -4904,7 +4985,7 @@ var generateCollections = async ({
     usingTypescript
   });
   const forestryConfig = await import_fs_extra10.default.readFile(
-    import_path8.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+    import_path9.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
   rewriteTemplateKeysInDocs({
     templateMap,
@@ -4935,11 +5016,11 @@ var rewriteTemplateKeysInDocs = (args) => {
     const { templateObj } = templateMap.get(templateKey);
     (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
       try {
-        const filePath = import_path8.default.join(page);
+        const filePath = import_path9.default.join(page);
         if (import_fs_extra10.default.lstatSync(filePath).isDirectory()) {
           return;
         }
-        const extname = import_path8.default.extname(filePath);
+        const extname = import_path9.default.extname(filePath);
         const fileContent = import_fs_extra10.default.readFileSync(filePath).toString();
         const content = (0, import_graphql16.parseFile)(
           fileContent,
@@ -4971,7 +5052,7 @@ var import_fs_extra13 = __toESM(require("fs-extra"));
 // src/next/commands/codemod-command/index.ts
 var import_clipanion5 = require("clipanion");
 var import_fs_extra11 = __toESM(require("fs-extra"));
-var import_path9 = __toESM(require("path"));
+var import_path10 = __toESM(require("path"));
 var CodemodCommand = class extends import_clipanion5.Command {
   constructor() {
     super(...arguments);
@@ -5015,7 +5096,7 @@ var moveTinaFolder = async (rootPath = process.cwd()) => {
     logger.error(e.message);
     process.exit(1);
   }
-  const tinaDestination = import_path9.default.join(configManager.rootPath, "tina");
+  const tinaDestination = import_path10.default.join(configManager.rootPath, "tina");
   if (await import_fs_extra11.default.existsSync(tinaDestination)) {
     logger.info(
       `Folder already exists at ${tinaDestination}. Either delete this folder to complete the codemod, or ensure you have properly copied your config from the ".tina" folder.`
@@ -5030,7 +5111,7 @@ var moveTinaFolder = async (rootPath = process.cwd()) => {
 };
 var writeGitignore = async (rootPath) => {
   await import_fs_extra11.default.outputFileSync(
-    import_path9.default.join(rootPath, "tina", ".gitignore"),
+    import_path10.default.join(rootPath, "tina", ".gitignore"),
     "__generated__"
   );
 };
@@ -5868,8 +5949,8 @@ async function apply({
     await addConfigFile({
       configArgs: {
         config: config2,
-        publicFolder: import_path10.default.join(
-          import_path10.default.relative(process.cwd(), pathToForestryConfig),
+        publicFolder: import_path11.default.join(
+          import_path11.default.relative(process.cwd(), pathToForestryConfig),
           config2.publicFolder
         ),
         collections,
@@ -5936,18 +6017,18 @@ var createPackageJSON = async () => {
 };
 var createGitignore = async ({ baseDir }) => {
   logger.info(logText("No .gitignore found, creating one"));
-  import_fs_extra13.default.outputFileSync(import_path10.default.join(baseDir, ".gitignore"), "node_modules");
+  import_fs_extra13.default.outputFileSync(import_path11.default.join(baseDir, ".gitignore"), "node_modules");
 };
 var updateGitIgnore = async ({
   baseDir,
   items
 }) => {
   logger.info(logText(`Adding ${items.join(",")} to .gitignore`));
-  const gitignoreContent = import_fs_extra13.default.readFileSync(import_path10.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = import_fs_extra13.default.readFileSync(import_path11.default.join(baseDir, ".gitignore")).toString();
   const newGitignoreContent = [...gitignoreContent.split("\n"), ...items].join(
     "\n"
   );
-  await import_fs_extra13.default.writeFile(import_path10.default.join(baseDir, ".gitignore"), newGitignoreContent);
+  await import_fs_extra13.default.writeFile(import_path11.default.join(baseDir, ".gitignore"), newGitignoreContent);
 };
 var addDependencies = async (config2, env, params) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
@@ -6017,22 +6098,22 @@ var writeGeneratedFile = async ({
   content,
   typescript
 }) => {
-  const { exists, path: path13, parentPath } = generatedFile.resolve(typescript);
+  const { exists, path: path14, parentPath } = generatedFile.resolve(typescript);
   if (exists) {
     if (overwrite) {
-      logger.info(`Overwriting file at ${path13}... \u2705`);
-      import_fs_extra13.default.outputFileSync(path13, content);
+      logger.info(`Overwriting file at ${path14}... \u2705`);
+      import_fs_extra13.default.outputFileSync(path14, content);
     } else {
-      logger.info(`Not overwriting file at ${path13}.`);
+      logger.info(`Not overwriting file at ${path14}.`);
       logger.info(
-        logText(`Please add the following to ${path13}:
+        logText(`Please add the following to ${path14}:
 ${indentText(content)}}`)
       );
     }
   } else {
-    logger.info(`Adding file at ${path13}... \u2705`);
+    logger.info(`Adding file at ${path14}... \u2705`);
     await import_fs_extra13.default.ensureDir(parentPath);
-    import_fs_extra13.default.outputFileSync(path13, content);
+    import_fs_extra13.default.outputFileSync(path14, content);
   }
 };
 var addConfigFile = async ({
@@ -6115,7 +6196,7 @@ var addContentFile = async ({
         return () => ({
           exists: env.sampleContentExists,
           path: env.sampleContentPath,
-          parentPath: import_path10.default.dirname(env.sampleContentPath)
+          parentPath: import_path11.default.dirname(env.sampleContentPath)
         });
       }
     },
@@ -6138,7 +6219,7 @@ ${titleText(" TinaCMS ")} backend initialized!`));
       return `${x.key}=${x.value || "***"}`;
     }).join("\n") + `
 TINA_PUBLIC_IS_LOCAL=true`;
-    const envFile = import_path10.default.join(process.cwd(), ".env");
+    const envFile = import_path11.default.join(process.cwd(), ".env");
     if (!import_fs_extra13.default.existsSync(envFile)) {
       logger.info(`Adding .env file to your project... \u2705`);
       import_fs_extra13.default.writeFileSync(envFile, envFileText);
@@ -6202,7 +6283,7 @@ var addReactiveFile = {
     dataLayer
   }) => {
     var _a, _b;
-    const packageJsonPath = import_path10.default.join(baseDir, "package.json");
+    const packageJsonPath = import_path11.default.join(baseDir, "package.json");
     await writeGeneratedFile({
       generatedFile,
       typescript: config2.typescript,

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/dist/server/server.d.ts

@@ -1,5 +1,5 @@
 /**
 
 */
-import http from 'http';
+import http from 'node:http';
 export declare const gqlServer: (database: any, verbose: boolean) => Promise<http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -26,7 +26,6 @@
     "@types/cors": "2.8.5",
     "@types/crypto-js": "^4.2.2",
     "@types/express": "^4.17.21",
-    "@types/express-graphql": "^0.9.0",
     "@types/figlet": "1.2.0",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "26.0.4",
@@ -38,18 +37,18 @@
     "@types/prompts": "^2.4.9",
     "@types/yup": "^0.32.0",
     "jest": "^29.7.0",
-    "@tinacms/scripts": "1.3.0"
+    "@tinacms/scripts": "1.3.1"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.6.8",
     "@graphql-codegen/plugin-helpers": "latest",
-    "@graphql-codegen/typescript": "^4.0.9",
-    "@graphql-codegen/typescript-operations": "^4.2.3",
+    "@graphql-codegen/typescript": "^4.1.1",
+    "@graphql-codegen/typescript-operations": "^4.3.1",
     "@graphql-codegen/visitor-plugin-common": "^4.1.2",
     "@graphql-inspector/core": "^4.2.2",
     "@graphql-tools/graphql-file-loader": "^7.5.17",
     "@graphql-tools/load": "^7.8.14",
-    "@rollup/pluginutils": "^5.1.2",
+    "@rollup/pluginutils": "^5.1.3",
     "@svgr/core": "8.1.0",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
@@ -79,18 +78,18 @@
     "progress": "^2.0.3",
     "prompts": "^2.4.2",
     "readable-stream": "^4.5.2",
-    "tailwindcss": "^3.4.13",
+    "tailwindcss": "^3.4.15",
     "typanion": "3.13.0",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "vite": "^4.5.5",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/app": "2.1.11",
-    "@tinacms/graphql": "1.5.7",
-    "@tinacms/metrics": "1.0.7",
-    "@tinacms/schema-tools": "1.6.7",
-    "@tinacms/search": "1.0.34",
-    "tinacms": "2.4.0"
+    "@tinacms/graphql": "1.5.8",
+    "@tinacms/app": "2.1.12",
+    "@tinacms/schema-tools": "1.6.8",
+    "@tinacms/metrics": "1.0.8",
+    "tinacms": "2.5.0",
+    "@tinacms/search": "1.0.35"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"