@tinacms/cli 0.0.0-90b2aa2-20241028051505 → 0.0.0-9594668-20241223035907

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.7.0";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -41,12 +41,12 @@ var import_chokidar = __toESM(require("chokidar"));
 var import_graphql10 = require("@tinacms/graphql");
 
 // src/next/config-manager.ts
-var import_fs_extra = __toESM(require("fs-extra"));
+var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_os = __toESM(require("os"));
 var esbuild = __toESM(require("esbuild"));
 var dotenv = __toESM(require("dotenv"));
-var import_normalize_path = __toESM(require("normalize-path"));
+var import_normalize_path2 = __toESM(require("normalize-path"));
 var import_chalk2 = __toESM(require("chalk"));
 
 // src/logger/index.ts
@@ -157,465 +157,11 @@ var S_SUCCESS = s("\u25C6", "*");
 var S_WARN = s("\u25B2", "!");
 var S_ERROR = s("\u25A0", "x");
 
-// src/next/config-manager.ts
-var TINA_FOLDER = "tina";
-var LEGACY_TINA_FOLDER = ".tina";
-var GENERATED_FOLDER = "__generated__";
-var GRAPHQL_JSON_FILE = "_graphql.json";
-var GRAPHQL_GQL_FILE = "schema.gql";
-var SCHEMA_JSON_FILE = "_schema.json";
-var LOOKUP_JSON_FILE = "_lookup.json";
-var ConfigManager = class {
-  constructor({
-    rootPath = process.cwd(),
-    tinaGraphQLVersion,
-    legacyNoSDK
-  }) {
-    this.rootPath = (0, import_normalize_path.default)(rootPath);
-    this.tinaGraphQLVersionFromCLI = tinaGraphQLVersion;
-    this.legacyNoSDK = legacyNoSDK;
-  }
-  isUsingTs() {
-    return [".ts", ".tsx"].includes(import_path.default.extname(this.tinaConfigFilePath));
-  }
-  hasSelfHostedConfig() {
-    return !!this.selfHostedDatabaseFilePath;
-  }
-  hasSeparateContentRoot() {
-    return this.rootPath !== this.contentRootPath;
-  }
-  shouldSkipSDK() {
-    var _a;
-    if (this.legacyNoSDK) {
-      return this.legacyNoSDK;
-    }
-    return ((_a = this.config.client) == null ? void 0 : _a.skip) || false;
-  }
-  async processConfig() {
-    this.tinaFolderPath = await this.getTinaFolderPath(this.rootPath);
-    this.envFilePath = import_path.default.resolve(
-      import_path.default.join(this.tinaFolderPath, "..", ".env")
-    );
-    dotenv.config({ path: this.envFilePath });
-    this.tinaConfigFilePath = await this.getPathWithExtension(
-      import_path.default.join(this.tinaFolderPath, "config")
-    );
-    if (!this.tinaConfigFilePath) {
-      throw new Error(
-        `Unable to find config file in ${this.tinaFolderPath}. Looking for a file named "config.{ts,tsx,js,jsx}"`
-      );
-    }
-    this.selfHostedDatabaseFilePath = await this.getPathWithExtension(
-      import_path.default.join(this.tinaFolderPath, "database")
-    );
-    this.generatedFolderPath = import_path.default.join(this.tinaFolderPath, GENERATED_FOLDER);
-    this.generatedCachePath = import_path.default.join(
-      this.generatedFolderPath,
-      ".cache",
-      String(new Date().getTime())
-    );
-    this.generatedGraphQLGQLPath = import_path.default.join(
-      this.generatedFolderPath,
-      GRAPHQL_GQL_FILE
-    );
-    this.generatedGraphQLJSONPath = import_path.default.join(
-      this.generatedFolderPath,
-      GRAPHQL_JSON_FILE
-    );
-    this.generatedSchemaJSONPath = import_path.default.join(
-      this.generatedFolderPath,
-      SCHEMA_JSON_FILE
-    );
-    this.generatedLookupJSONPath = import_path.default.join(
-      this.generatedFolderPath,
-      LOOKUP_JSON_FILE
-    );
-    this.generatedQueriesFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "queries.gql"
-    );
-    this.generatedFragmentsFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "frags.gql"
-    );
-    this.generatedTypesTSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "types.ts"
-    );
-    this.generatedTypesJSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "types.js"
-    );
-    this.generatedTypesDFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "types.d.ts"
-    );
-    this.userQueriesAndFragmentsGlob = import_path.default.join(
-      this.tinaFolderPath,
-      "queries/**/*.{graphql,gql}"
-    );
-    this.generatedQueriesAndFragmentsGlob = import_path.default.join(
-      this.generatedFolderPath,
-      "*.{graphql,gql}"
-    );
-    this.generatedClientTSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "client.ts"
-    );
-    this.generatedClientJSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "client.js"
-    );
-    this.generatedClientDFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "client.d.ts"
-    );
-    this.generatedDatabaseClientDFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "databaseClient.d.ts"
-    );
-    this.generatedDatabaseClientTSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "databaseClient.ts"
-    );
-    this.generatedDatabaseClientJSFilePath = import_path.default.join(
-      this.generatedFolderPath,
-      "databaseClient.js"
-    );
-    const clientExists = this.isUsingTs() ? await import_fs_extra.default.pathExists(this.generatedClientTSFilePath) : await import_fs_extra.default.pathExists(this.generatedClientJSFilePath);
-    if (!clientExists) {
-      const file = "export default ()=>({})\nexport const client = ()=>({})";
-      if (this.isUsingTs()) {
-        await import_fs_extra.default.outputFile(this.generatedClientTSFilePath, file);
-      } else {
-        await import_fs_extra.default.outputFile(this.generatedClientJSFilePath, file);
-      }
-    }
-    const { config: config2, prebuildPath, watchList } = await this.loadConfigFile(
-      this.generatedFolderPath,
-      this.tinaConfigFilePath
-    );
-    this.watchList = watchList;
-    this.config = config2;
-    this.prebuildFilePath = prebuildPath;
-    this.publicFolderPath = import_path.default.join(
-      this.rootPath,
-      this.config.build.publicFolder
-    );
-    this.outputFolderPath = import_path.default.join(
-      this.publicFolderPath,
-      this.config.build.outputFolder
-    );
-    this.outputHTMLFilePath = import_path.default.join(this.outputFolderPath, "index.html");
-    this.outputGitignorePath = import_path.default.join(this.outputFolderPath, ".gitignore");
-    const fullLocalContentPath = import_path.default.join(
-      this.tinaFolderPath,
-      this.config.localContentPath || ""
-    );
-    if (this.config.localContentPath) {
-      const localContentPathExists = await import_fs_extra.default.pathExists(fullLocalContentPath);
-      if (localContentPathExists) {
-        logger.info(`Using separate content repo at ${fullLocalContentPath}`);
-        this.contentRootPath = fullLocalContentPath;
-      } else {
-        logger.warn(
-          `${import_chalk2.default.yellow("Warning:")} The localContentPath ${import_chalk2.default.cyan(
-            fullLocalContentPath
-          )} does not exist. Please create it or remove the localContentPath from your config file at ${import_chalk2.default.cyan(
-            this.tinaConfigFilePath
-          )}`
-        );
-      }
-    }
-    if (!this.contentRootPath) {
-      this.contentRootPath = this.rootPath;
-    }
-    this.generatedFolderPathContentRepo = import_path.default.join(
-      await this.getTinaFolderPath(this.contentRootPath),
-      GENERATED_FOLDER
-    );
-    this.spaMainPath = require.resolve("@tinacms/app");
-    this.spaRootPath = import_path.default.join(this.spaMainPath, "..", "..");
-  }
-  async getTinaFolderPath(rootPath) {
-    const tinaFolderPath = import_path.default.join(rootPath, TINA_FOLDER);
-    const tinaFolderExists = await import_fs_extra.default.pathExists(tinaFolderPath);
-    if (tinaFolderExists) {
-      this.isUsingLegacyFolder = false;
-      return tinaFolderPath;
-    }
-    const legacyFolderPath = import_path.default.join(rootPath, LEGACY_TINA_FOLDER);
-    const legacyFolderExists = await import_fs_extra.default.pathExists(legacyFolderPath);
-    if (legacyFolderExists) {
-      this.isUsingLegacyFolder = true;
-      return legacyFolderPath;
-    }
-    throw new Error(
-      `Unable to find Tina folder, if you're working in folder outside of the Tina config be sure to specify --rootPath`
-    );
-  }
-  getTinaGraphQLVersion() {
-    var _a, _b;
-    if (this.tinaGraphQLVersionFromCLI) {
-      return this.tinaGraphQLVersionFromCLI;
-    }
-    const generatedSchema = import_fs_extra.default.readJSONSync(this.generatedSchemaJSONPath);
-    if (!generatedSchema || !(typeof (generatedSchema == null ? void 0 : generatedSchema.version) !== "undefined") || !(typeof ((_a = generatedSchema == null ? void 0 : generatedSchema.version) == null ? void 0 : _a.major) === "string") || !(typeof ((_b = generatedSchema == null ? void 0 : generatedSchema.version) == null ? void 0 : _b.minor) === "string")) {
-      throw new Error(
-        `Can not find Tina GraphQL version in ${this.generatedSchemaJSONPath}`
-      );
-    }
-    return `${generatedSchema.version.major}.${generatedSchema.version.minor}`;
-  }
-  printGeneratedClientFilePath() {
-    if (this.isUsingTs()) {
-      return this.generatedClientTSFilePath.replace(`${this.rootPath}/`, "");
-    }
-    return this.generatedClientJSFilePath.replace(`${this.rootPath}/`, "");
-  }
-  printGeneratedTypesFilePath() {
-    return this.generatedTypesTSFilePath.replace(`${this.rootPath}/`, "");
-  }
-  printoutputHTMLFilePath() {
-    return this.outputHTMLFilePath.replace(`${this.publicFolderPath}/`, "");
-  }
-  printRelativePath(filename) {
-    if (filename) {
-      return filename.replace(/\\/g, "/").replace(`${this.rootPath}/`, "");
-    }
-    throw `No path provided to print`;
-  }
-  printPrebuildFilePath() {
-    return this.prebuildFilePath.replace(/\\/g, "/").replace(`${this.rootPath}/${this.tinaFolderPath}/`, "");
-  }
-  printContentRelativePath(filename) {
-    if (filename) {
-      return filename.replace(/\\/g, "/").replace(`${this.contentRootPath}/`, "");
-    }
-    throw `No path provided to print`;
-  }
-  async getPathWithExtension(filepath) {
-    const extensions = ["tsx", "ts", "jsx", "js"];
-    let result;
-    await Promise.all(
-      extensions.map(async (ext) => {
-        if (result) {
-          return;
-        }
-        const filepathWithExtension = `${filepath}.${ext}`;
-        const exists = import_fs_extra.default.existsSync(filepathWithExtension);
-        if (exists) {
-          result = filepathWithExtension;
-        }
-      })
-    );
-    return result;
-  }
-  async loadDatabaseFile() {
-    const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
-    const outfile = import_path.default.join(tmpdir, "database.build.js");
-    await esbuild.build({
-      entryPoints: [this.selfHostedDatabaseFilePath],
-      bundle: true,
-      platform: "node",
-      outfile,
-      loader: loaders
-    });
-    const result = require(outfile);
-    import_fs_extra.default.removeSync(outfile);
-    return result.default;
-  }
-  async loadConfigFile(generatedFolderPath, configFilePath) {
-    const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
-    const prebuild = import_path.default.join(this.generatedFolderPath, "config.prebuild.jsx");
-    const outfile = import_path.default.join(tmpdir, "config.build.jsx");
-    const outfile2 = import_path.default.join(tmpdir, "config.build.js");
-    const tempTSConfigFile = import_path.default.join(tmpdir, "tsconfig.json");
-    import_fs_extra.default.outputFileSync(tempTSConfigFile, "{}");
-    const result2 = await esbuild.build({
-      entryPoints: [configFilePath],
-      bundle: true,
-      target: ["es2020"],
-      platform: "browser",
-      format: "esm",
-      logLevel: "silent",
-      packages: "external",
-      ignoreAnnotations: true,
-      outfile: prebuild,
-      loader: loaders,
-      metafile: true
-    });
-    const flattenedList = [];
-    Object.keys(result2.metafile.inputs).forEach((key) => {
-      if (key.includes("node_modules") || key.includes("__generated__")) {
-        return;
-      }
-      flattenedList.push(key);
-    });
-    await esbuild.build({
-      entryPoints: [configFilePath],
-      bundle: true,
-      target: ["es2020"],
-      logLevel: "silent",
-      platform: "node",
-      outfile,
-      loader: loaders
-    });
-    await esbuild.build({
-      entryPoints: [outfile],
-      bundle: true,
-      logLevel: "silent",
-      platform: "node",
-      outfile: outfile2,
-      loader: loaders
-    });
-    let result;
-    try {
-      result = require(outfile2);
-    } catch (e) {
-      console.error("Unexpected error loading config");
-      console.error(e);
-      throw e;
-    }
-    import_fs_extra.default.removeSync(outfile);
-    import_fs_extra.default.removeSync(outfile2);
-    return {
-      config: result.default,
-      prebuildPath: prebuild,
-      watchList: flattenedList
-    };
-  }
-};
-var loaders = {
-  ".aac": "file",
-  ".css": "file",
-  ".eot": "file",
-  ".flac": "file",
-  ".gif": "file",
-  ".jpeg": "file",
-  ".jpg": "file",
-  ".json": "json",
-  ".mp3": "file",
-  ".mp4": "file",
-  ".ogg": "file",
-  ".otf": "file",
-  ".png": "file",
-  ".svg": "file",
-  ".ttf": "file",
-  ".wav": "file",
-  ".webm": "file",
-  ".webp": "file",
-  ".woff": "file",
-  ".woff2": "file",
-  ".js": "jsx",
-  ".jsx": "jsx",
-  ".tsx": "tsx"
-};
-
-// src/next/commands/dev-command/html.ts
-var errorHTML = `<style type="text/css">
-#no-assets-placeholder body {
-  font-family: sans-serif;
-  font-size: 16px;
-  line-height: 1.4;
-  color: #333;
-  background-color: #f5f5f5;
-}
-#no-assets-placeholder {
-  max-width: 600px;
-  margin: 0 auto;
-  padding: 40px;
-  text-align: center;
-  background-color: #fff;
-  box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.1);
-}
-#no-assets-placeholder h1 {
-  font-size: 24px;
-  margin-bottom: 20px;
-}
-#no-assets-placeholder p {
-  margin-bottom: 10px;
-}
-#no-assets-placeholder a {
-  color: #0077cc;
-  text-decoration: none;
-}
-#no-assets-placeholder a:hover {
-  text-decoration: underline;
-}
-</style>
-<div id="no-assets-placeholder">
-<h1>Failed loading TinaCMS assets</h1>
-<p>
-  Your TinaCMS configuration may be misconfigured, and we could not load
-  the assets for this page.
-</p>
-<p>
-  Please visit <a href="https://tina.io/docs/tina-cloud/faq/#how-do-i-resolve-failed-loading-tinacms-assets-error">this doc</a> for help.
-</p>
-</div>
-</div>`.trim().replace(/[\r\n\s]+/g, " ");
-var devHTML = (port) => `<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>TinaCMS</title>
-  </head>
-
-  <!-- if development -->
-  <script type="module">
-    import RefreshRuntime from 'http://localhost:${port}/@react-refresh'
-    RefreshRuntime.injectIntoGlobalHook(window)
-    window.$RefreshReg$ = () => {}
-    window.$RefreshSig$ = () => (type) => type
-    window.__vite_plugin_react_preamble_installed__ = true
-  <\/script>
-  <script type="module" src="http://localhost:${port}/@vite/client"><\/script>
-  <script>
-  function handleLoadError() {
-    // Assets have failed to load
-    document.getElementById('root').innerHTML = '${errorHTML}';
-  }
-  <\/script>
-  <script
-    type="module"
-    src="http://localhost:${port}/src/main.tsx"
-    onerror="handleLoadError()"
-  ><\/script>
-  <body class="tina-tailwind">
-    <div id="root"></div>
-  </body>
-</html>`;
-
-// src/utils/theme.ts
-var import_chalk3 = __toESM(require("chalk"));
-var successText = import_chalk3.default.bold.green;
-var focusText = import_chalk3.default.bold;
-var dangerText = import_chalk3.default.bold.red;
-var neutralText = import_chalk3.default.bold.cyan;
-var linkText = import_chalk3.default.bold.cyan;
-var labelText = import_chalk3.default.bold;
-var cmdText = import_chalk3.default.inverse;
-var indentedCmd = (str) => {
-  return `  \u2503 ` + str;
-};
-var indentText = (str) => {
-  return String(str).split("\n").map((line) => `   ${line}`).join("\n");
-};
-var logText = import_chalk3.default.italic.gray;
-var warnText = import_chalk3.default.yellowBright.bgBlack;
-var titleText = import_chalk3.default.bgHex("d2f1f8").hex("ec4816");
-var CONFIRMATION_TEXT = import_chalk3.default.dim("enter to confirm");
-
-// src/next/commands/dev-command/server/index.ts
-var import_vite3 = require("vite");
-
 // src/next/vite/index.ts
 var import_node_path2 = __toESM(require("path"));
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
-var import_fs_extra2 = __toESM(require("fs-extra"));
-var import_normalize_path2 = __toESM(require("normalize-path"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_normalize_path = __toESM(require("normalize-path"));
 var import_vite = require("vite");
 
 // src/next/vite/tailwind.ts
@@ -897,15 +443,15 @@ async function listFilesRecursively({
     config2.publicFolder,
     directoryPath
   );
-  const exists = await import_fs_extra2.default.pathExists(fullDirectoryPath);
+  const exists = await import_fs_extra.default.pathExists(fullDirectoryPath);
   if (!exists) {
     return { "0": [] };
   }
-  const items = await import_fs_extra2.default.readdir(fullDirectoryPath);
+  const items = await import_fs_extra.default.readdir(fullDirectoryPath);
   const staticMediaItems = [];
   for (const item of items) {
     const itemPath = import_node_path2.default.join(fullDirectoryPath, item);
-    const stats = await import_fs_extra2.default.promises.lstat(itemPath);
+    const stats = await import_fs_extra.default.promises.lstat(itemPath);
     const staticMediaItem = {
       id: item,
       filename: item,
@@ -937,15 +483,35 @@ async function listFilesRecursively({
   }
   return chunkArrayIntoObject(staticMediaItems, 20);
 }
+var loadProjectConfig = async ({
+  rootPath,
+  viteConfigEnv
+}) => {
+  if (viteConfigEnv) {
+    const configFileJs = import_node_path2.default.join(rootPath, "vite.config.js");
+    const configFileTs = import_node_path2.default.join(rootPath, "vite.config.ts");
+    if (import_fs_extra.default.existsSync(configFileJs)) {
+      return await (0, import_vite.loadConfigFromFile)(viteConfigEnv, configFileJs);
+    } else if (import_fs_extra.default.existsSync(configFileTs)) {
+      return await (0, import_vite.loadConfigFromFile)(viteConfigEnv, configFileTs);
+    }
+  }
+  return { config: {} };
+};
 var createConfig = async ({
   configManager,
   database,
   apiURL,
   plugins = [],
   noWatch,
-  rollupOptions
+  rollupOptions,
+  viteConfigEnv
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const projectConfig = await loadProjectConfig({
+    rootPath: configManager.rootPath,
+    viteConfigEnv
+  });
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
     if (key.startsWith("TINA_PUBLIC_") || key.startsWith("NEXT_PUBLIC_") || key === "NODE_ENV" || key === "HEAD") {
@@ -973,9 +539,9 @@ var createConfig = async ({
       config: configManager.config.media.tina,
       roothPath: configManager.rootPath
     });
-    await import_fs_extra2.default.outputFile(staticMediaPath, JSON.stringify(staticMedia, null, 2));
+    await import_fs_extra.default.outputFile(staticMediaPath, JSON.stringify(staticMedia, null, 2));
   } else {
-    await import_fs_extra2.default.outputFile(staticMediaPath, `[]`);
+    await import_fs_extra.default.outputFile(staticMediaPath, `[]`);
   }
   const alias = {
     TINA_IMPORT: configManager.prebuildFilePath,
@@ -999,65 +565,552 @@ var createConfig = async ({
   if (configManager.config.build.basePath) {
     basePath = configManager.config.build.basePath;
   }
-  const config2 = {
-    root: configManager.spaRootPath,
-    base: `/${basePath ? `${(0, import_normalize_path2.default)(basePath)}/` : ""}${(0, import_normalize_path2.default)(
-      configManager.config.build.outputFolder
-    )}/`,
-    appType: "spa",
-    resolve: {
-      alias,
-      dedupe: ["graphql", "tinacms", "react", "react-dom", "react-router-dom"]
-    },
-    define: {
-      "process.env": `new Object(${JSON.stringify(publicEnv)})`,
-      "process.platform": `"${process.platform}"`,
-      __API_URL__: `"${apiURL}"`,
-      __BASE_PATH__: `"${((_e = (_d = configManager.config) == null ? void 0 : _d.build) == null ? void 0 : _e.basePath) || ""}"`,
-      __TINA_GRAPHQL_VERSION__: `"${configManager.getTinaGraphQLVersion()}"`
-    },
-    logLevel: "error",
-    optimizeDeps: {
-      force: true,
-      include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
-    },
-    server: {
-      host: (_h = (_g = (_f = configManager.config) == null ? void 0 : _f.build) == null ? void 0 : _g.host) != null ? _h : false,
-      watch: noWatch ? {
-        ignored: ["**/*"]
-      } : {
-        ignored: [
-          `${configManager.tinaFolderPath}/**/!(config.prebuild.jsx|_graphql.json)`
-        ]
-      },
-      fs: {
-        strict: false
-      }
-    },
-    build: {
-      sourcemap: false,
-      outDir: configManager.outputFolderPath,
-      emptyOutDir: true,
-      rollupOptions
-    },
-    plugins: [
-      (0, import_plugin_react.default)({
-        babel: {
-          compact: true
-        }
-      }),
-      (0, import_vite.splitVendorChunkPlugin)(),
-      tinaTailwind(configManager.spaRootPath, configManager.prebuildFilePath),
-      ...plugins
-    ]
-  };
-  return config2;
+  const fullVersion = configManager.getTinaGraphQLVersion();
+  const version2 = `${fullVersion.major}.${fullVersion.minor}`;
+  const config2 = {
+    root: configManager.spaRootPath,
+    base: `/${basePath ? `${(0, import_normalize_path.default)(basePath)}/` : ""}${(0, import_normalize_path.default)(
+      configManager.config.build.outputFolder
+    )}/`,
+    appType: "spa",
+    resolve: {
+      alias: {
+        ...(_d = projectConfig.config.resolve) == null ? void 0 : _d.alias,
+        ...alias
+      },
+      dedupe: ["graphql", "tinacms", "react", "react-dom", "react-router-dom"]
+    },
+    define: {
+      "process.env": `new Object(${JSON.stringify(publicEnv)})`,
+      "process.platform": `"${process.platform}"`,
+      __API_URL__: `"${apiURL}"`,
+      __BASE_PATH__: `"${((_f = (_e = configManager.config) == null ? void 0 : _e.build) == null ? void 0 : _f.basePath) || ""}"`,
+      __TINA_GRAPHQL_VERSION__: version2
+    },
+    logLevel: "error",
+    optimizeDeps: {
+      force: true,
+      include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
+    },
+    server: {
+      host: (_i = (_h = (_g = configManager.config) == null ? void 0 : _g.build) == null ? void 0 : _h.host) != null ? _i : false,
+      watch: noWatch ? {
+        ignored: ["**/*"]
+      } : {
+        ignored: [
+          `${configManager.tinaFolderPath}/**/!(config.prebuild.jsx|_graphql.json)`
+        ]
+      },
+      fs: {
+        strict: false
+      }
+    },
+    build: {
+      sourcemap: false,
+      outDir: configManager.outputFolderPath,
+      emptyOutDir: true,
+      rollupOptions
+    },
+    plugins: [
+      (0, import_plugin_react.default)({
+        babel: {
+          compact: true
+        }
+      }),
+      (0, import_vite.splitVendorChunkPlugin)(),
+      tinaTailwind(configManager.spaRootPath, configManager.prebuildFilePath),
+      ...plugins
+    ]
+  };
+  return config2;
+};
+
+// src/utils/resolve-alias-helpers.ts
+async function loadViteConfig(rootPath) {
+  try {
+    return await loadProjectConfig({
+      rootPath,
+      viteConfigEnv: {
+        command: "build",
+        mode: "production"
+      }
+    });
+  } catch (error) {
+    console.error("Failed to load Vite config:", error.message);
+    throw new Error("Error loading Vite configuration");
+  }
+}
+
+// src/next/config-manager.ts
+var TINA_FOLDER = "tina";
+var LEGACY_TINA_FOLDER = ".tina";
+var GENERATED_FOLDER = "__generated__";
+var GRAPHQL_JSON_FILE = "_graphql.json";
+var GRAPHQL_GQL_FILE = "schema.gql";
+var SCHEMA_JSON_FILE = "_schema.json";
+var LOOKUP_JSON_FILE = "_lookup.json";
+var ConfigManager = class {
+  constructor({
+    rootPath = process.cwd(),
+    tinaGraphQLVersion,
+    legacyNoSDK
+  }) {
+    this.rootPath = (0, import_normalize_path2.default)(rootPath);
+    this.tinaGraphQLVersionFromCLI = tinaGraphQLVersion;
+    this.legacyNoSDK = legacyNoSDK;
+  }
+  isUsingTs() {
+    return [".ts", ".tsx"].includes(import_path.default.extname(this.tinaConfigFilePath));
+  }
+  hasSelfHostedConfig() {
+    return !!this.selfHostedDatabaseFilePath;
+  }
+  hasSeparateContentRoot() {
+    return this.rootPath !== this.contentRootPath;
+  }
+  shouldSkipSDK() {
+    var _a;
+    if (this.legacyNoSDK) {
+      return this.legacyNoSDK;
+    }
+    return ((_a = this.config.client) == null ? void 0 : _a.skip) || false;
+  }
+  async processConfig() {
+    this.tinaFolderPath = await this.getTinaFolderPath(this.rootPath);
+    this.envFilePath = import_path.default.resolve(
+      import_path.default.join(this.tinaFolderPath, "..", ".env")
+    );
+    dotenv.config({ path: this.envFilePath });
+    this.tinaConfigFilePath = await this.getPathWithExtension(
+      import_path.default.join(this.tinaFolderPath, "config")
+    );
+    if (!this.tinaConfigFilePath) {
+      throw new Error(
+        `Unable to find config file in ${this.tinaFolderPath}. Looking for a file named "config.{ts,tsx,js,jsx}"`
+      );
+    }
+    this.selfHostedDatabaseFilePath = await this.getPathWithExtension(
+      import_path.default.join(this.tinaFolderPath, "database")
+    );
+    this.generatedFolderPath = import_path.default.join(this.tinaFolderPath, GENERATED_FOLDER);
+    this.generatedCachePath = import_path.default.join(
+      this.generatedFolderPath,
+      ".cache",
+      String(new Date().getTime())
+    );
+    this.generatedGraphQLGQLPath = import_path.default.join(
+      this.generatedFolderPath,
+      GRAPHQL_GQL_FILE
+    );
+    this.generatedGraphQLJSONPath = import_path.default.join(
+      this.generatedFolderPath,
+      GRAPHQL_JSON_FILE
+    );
+    this.generatedSchemaJSONPath = import_path.default.join(
+      this.generatedFolderPath,
+      SCHEMA_JSON_FILE
+    );
+    this.generatedLookupJSONPath = import_path.default.join(
+      this.generatedFolderPath,
+      LOOKUP_JSON_FILE
+    );
+    this.generatedQueriesFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "queries.gql"
+    );
+    this.generatedFragmentsFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "frags.gql"
+    );
+    this.generatedTypesTSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "types.ts"
+    );
+    this.generatedTypesJSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "types.js"
+    );
+    this.generatedTypesDFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "types.d.ts"
+    );
+    this.userQueriesAndFragmentsGlob = import_path.default.join(
+      this.tinaFolderPath,
+      "queries/**/*.{graphql,gql}"
+    );
+    this.generatedQueriesAndFragmentsGlob = import_path.default.join(
+      this.generatedFolderPath,
+      "*.{graphql,gql}"
+    );
+    this.generatedClientTSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "client.ts"
+    );
+    this.generatedClientJSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "client.js"
+    );
+    this.generatedClientDFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "client.d.ts"
+    );
+    this.generatedDatabaseClientDFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "databaseClient.d.ts"
+    );
+    this.generatedDatabaseClientTSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "databaseClient.ts"
+    );
+    this.generatedDatabaseClientJSFilePath = import_path.default.join(
+      this.generatedFolderPath,
+      "databaseClient.js"
+    );
+    const clientExists = this.isUsingTs() ? await import_fs_extra2.default.pathExists(this.generatedClientTSFilePath) : await import_fs_extra2.default.pathExists(this.generatedClientJSFilePath);
+    if (!clientExists) {
+      const file = "export default ()=>({})\nexport const client = ()=>({})";
+      if (this.isUsingTs()) {
+        await import_fs_extra2.default.outputFile(this.generatedClientTSFilePath, file);
+      } else {
+        await import_fs_extra2.default.outputFile(this.generatedClientJSFilePath, file);
+      }
+    }
+    const { config: config2, prebuildPath, watchList } = await this.loadConfigFile(
+      this.generatedFolderPath,
+      this.tinaConfigFilePath
+    );
+    this.watchList = watchList;
+    this.config = config2;
+    this.prebuildFilePath = prebuildPath;
+    this.publicFolderPath = import_path.default.join(
+      this.rootPath,
+      this.config.build.publicFolder
+    );
+    this.outputFolderPath = import_path.default.join(
+      this.publicFolderPath,
+      this.config.build.outputFolder
+    );
+    this.outputHTMLFilePath = import_path.default.join(this.outputFolderPath, "index.html");
+    this.outputGitignorePath = import_path.default.join(this.outputFolderPath, ".gitignore");
+    const fullLocalContentPath = import_path.default.join(
+      this.tinaFolderPath,
+      this.config.localContentPath || ""
+    );
+    if (this.config.localContentPath) {
+      const localContentPathExists = await import_fs_extra2.default.pathExists(fullLocalContentPath);
+      if (localContentPathExists) {
+        logger.info(`Using separate content repo at ${fullLocalContentPath}`);
+        this.contentRootPath = fullLocalContentPath;
+      } else {
+        logger.warn(
+          `${import_chalk2.default.yellow("Warning:")} The localContentPath ${import_chalk2.default.cyan(
+            fullLocalContentPath
+          )} does not exist. Please create it or remove the localContentPath from your config file at ${import_chalk2.default.cyan(
+            this.tinaConfigFilePath
+          )}`
+        );
+      }
+    }
+    if (!this.contentRootPath) {
+      this.contentRootPath = this.rootPath;
+    }
+    this.generatedFolderPathContentRepo = import_path.default.join(
+      await this.getTinaFolderPath(this.contentRootPath),
+      GENERATED_FOLDER
+    );
+    this.spaMainPath = require.resolve("@tinacms/app");
+    this.spaRootPath = import_path.default.join(this.spaMainPath, "..", "..");
+  }
+  async getTinaFolderPath(rootPath) {
+    const tinaFolderPath = import_path.default.join(rootPath, TINA_FOLDER);
+    const tinaFolderExists = await import_fs_extra2.default.pathExists(tinaFolderPath);
+    if (tinaFolderExists) {
+      this.isUsingLegacyFolder = false;
+      return tinaFolderPath;
+    }
+    const legacyFolderPath = import_path.default.join(rootPath, LEGACY_TINA_FOLDER);
+    const legacyFolderExists = await import_fs_extra2.default.pathExists(legacyFolderPath);
+    if (legacyFolderExists) {
+      this.isUsingLegacyFolder = true;
+      return legacyFolderPath;
+    }
+    throw new Error(
+      `Unable to find Tina folder, if you're working in folder outside of the Tina config be sure to specify --rootPath`
+    );
+  }
+  getTinaGraphQLVersion() {
+    if (this.tinaGraphQLVersionFromCLI) {
+      const version2 = this.tinaGraphQLVersionFromCLI.split(".");
+      return {
+        fullVersion: this.tinaGraphQLVersionFromCLI,
+        major: version2[0] || "x",
+        minor: version2[1] || "x",
+        patch: version2[2] || "x"
+      };
+    }
+    const generatedSchema = import_fs_extra2.default.readJSONSync(this.generatedSchemaJSONPath);
+    if (!generatedSchema || !(typeof (generatedSchema == null ? void 0 : generatedSchema.version) !== "undefined")) {
+      throw new Error(
+        `Can not find Tina GraphQL version in ${this.generatedSchemaJSONPath}`
+      );
+    }
+    return generatedSchema.version;
+  }
+  printGeneratedClientFilePath() {
+    if (this.isUsingTs()) {
+      return this.generatedClientTSFilePath.replace(`${this.rootPath}/`, "");
+    }
+    return this.generatedClientJSFilePath.replace(`${this.rootPath}/`, "");
+  }
+  printGeneratedTypesFilePath() {
+    return this.generatedTypesTSFilePath.replace(`${this.rootPath}/`, "");
+  }
+  printoutputHTMLFilePath() {
+    return this.outputHTMLFilePath.replace(`${this.publicFolderPath}/`, "");
+  }
+  printRelativePath(filename) {
+    if (filename) {
+      return filename.replace(/\\/g, "/").replace(`${this.rootPath}/`, "");
+    }
+    throw `No path provided to print`;
+  }
+  printPrebuildFilePath() {
+    return this.prebuildFilePath.replace(/\\/g, "/").replace(`${this.rootPath}/${this.tinaFolderPath}/`, "");
+  }
+  printContentRelativePath(filename) {
+    if (filename) {
+      return filename.replace(/\\/g, "/").replace(`${this.contentRootPath}/`, "");
+    }
+    throw `No path provided to print`;
+  }
+  async getPathWithExtension(filepath) {
+    const extensions = ["tsx", "ts", "jsx", "js"];
+    let result;
+    await Promise.all(
+      extensions.map(async (ext) => {
+        if (result) {
+          return;
+        }
+        const filepathWithExtension = `${filepath}.${ext}`;
+        const exists = import_fs_extra2.default.existsSync(filepathWithExtension);
+        if (exists) {
+          result = filepathWithExtension;
+        }
+      })
+    );
+    return result;
+  }
+  async loadDatabaseFile() {
+    const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
+    const outfile = import_path.default.join(tmpdir, "database.build.js");
+    await esbuild.build({
+      entryPoints: [this.selfHostedDatabaseFilePath],
+      bundle: true,
+      platform: "node",
+      outfile,
+      loader: loaders
+    });
+    const result = require(outfile);
+    import_fs_extra2.default.removeSync(outfile);
+    return result.default;
+  }
+  async loadConfigFile(generatedFolderPath, configFilePath) {
+    var _a;
+    const tmpdir = import_path.default.join(import_os.default.tmpdir(), Date.now().toString());
+    const preBuildConfigPath = import_path.default.join(
+      this.generatedFolderPath,
+      "config.prebuild.jsx"
+    );
+    const outfile = import_path.default.join(tmpdir, "config.build.jsx");
+    const outfile2 = import_path.default.join(tmpdir, "config.build.js");
+    const tempTSConfigFile = import_path.default.join(tmpdir, "tsconfig.json");
+    const viteConfig = await loadViteConfig(this.rootPath);
+    console.log("latest");
+    import_fs_extra2.default.outputFileSync(tempTSConfigFile, "{}");
+    const result2 = await esbuild.build({
+      entryPoints: [configFilePath],
+      bundle: true,
+      target: ["es2020"],
+      platform: "browser",
+      format: "esm",
+      logLevel: "silent",
+      packages: "external",
+      ignoreAnnotations: true,
+      outfile: preBuildConfigPath,
+      loader: loaders,
+      metafile: true
+    });
+    const flattenedList = [];
+    Object.keys(result2.metafile.inputs).forEach((key) => {
+      if (key.includes("node_modules") || key.includes("__generated__")) {
+        return;
+      }
+      flattenedList.push(key);
+    });
+    await esbuild.build({
+      entryPoints: [configFilePath],
+      bundle: true,
+      target: ["es2020"],
+      logLevel: "silent",
+      platform: "node",
+      outfile,
+      loader: loaders,
+      alias: (_a = viteConfig.config.resolve) == null ? void 0 : _a.alias
+    });
+    await esbuild.build({
+      entryPoints: [outfile],
+      bundle: true,
+      logLevel: "silent",
+      platform: "node",
+      outfile: outfile2,
+      loader: loaders
+    });
+    let result;
+    try {
+      result = require(outfile2);
+    } catch (e) {
+      console.error("Unexpected error loading config");
+      console.error(e);
+      throw e;
+    }
+    import_fs_extra2.default.removeSync(outfile);
+    import_fs_extra2.default.removeSync(outfile2);
+    return {
+      config: result.default,
+      prebuildPath: preBuildConfigPath,
+      watchList: flattenedList
+    };
+  }
+};
+var loaders = {
+  ".aac": "file",
+  ".css": "file",
+  ".eot": "file",
+  ".flac": "file",
+  ".gif": "file",
+  ".jpeg": "file",
+  ".jpg": "file",
+  ".json": "json",
+  ".mp3": "file",
+  ".mp4": "file",
+  ".ogg": "file",
+  ".otf": "file",
+  ".png": "file",
+  ".svg": "file",
+  ".ttf": "file",
+  ".wav": "file",
+  ".webm": "file",
+  ".webp": "file",
+  ".woff": "file",
+  ".woff2": "file",
+  ".js": "jsx",
+  ".jsx": "jsx",
+  ".tsx": "tsx"
+};
+
+// src/next/commands/dev-command/html.ts
+var errorHTML = `<style type="text/css">
+#no-assets-placeholder body {
+  font-family: sans-serif;
+  font-size: 16px;
+  line-height: 1.4;
+  color: #333;
+  background-color: #f5f5f5;
+}
+#no-assets-placeholder {
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 40px;
+  text-align: center;
+  background-color: #fff;
+  box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.1);
+}
+#no-assets-placeholder h1 {
+  font-size: 24px;
+  margin-bottom: 20px;
+}
+#no-assets-placeholder p {
+  margin-bottom: 10px;
+}
+#no-assets-placeholder a {
+  color: #0077cc;
+  text-decoration: none;
+}
+#no-assets-placeholder a:hover {
+  text-decoration: underline;
+}
+</style>
+<div id="no-assets-placeholder">
+<h1>Failed loading TinaCMS assets</h1>
+<p>
+  Your TinaCMS configuration may be misconfigured, and we could not load
+  the assets for this page.
+</p>
+<p>
+  Please visit <a href="https://tina.io/docs/tina-cloud/faq/#how-do-i-resolve-failed-loading-tinacms-assets-error">this doc</a> for help.
+</p>
+</div>
+</div>`.trim().replace(/[\r\n\s]+/g, " ");
+var devHTML = (port) => `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>TinaCMS</title>
+  </head>
+
+  <!-- if development -->
+  <script type="module">
+    import RefreshRuntime from 'http://localhost:${port}/@react-refresh'
+    RefreshRuntime.injectIntoGlobalHook(window)
+    window.$RefreshReg$ = () => {}
+    window.$RefreshSig$ = () => (type) => type
+    window.__vite_plugin_react_preamble_installed__ = true
+  <\/script>
+  <script type="module" src="http://localhost:${port}/@vite/client"><\/script>
+  <script>
+  function handleLoadError() {
+    // Assets have failed to load
+    document.getElementById('root').innerHTML = '${errorHTML}';
+  }
+  <\/script>
+  <script
+    type="module"
+    src="http://localhost:${port}/src/main.tsx"
+    onerror="handleLoadError()"
+  ><\/script>
+  <body class="tina-tailwind">
+    <div id="root"></div>
+  </body>
+</html>`;
+
+// src/utils/theme.ts
+var import_chalk3 = __toESM(require("chalk"));
+var successText = import_chalk3.default.bold.green;
+var focusText = import_chalk3.default.bold;
+var dangerText = import_chalk3.default.bold.red;
+var neutralText = import_chalk3.default.bold.cyan;
+var linkText = import_chalk3.default.bold.cyan;
+var labelText = import_chalk3.default.bold;
+var cmdText = import_chalk3.default.inverse;
+var indentedCmd = (str) => {
+  return `  \u2503 ` + str;
 };
