@tinacms/cli 0.0.0-de1bef5-20250124020627 → 0.0.0-df15737-20250329200825

package/dist/cmds/forestry-migrate/util/index.d.ts

@@ -150,7 +150,7 @@ export declare const parseSections: ({ val }: {
 }) => {
     sections?: {
         exclude?: string;
-        type?: "heading" | "document" | "directory" | "jekyll-pages" | "jekyll-posts";
+        type?: "document" | "heading" | "directory" | "jekyll-pages" | "jekyll-posts";
         match?: string;
         path?: string;
         templates?: string[];

package/dist/index.d.ts

@@ -1,4 +1 @@
-import { Cli } from 'clipanion';
-export type { Schema, TinaSchema, Collection, TinaTemplate, } from '@tinacms/graphql';
-declare const cli: Cli<import("clipanion").BaseContext>;
-export default cli;
+export * from "../src/index"

package/dist/index.js

@@ -27,17 +27,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default
+var index_exports = {};
+__export(index_exports, {
+  default: () => index_default
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.8.1";
+var version = "1.9.4";
 
 // src/next/commands/dev-command/index.ts
+var import_async_lock = __toESM(require("async-lock"));
 var import_clipanion2 = require("clipanion");
 var import_fs_extra6 = __toESM(require("fs-extra"));
 var import_path5 = __toESM(require("path"));
@@ -1181,7 +1182,7 @@ var MediaModel = class {
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
-        args.searchPath
+        decodeURIComponent(args.searchPath)
       );
       const searchPath = parseMediaFolder(args.searchPath);
       if (!await import_fs_extra3.default.pathExists(folderPath)) {
@@ -1253,7 +1254,7 @@ var MediaModel = class {
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
-        args.searchPath
+        decodeURIComponent(args.searchPath)
       );
       await import_fs_extra3.default.stat(file);
       await import_fs_extra3.default.remove(file);
@@ -1329,7 +1330,8 @@ var devServerEndPointsPlugin = ({
   configManager,
   apiURL,
   database,
-  searchIndex
+  searchIndex,
+  databaseLock
 }) => {
   const plug = {
     name: "graphql-endpoints",
@@ -1373,14 +1375,17 @@ var devServerEndPointsPlugin = ({
         }
         if (req.url === "/graphql") {
           const { query, variables } = req.body;
-          const result = await (0, import_graphql.resolve)({
-            config: {
-              useRelativeMedia: true
-            },
-            database,
-            query,
-            variables,
-            verbose: false
+          let result;
+          await databaseLock(async () => {
+            result = await (0, import_graphql.resolve)({
+              config: {
+                useRelativeMedia: true
+              },
+              database,
+              query,
+              variables,
+              verbose: false
+            });
           });
           res.end(JSON.stringify(result));
           return;
@@ -1439,10 +1444,16 @@ function viteTransformExtension({
 }
 
 // src/next/commands/dev-command/server/index.ts
-var createDevServer = async (configManager, database, searchIndex, apiURL, noWatch) => {
+var createDevServer = async (configManager, database, searchIndex, apiURL, noWatch, databaseLock) => {
   const plugins = [
     transformTsxPlugin({ configManager }),
-    devServerEndPointsPlugin({ apiURL, configManager, database, searchIndex }),
+    devServerEndPointsPlugin({
+      apiURL,
+      configManager,
+      database,
+      searchIndex,
+      databaseLock
+    }),
     viteTransformExtension()
   ];
   return (0, import_vite3.createServer)(
@@ -1728,7 +1739,10 @@ var Codegen = class {
     this.noClientBuildCache = noClientBuildCache;
   }
   async writeConfigFile(fileName, data) {
-    const filePath = import_path4.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()) {
@@ -2192,7 +2206,9 @@ var BaseCommand = class extends import_clipanion.Command {
     let subProc;
     if (this.subCommand) {
       subProc = await startSubprocess2({ command: this.subCommand });
-      logger.info(`Starting subprocess: ${import_chalk4.default.cyan(this.subCommand)}`);
+      logger.info(
+        `Running web application with command: ${import_chalk4.default.cyan(this.subCommand)}`
+      );
     }
     function exitHandler(options, exitCode) {
       if (subProc) {
@@ -2326,6 +2342,10 @@ var DevCommand = class extends BaseCommand {
     this.outputSearchIndexPath = import_clipanion2.Option.String("--outputSearchIndexPath", {
       description: "Path to write the search index to"
     });
+    this.noServer = import_clipanion2.Option.Boolean("--no-server", false, {
+      description: "Do not start the dev server"
+    });
+    this.indexingLock = new import_async_lock.default();
   }
   async catch(error) {
     logger.error("Error occured during tinacms dev");
@@ -2346,10 +2366,13 @@ var DevCommand = class extends BaseCommand {
       rootPath: this.rootPath,
       legacyNoSDK: this.noSDK
     });
-    logger.info("Starting Tina Dev Server");
+    logger.info("\u{1F999} TinaCMS Dev Server is initializing...");
     this.logDeprecationWarnings();
     createDBServer(Number(this.datalayerPort));
     let database = null;
+    const dbLock = async (fn) => {
+      return this.indexingLock.acquire("Key", fn);
+    };
     const setup = async ({ firstTime }) => {
       try {
         await configManager.processConfig();
@@ -2410,7 +2433,11 @@ var DevCommand = class extends BaseCommand {
           logger.error("Re-index complete");
         }
         if (!this.noWatch) {
-          this.watchQueries(configManager, async () => await codegen2.execute());
+          this.watchQueries(
+            configManager,
+            dbLock,
+            async () => await codegen2.execute()
+          );
         }
         return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
       } catch (e) {
@@ -2446,14 +2473,6 @@ ${dangerText(e.message)}
       tokenSplitRegex: (_d = (_c = configManager.config.search) == null ? void 0 : _c.tina) == null ? void 0 : _d.tokenSplitRegex
     });
     await searchIndexClient.onStartIndexing();
-    const server = await createDevServer(
-      configManager,
-      database,
-      searchIndexClient.searchIndex,
-      apiURL,
-      this.noWatch
-    );
-    await server.listen(Number(this.port));
     const searchIndexer = new import_search.SearchIndexer({
       batchSize: ((_e = configManager.config.search) == null ? void 0 : _e.indexBatchSize) || 100,
       bridge: new import_graphql10.FilesystemBridge(
@@ -2475,16 +2494,34 @@ ${dangerText(e.message)}
         await searchIndexClient.export(this.outputSearchIndexPath);
       }
     }
+    if (this.noServer) {
+      logger.info("--no-server option specified - Dev server not started");
+      process.exit(0);
+    }
     if (!this.noWatch) {
       this.watchContentFiles(
         configManager,
         database,
+        dbLock,
         configManager.config.search && searchIndexer
       );
+    }
+    const server = await createDevServer(
+      configManager,
+      database,
+      searchIndexClient.searchIndex,
+      apiURL,
+      this.noWatch,
+      dbLock
+    );
+    await server.listen(Number(this.port));
+    if (!this.noWatch) {
       import_chokidar.default.watch(configManager.watchList).on("change", async () => {
-        logger.info(`Tina config change detected, rebuilding`);
-        await setup({ firstTime: false });
-        server.ws.send({ type: "full-reload", path: "*" });
+        await dbLock(async () => {
+          logger.info(`Tina config change detected, rebuilding`);
+          await setup({ firstTime: false });
+          server.ws.send({ type: "full-reload", path: "*" });
+        });
       });
     }
     const subItems = [];
@@ -2497,7 +2534,7 @@ ${dangerText(e.message)}
     const summaryItems = [
       {
         emoji: "\u{1F999}",
-        heading: "Tina Config",
+        heading: "TinaCMS URLs",
         subItems: [
           {
             key: "CMS",
@@ -2532,7 +2569,7 @@ ${dangerText(e.message)}
       });
     }
     summary({
-      heading: "Tina Dev Server is running...",
+      heading: "\u2705 \u{1F999} TinaCMS Dev Server is active:",
       items: [
         ...summaryItems
         // {
@@ -2553,7 +2590,7 @@ ${dangerText(e.message)}
     });
     await this.startSubCommand();
   }
-  watchContentFiles(configManager, database, searchIndexer) {
+  watchContentFiles(configManager, database, databaseLock, searchIndexer) {
     const collectionContentFiles = [];
     configManager.config.schema.collections.forEach((collection) => {
       const collectionGlob = `${import_path5.default.join(
@@ -2569,39 +2606,42 @@ ${dangerText(e.message)}
       if (!ready) {
         return;
       }
-      const pathFromRoot = configManager.printContentRelativePath(addedFile);
-      await database.indexContentByPaths([pathFromRoot]).catch(console.error);
-      if (searchIndexer) {
-        await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
-      }
+      await databaseLock(async () => {
+        const pathFromRoot = configManager.printContentRelativePath(addedFile);
+        await database.indexContentByPaths([pathFromRoot]).catch(console.error);
+        if (searchIndexer) {
+          await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
+        }
+      });
     }).on("change", async (changedFile) => {
       const pathFromRoot = configManager.printContentRelativePath(changedFile);
-      await database.indexContentByPaths([pathFromRoot]).catch(console.error);
-      if (searchIndexer) {
-        await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
-      }
+      await databaseLock(async () => {
+        await database.indexContentByPaths([pathFromRoot]).catch(console.error);
+        if (searchIndexer) {
+          await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
+        }
+      });
     }).on("unlink", async (removedFile) => {
       const pathFromRoot = configManager.printContentRelativePath(removedFile);
-      await database.deleteContentByPaths([pathFromRoot]).catch(console.error);
-      if (searchIndexer) {
-        await searchIndexer.deleteIndexContent([pathFromRoot]).catch(console.error);
-      }
+      await databaseLock(async () => {
+        await database.deleteContentByPaths([pathFromRoot]).catch(console.error);
+        if (searchIndexer) {
+          await searchIndexer.deleteIndexContent([pathFromRoot]).catch(console.error);
+        }
+      });
     });
   }
-  watchQueries(configManager, callback) {
-    let ready = false;
-    import_chokidar.default.watch(configManager.userQueriesAndFragmentsGlob).on("ready", () => {
-      ready = true;
-    }).on("add", async (addedFile) => {
-      await callback();
-    }).on("change", async (changedFile) => {
-      await callback();
-    }).on("unlink", async (removedFile) => {
-      await callback();
-    });
+  watchQueries(configManager, databaseLock, callback) {
+    const executeCallback = async (_) => {
+      await databaseLock(async () => {
+        await callback();
+      });
+    };
+    import_chokidar.default.watch(configManager.userQueriesAndFragmentsGlob).on("add", executeCallback).on("change", executeCallback).on("unlink", executeCallback);
   }
 };
 DevCommand.paths = [["dev"], ["server:start"]];
+// Prevent indexes and reads occurring at once
 DevCommand.usage = import_clipanion2.Command.Usage({
   category: `Commands`,
   description: `Builds Tina and starts the dev server`,
@@ -2899,7 +2939,8 @@ ${dangerText(e.message)}
         database,
         null,
         apiURL,
-        true
+        true,
+        (lockedFn) => lockedFn()
       );
       await server.listen(Number(this.port));
       console.log("server listening on port", this.port);
@@ -2961,7 +3002,9 @@ ${dangerText(e.message)}
               `ERROR: Branch not configured in tina search configuration.`
             )}`
           );
-          throw new Error("Branch not configured in tina search configuration.");
+          throw new Error(
+            "Branch not configured in tina search configuration."
+          );
         }
         if (!((_d = configManager.config) == null ? void 0 : _d.clientId)) {
           logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
@@ -3104,7 +3147,10 @@ ${dangerText(e.message)}
       });
       throw e;
     }
-    const branchBar = new import_progress2.default("Checking branch is on Tina Cloud. :prog", 1);
+    const branchBar = new import_progress2.default(
+      "Checking branch is on Tina Cloud. :prog",
+      1
+    );
     if (branchKnown) {
       branchBar.tick({
         prog: "\u2705"
@@ -3228,7 +3274,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_core3.diff)(localGraphqlSchema, remoteGqlSchema);
+      const diffResult = await (0, import_core3.diff)(remoteGqlSchema, localGraphqlSchema);
       if (diffResult.length === 0) {
         bar2.tick({
           prog: "\u2705"
@@ -3285,7 +3331,9 @@ Additional info:
     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"));
+        logger.info(
+          logText("Not using Tina Cloud, skipping Tina Schema check")
+        );
       }
       return;
     }
@@ -4807,7 +4855,6 @@ var transformForestryFieldsToTinaFields = ({
             name: stringifyTemplateName(tem, tem)
           };
           if (t.name != tem) {
-            ;
             t.nameOverride = tem;
           }
           templates2.push(t);
@@ -5952,10 +5999,13 @@ var addSelfHostedTinaAuthToConfig = async (config2, configFile) => {
   const { configImports, configAuthProviderClass, extraTinaCollections } = config2.authProvider;
   const importMap = {
     // iterate over configImports and add them to the import map
-    ...configImports.reduce((acc, { from, imported }) => {
-      acc[from] = imported;
-      return acc;
-    }, {})
+    ...configImports.reduce(
+      (acc, { from, imported }) => {
+        acc[from] = imported;
+        return acc;
+      },
+      {}
+    )
   };
   const transformedSourceFileResult = import_typescript3.default.transform(
     sourceFile,
@@ -6410,6 +6460,13 @@ ${titleText(" TinaCMS ")} has been initialized!`));
     logger.info(
       "To get started run: " + cmdText(frameworkDevCmds[framework.name]({ packageManager }))
     );
+    if (framework.name === "hugo") {
+      logger.info(
+        focusText("Hugo is required. "),
+        "Don't have Hugo installed? Follow this guide to set it up: ",
+        linkText("https://gohugo.io/installation/")
+      );
+    }
     logger.info(
       "To get your site production ready, run: " + cmdText(`tinacms init backend`)
     );
@@ -6695,4 +6752,4 @@ cli.register(SearchIndexCommand);
 cli.register(import_clipanion8.Builtins.DefinitionsCommand);
 cli.register(import_clipanion8.Builtins.HelpCommand);
 cli.register(import_clipanion8.Builtins.VersionCommand);
-var src_default = cli;
+var index_default = cli;

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

@@ -1,3 +1,4 @@
+import AsyncLock from 'async-lock';
 import { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../config-manager';
 import { BaseCommand } from '../baseCommands';
@@ -7,10 +8,12 @@ export declare class DevCommand extends BaseCommand {
     watchFolders: string;
     noWatch: boolean;
     outputSearchIndexPath: string;
+    noServer: boolean;
+    indexingLock: AsyncLock;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
     logDeprecationWarnings(): void;
     execute(): Promise<number | void>;
-    watchContentFiles(configManager: ConfigManager, database: Database, searchIndexer?: SearchIndexer): void;
-    watchQueries(configManager: ConfigManager, callback: () => Promise<string>): void;
+    watchContentFiles(configManager: ConfigManager, database: Database, databaseLock: (fn: () => Promise<void>) => Promise<void>, searchIndexer?: SearchIndexer): void;
+    watchQueries(configManager: ConfigManager, databaseLock: (fn: () => Promise<void>) => Promise<void>, callback: () => Promise<string>): void;
 }

package/dist/next/commands/dev-command/server/index.d.ts

@@ -1,3 +1,3 @@
 import type { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../../config-manager';
-export declare const createDevServer: (configManager: ConfigManager, database: Database, searchIndex: any, apiURL: string, noWatch: boolean) => Promise<import("vite").ViteDevServer>;
+export declare const createDevServer: (configManager: ConfigManager, database: Database, searchIndex: any, apiURL: string, noWatch: boolean, databaseLock: (fn: () => Promise<void>) => Promise<void>) => Promise<import("vite").ViteDevServer>;

package/dist/next/vite/plugins.d.ts

@@ -7,11 +7,12 @@ import type { ConfigManager } from '../config-manager';
 export declare const transformTsxPlugin: ({ configManager: _configManager, }: {
     configManager: ConfigManager;
 }) => Plugin;
-export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, searchIndex, }: {
+export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, searchIndex, databaseLock, }: {
     apiURL: string;
     database: Database;
     configManager: ConfigManager;
     searchIndex: any;
+    databaseLock: (fn: () => Promise<void>) => Promise<void>;
 }) => Plugin;
 export interface ViteSvgrOptions {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.0.0-de1bef5-20250124020627",
+  "version": "0.0.0-df15737-20250329200825",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -20,6 +20,10 @@
       }
     ]
   },
+  "peerDependencies": {
+    "react": ">=18.3.1 <20.0.0",
+    "react-dom": ">=18.3.1 <20.0.0"
+  },
   "devDependencies": {
     "@types/clear": "0.1.0",
     "@types/cli-spinner": "^0.2.3",
@@ -37,24 +41,25 @@
     "@types/prompts": "^2.4.9",
     "@types/yup": "^0.32.0",
     "jest": "^29.7.0",
-    "@tinacms/scripts": "1.3.1"
+    "@tinacms/scripts": "1.3.3"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.6.8",
     "@graphql-codegen/plugin-helpers": "latest",
-    "@graphql-codegen/typescript": "^4.1.1",
-    "@graphql-codegen/typescript-operations": "^4.3.1",
+    "@graphql-codegen/typescript": "^4.1.3",
+    "@graphql-codegen/typescript-operations": "^4.4.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.3",
+    "@rollup/pluginutils": "^5.1.4",
     "@svgr/core": "8.1.0",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/typography": "^0.5.16",
     "@vitejs/plugin-react": "3.1.0",
     "altair-express-middleware": "^7.3.6",
+    "async-lock": "^1.4.1",
     "auto-bind": "^4.0.0",
     "body-parser": "^1.20.3",
     "busboy": "^1.6.0",
@@ -64,9 +69,9 @@
     "clipanion": "^3.2.1",
     "cors": "^2.8.5",
     "crypto-js": "^4.2.0",
-    "dotenv": "^16.4.5",
-    "esbuild": "^0.24.0",
-    "fs-extra": "^11.2.0",
+    "dotenv": "^16.4.7",
+    "esbuild": "^0.24.2",
+    "fs-extra": "^11.3.0",
     "graphql": "15.8.0",
     "js-yaml": "^4.1.0",
     "log4js": "^6.9.1",
@@ -77,19 +82,19 @@
     "prettier": "^2.8.8",
     "progress": "^2.0.3",
     "prompts": "^2.4.2",
-    "readable-stream": "^4.5.2",
-    "tailwindcss": "^3.4.15",
+    "readable-stream": "^4.7.0",
+    "tailwindcss": "^3.4.17",
     "typanion": "3.13.0",
-    "typescript": "^5.6.3",
-    "vite": "^4.5.5",
-    "yup": "^1.4.0",
-    "zod": "^3.23.8",
-    "@tinacms/app": "0.0.0-de1bef5-20250124020627",
-    "@tinacms/metrics": "1.0.8",
-    "@tinacms/schema-tools": "1.7.0",
-    "@tinacms/graphql": "1.5.10",
-    "@tinacms/search": "1.0.37",
-    "tinacms": "0.0.0-de1bef5-20250124020627"
+    "typescript": "^5.7.3",
+    "vite": "^4.5.9",
+    "yup": "^1.6.1",
+    "zod": "^3.24.2",
+    "@tinacms/app": "0.0.0-df15737-20250329200825",
+    "@tinacms/metrics": "1.0.9",
+    "@tinacms/graphql": "0.0.0-df15737-20250329200825",
+    "@tinacms/schema-tools": "1.7.2",
+    "tinacms": "0.0.0-df15737-20250329200825",
+    "@tinacms/search": "0.0.0-df15737-20250329200825"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"