@tinacms/cli 0.0.0-c5dad82-20241009225242 → 0.0.0-c72bb45-20241118014046

package/dist/index.js

@@ -31,12 +31,12 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.6.9";
+var version = "1.6.11";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
 var import_fs_extra6 = __toESM(require("fs-extra"));
-var import_path6 = __toESM(require("path"));
+var import_path5 = __toESM(require("path"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_graphql10 = require("@tinacms/graphql");
 
@@ -612,17 +612,19 @@ var CONFIRMATION_TEXT = import_chalk3.default.dim("enter to confirm");
 var import_vite3 = require("vite");
 
 // src/next/vite/index.ts
-var import_path2 = __toESM(require("path"));
+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_vite = require("vite");
-var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 
 // src/next/vite/tailwind.ts
+var import_node_path = __toESM(require("path"));
+var import_aspect_ratio = __toESM(require("@tailwindcss/aspect-ratio"));
+var import_container_queries = __toESM(require("@tailwindcss/container-queries"));
+var import_typography = __toESM(require("@tailwindcss/typography"));
 var import_tailwindcss = __toESM(require("tailwindcss"));
 var import_defaultTheme = __toESM(require("tailwindcss/defaultTheme.js"));
-var import_typography = __toESM(require("@tailwindcss/typography"));
-var import_aspect_ratio = __toESM(require("@tailwindcss/aspect-ratio"));
-var import_node_path = __toESM(require("path"));
 var tinaTailwind = (spaPath, prebuildFilePath) => {
   return {
     name: "vite-plugin-tina",
@@ -866,7 +868,11 @@ var tinaTailwind = (spaPath, prebuildFilePath) => {
           }
         },
         content,
-        plugins: [(0, import_typography.default)({ className: "tina-prose" }), import_aspect_ratio.default]
+        plugins: [
+          (0, import_typography.default)({ className: "tina-prose" }),
+          import_aspect_ratio.default,
+          import_container_queries.default
+        ]
       });
       plugins.push(tw);
       return {
@@ -881,13 +887,12 @@ var tinaTailwind = (spaPath, prebuildFilePath) => {
 };
 
 // src/next/vite/index.ts
-var import_normalize_path2 = __toESM(require("normalize-path"));
 async function listFilesRecursively({
   directoryPath,
   config: config2,
   roothPath
 }) {
-  const fullDirectoryPath = import_path2.default.join(
+  const fullDirectoryPath = import_node_path2.default.join(
     roothPath,
     config2.publicFolder,
     directoryPath
@@ -899,23 +904,23 @@ async function listFilesRecursively({
   const items = await import_fs_extra2.default.readdir(fullDirectoryPath);
   const staticMediaItems = [];
   for (const item of items) {
-    const itemPath = import_path2.default.join(fullDirectoryPath, item);
+    const itemPath = import_node_path2.default.join(fullDirectoryPath, item);
     const stats = await import_fs_extra2.default.promises.lstat(itemPath);
     const staticMediaItem = {
       id: item,
       filename: item,
       type: stats.isDirectory() ? "dir" : "file",
       directory: `${directoryPath.replace(config2.mediaRoot, "")}`,
-      src: `/${import_path2.default.join(directoryPath, item)}`,
+      src: `/${import_node_path2.default.join(directoryPath, item)}`,
       thumbnails: {
-        "75x75": `/${import_path2.default.join(directoryPath, item)}`,
-        "400x400": `/${import_path2.default.join(directoryPath, item)}`,
-        "1000x1000": `/${import_path2.default.join(directoryPath, item)}`
+        "75x75": `/${import_node_path2.default.join(directoryPath, item)}`,
+        "400x400": `/${import_node_path2.default.join(directoryPath, item)}`,
+        "1000x1000": `/${import_node_path2.default.join(directoryPath, item)}`
       }
     };
     if (stats.isDirectory()) {
       staticMediaItem.children = await listFilesRecursively({
-        directoryPath: import_path2.default.join(directoryPath, item),
+        directoryPath: import_node_path2.default.join(directoryPath, item),
         config: config2,
         roothPath
       });
@@ -958,7 +963,7 @@ var createConfig = async ({
       }
     }
   });
-  const staticMediaPath = import_path2.default.join(
+  const staticMediaPath = import_node_path2.default.join(
     configManager.generatedFolderPath,
     "static-media.json"
   );
@@ -976,13 +981,13 @@ var createConfig = async ({
     TINA_IMPORT: configManager.prebuildFilePath,
     SCHEMA_IMPORT: configManager.generatedGraphQLJSONPath,
     STATIC_MEDIA_IMPORT: staticMediaPath,
-    crypto: import_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-    fs: import_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-    os: import_path2.default.join(configManager.spaRootPath, "src", "dummy-client.ts"),
-    path: import_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_path2.default.join(
+    alias["CLIENT_IMPORT"] = import_node_path2.default.join(
       configManager.spaRootPath,
       "src",
       "dummy-client.ts"
@@ -1054,17 +1059,17 @@ var import_pluginutils = require("@rollup/pluginutils");
 var import_fs = __toESM(require("fs"));
 var import_vite2 = require("vite");
 var import_esbuild = require("esbuild");
-var import_path4 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var import_body_parser = __toESM(require("body-parser"));
 var import_cors = __toESM(require("cors"));
 var import_graphql = require("@tinacms/graphql");
 
 // src/next/commands/dev-command/server/media.ts
 var import_fs_extra3 = __toESM(require("fs-extra"));
-var import_path3 = __toESM(require("path"));
+var import_path2 = __toESM(require("path"));
 var import_busboy = __toESM(require("busboy"));
 var createMediaRouter = (config2) => {
-  const mediaFolder = import_path3.default.join(
+  const mediaFolder = import_path2.default.join(
     config2.rootPath,
     config2.publicFolder,
     config2.mediaRoot
@@ -1092,8 +1097,8 @@ var createMediaRouter = (config2) => {
     bb.on("file", async (_name, file, _info) => {
       var _a;
       const fullPath = decodeURI((_a = req.url) == null ? void 0 : _a.slice("/media/upload/".length));
-      const saveTo = import_path3.default.join(mediaFolder, ...fullPath.split("/"));
-      await import_fs_extra3.default.ensureDir(import_path3.default.dirname(saveTo));
+      const saveTo = import_path2.default.join(mediaFolder, ...fullPath.split("/"));
+      await import_fs_extra3.default.ensureDir(import_path2.default.dirname(saveTo));
       file.pipe(import_fs_extra3.default.createWriteStream(saveTo));
     });
     bb.on("error", (error) => {
@@ -1128,7 +1133,7 @@ var MediaModel = class {
   }
   async listMedia(args) {
     try {
-      const folderPath = (0, import_path3.join)(
+      const folderPath = (0, import_path2.join)(
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
@@ -1143,7 +1148,7 @@ var MediaModel = class {
       }
       const filesStr = await import_fs_extra3.default.readdir(folderPath);
       const filesProm = filesStr.map(async (file) => {
-        const filePath = (0, import_path3.join)(folderPath, file);
+        const filePath = (0, import_path2.join)(folderPath, file);
         const stat = await import_fs_extra3.default.stat(filePath);
         let src = `/${file}`;
         const isFile = stat.isFile();
@@ -1200,7 +1205,7 @@ var MediaModel = class {
   }
   async deleteMedia(args) {
     try {
-      const file = (0, import_path3.join)(
+      const file = (0, import_path2.join)(
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
@@ -1265,7 +1270,7 @@ var transformTsxPlugin = ({
   const plug = {
     name: "transform-tsx",
     async transform(code, id) {
-      const extName = import_path4.default.extname(id);
+      const extName = import_path3.default.extname(id);
       if (extName.startsWith(".tsx") || extName.startsWith(".ts")) {
         const result = await (0, import_esbuild.transform)(code, { loader: "tsx" });
         return {
@@ -1417,7 +1422,7 @@ var createDevServer = async (configManager, database, searchIndex, apiURL, noWat
 
 // src/next/codegen/index.ts
 var import_fs_extra4 = __toESM(require("fs-extra"));
-var import_path5 = __toESM(require("path"));
+var import_path4 = __toESM(require("path"));
 var import_graphql6 = require("graphql");
 
 // src/next/codegen/codegen/index.ts
@@ -1663,11 +1668,11 @@ var Codegen = class {
     this.noClientBuildCache = noClientBuildCache;
   }
   async writeConfigFile(fileName, data) {
-    const filePath = import_path5.default.join(this.configManager.generatedFolderPath, fileName);
+    const filePath = import_path4.default.join(this.configManager.generatedFolderPath, fileName);
     await import_fs_extra4.default.ensureFile(filePath);
     await import_fs_extra4.default.outputFile(filePath, data);
     if (this.configManager.hasSeparateContentRoot()) {
-      const filePath2 = import_path5.default.join(
+      const filePath2 = import_path4.default.join(
         this.configManager.generatedFolderPathContentRepo,
         fileName
       );
@@ -2204,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({
@@ -2319,14 +2324,14 @@ var DevCommand = class extends BaseCommand {
             graphql: graphqlSchemaObject
           });
           import_fs_extra6.default.writeFileSync(
-            import_path6.default.join(configManager.tinaFolderPath, tinaLockFilename),
+            import_path5.default.join(configManager.tinaFolderPath, tinaLockFilename),
             tinaLockContent
           );
           if (configManager.hasSeparateContentRoot()) {
             const rootPath = await configManager.getTinaFolderPath(
               configManager.contentRootPath
             );
-            const filePath = import_path6.default.join(rootPath, tinaLockFilename);
+            const filePath = import_path5.default.join(rootPath, tinaLockFilename);
             await import_fs_extra6.default.ensureFile(filePath);
             await import_fs_extra6.default.outputFile(filePath, tinaLockContent);
           }
@@ -2473,7 +2478,7 @@ ${dangerText(e.message)}
   watchContentFiles(configManager, database, searchIndexer) {
     const collectionContentFiles = [];
     configManager.config.schema.collections.forEach((collection) => {
-      const collectionGlob = `${import_path6.default.join(
+      const collectionGlob = `${import_path5.default.join(
         configManager.contentRootPath,
         collection.path
       )}/**/*.${collection.format || "md"}`;
@@ -2532,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
@@ -2834,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(
@@ -3143,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({
@@ -3211,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");
@@ -6012,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 ({

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/next/vite/index.d.ts

@@ -1,6 +1,6 @@
-import { BuildOptions, InlineConfig, Plugin } from 'vite';
-import { Database } from '@tinacms/graphql';
-import { ConfigManager } from '../config-manager';
+import type { Database } from '@tinacms/graphql';
+import { type BuildOptions, type InlineConfig, type Plugin } from 'vite';
+import type { ConfigManager } from '../config-manager';
 /**
  * This type is duplicated in he `TinaMediaStore`
  * It represents the files that are available at build time

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": "0.0.0-c5dad82-20241009225242",
+  "version": "0.0.0-c72bb45-20241118014046",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -26,9 +26,8 @@
     "@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": "^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,22 +35,23 @@
     "@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": "0.0.0-c5dad82-20241009225242"
+    "@tinacms/scripts": "0.0.0-c72bb45-20241118014046"
   },
   "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",
     "@tailwindcss/typography": "^0.5.15",
     "@vitejs/plugin-react": "3.1.0",
     "altair-express-middleware": "^7.3.6",
@@ -78,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": "^0.32.11",
+    "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/app": "0.0.0-c5dad82-20241009225242",
-    "@tinacms/metrics": "1.0.7",
-    "@tinacms/graphql": "0.0.0-c5dad82-20241009225242",
-    "@tinacms/schema-tools": "1.6.5",
-    "@tinacms/search": "0.0.0-c5dad82-20241009225242",
-    "tinacms": "0.0.0-c5dad82-20241009225242"
+    "@tinacms/app": "0.0.0-c72bb45-20241118014046",
+    "@tinacms/schema-tools": "0.0.0-c72bb45-20241118014046",
+    "@tinacms/search": "0.0.0-c72bb45-20241118014046",
+    "tinacms": "0.0.0-c72bb45-20241118014046",
+    "@tinacms/graphql": "0.0.0-c72bb45-20241118014046",
+    "@tinacms/metrics": "0.0.0-c72bb45-20241118014046"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -98,6 +98,9 @@
     "url": "https://github.com/tinacms/tinacms.git",
     "directory": "packages/@tinacms/cli"
   },
+  "overrides": {
+    "dompurify": "2.5.7"
+  },
   "scripts": {
     "build": "tinacms-scripts build",
     "test": "jest --passWithNoTests",