+var indentText = (str) => {
+  return String(str).split("\n").map((line) => `   ${line}`).join("\n");
+};
+var logText = import_chalk3.default.italic.gray;
+var warnText = import_chalk3.default.yellowBright.bgBlack;
+var titleText = import_chalk3.default.bgHex("d2f1f8").hex("ec4816");
+var CONFIRMATION_TEXT = import_chalk3.default.dim("enter to confirm");
+
+// src/next/commands/dev-command/server/index.ts
+var import_vite4 = require("vite");
 
 // src/next/vite/plugins.ts
 var import_pluginutils = require("@rollup/pluginutils");
 var import_fs = __toESM(require("fs"));
-var import_vite2 = require("vite");
+var import_vite3 = require("vite");
 var import_esbuild = require("esbuild");
 var import_path3 = __toESM(require("path"));
 var import_body_parser = __toESM(require("body-parser"));
@@ -1380,7 +1433,7 @@ function viteTransformExtension({
             previousExport: exportAsDefault ? null : code
           }
         });
-        const res = await (0, import_vite2.transformWithEsbuild)(componentCode, id, {
+        const res = await (0, import_vite3.transformWithEsbuild)(componentCode, id, {
           loader: "jsx",
           ...esbuildOptions
         });
@@ -1400,7 +1453,7 @@ var createDevServer = async (configManager, database, searchIndex, apiURL, noWat
     devServerEndPointsPlugin({ apiURL, configManager, database, searchIndex }),
     viteTransformExtension()
   ];
-  return (0, import_vite3.createServer)(
+  return (0, import_vite4.createServer)(
     await createConfig({
       configManager,
       database,
@@ -1415,6 +1468,10 @@ var createDevServer = async (configManager, database, searchIndex, apiURL, noWat
           }
           warn(warning);
         }
+      },
+      viteConfigEnv: {
+        command: "serve",
+        mode: "development"
       }
     })
   );
@@ -1788,7 +1845,8 @@ var Codegen = class {
     const branch = (_a = this.configManager.config) == null ? void 0 : _a.branch;
     const clientId = (_b = this.configManager.config) == null ? void 0 : _b.clientId;
     const token = (_c = this.configManager.config) == null ? void 0 : _c.token;
-    const version2 = this.configManager.getTinaGraphQLVersion();
+    const fullVersion = this.configManager.getTinaGraphQLVersion();
+    const version2 = `${fullVersion.major}.${fullVersion.minor}`;
     const baseUrl = ((_d = this.configManager.config.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://${TINA_HOST}`;
     if ((!branch || !clientId || !token) && !this.port && !this.configManager.config.contentApiUrlOverride) {
       const missing = [];
@@ -2209,7 +2267,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,10 +2595,12 @@ 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
-var import_vite5 = require("vite");
+var import_vite6 = require("vite");
 var buildProductionSpa = async (configManager, database, apiURL) => {
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
@@ -2572,15 +2632,19 @@ var buildProductionSpa = async (configManager, database, apiURL) => {
         }
         warn(warning);
       }
+    },
+    viteConfigEnv: {
+      command: "build",
+      mode: "production"
     }
   });
-  return (0, import_vite5.build)(config2);
+  return (0, import_vite6.build)(config2);
 };
 
 // src/next/commands/build-command/index.ts
 var import_schema_tools2 = require("@tinacms/schema-tools");
 var import_graphql12 = require("graphql");
-var import_core2 = require("@graphql-inspector/core");
+var import_core3 = require("@graphql-inspector/core");
 
 // src/next/commands/build-command/waitForDB.ts
 var import_progress = __toESM(require("progress"));
@@ -2682,6 +2746,20 @@ var waitForDB = async (config2, apiUrl, previewName, verbose) => {
 
 // src/next/commands/build-command/index.ts
 var import_search2 = require("@tinacms/search");
+
+// src/utils/index.ts
+var import_core2 = require("@graphql-inspector/core");
+var getFaqLink = (type) => {
+  switch (type) {
+    case import_core2.ChangeType.FieldRemoved: {
+      return "https://tina.io/docs/introduction/faq#how-do-i-resolve-the-local-graphql-schema-doesnt-match-the-remote-graphql-schema-errors";
+    }
+    default:
+      return null;
+  }
+};
+
+// src/next/commands/build-command/index.ts
 var BuildCommand = class extends BaseCommand {
   constructor() {
     super(...arguments);
@@ -2809,7 +2887,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
@@ -2837,7 +2915,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,
+        timestamp
       );
     }
     await buildProductionSpa(configManager, database, codegen2.productionUrl);
@@ -2956,11 +3043,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"
       });
@@ -3002,7 +3091,8 @@ ${dangerText(e.message)}
         prog: "\u2705"
       });
       return {
-        hasUpstream
+        hasUpstream,
+        timestamp
       };
     }
     for (let i = 0; i <= 5; i++) {
@@ -3092,14 +3182,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, remoteProjectVersion } = await fetchRemoteGraphqlSchema({
       url: apiURL,
       token
     });
@@ -3119,7 +3209,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
     const localSchemaDocument = await database.getGraphQLSchemaFromBridge();
     const localGraphqlSchema = (0, import_graphql12.buildASTSchema)(localSchemaDocument);
     try {
-      const diffResult = await (0, import_core2.diff)(localGraphqlSchema, remoteGqlSchema);
+      const diffResult = await (0, import_core3.diff)(localGraphqlSchema, remoteGqlSchema);
       if (diffResult.length === 0) {
         bar2.tick({
           prog: "\u2705"
@@ -3128,12 +3218,30 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
         bar2.tick({
           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 += `
+        const type = diffResult[0].type;
+        const reason = diffResult[0].message;
+        const errorLevel = diffResult[0].criticality.level;
+        const faqLink = getFaqLink(type);
+        const tinaGraphQLVersion = configManager.getTinaGraphQLVersion();
+        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. ${faqLink && `
+Check out '${faqLink}' for possible solutions.`}`;
+        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: ${tinaGraphQLVersion.fullVersion} / Remote GraphQL version: ${remoteProjectVersion}
+`;
+        errorMessage += `	Last indexed at: ${new Date(
+          timestamp
+        ).toUTCString()}
+`;
+        errorMessage += `	Reason: [${errorLevel} - ${type}] ${reason}
+`;
         throw new Error(errorMessage);
       }
     } catch (e) {
@@ -3148,6 +3256,71 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
       }
     }
   }
+  async checkTinaSchema(configManager, database, apiURL, previewName, verbose, timestamp) {
+    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.`;
+      errorMessage += `
+
+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);
+    }
+  }
 };
 BuildCommand.paths = [["build"]];
 BuildCommand.usage = import_clipanion3.Command.Usage({
@@ -3214,7 +3387,26 @@ var fetchRemoteGraphqlSchema = async ({
     body
   });
   const data = await res.json();
-  return data == null ? void 0 : data.data;
+  return {
+    remoteSchema: data == null ? void 0 : data.data,
+    remoteRuntimeVersion: res.headers.get("tinacms-grapqhl-version"),
+    remoteProjectVersion: res.headers.get("tinacms-graphql-project-version")
+  };
+};
+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
@@ -3469,25 +3661,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 +3709,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 +3732,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 +3745,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 +3777,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 +4391,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 +4813,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 +4888,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 +5031,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 +5096,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 +5127,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 +5163,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 +5207,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 +5222,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 +6060,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 +6128,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 +6209,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 +6307,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 +6330,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 +6394,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,