@tinacms/cli 1.10.3 → 1.12.0

package/README.md

@@ -1,4 +1,4 @@
-The _TinaCloud CLI_ can be used to set up your project with TinaCloud configuration, and run a local version of the TinaCloud content-api (using your file system's content). For a real-world example of how this is being used checkout the [TinaCloud Starter](https://github.com/tinacms/tina-cloud-starter).
+The _TinaCloud CLI_ can be used to set up your project with TinaCloud configuration, and run a local version of the TinaCloud content-api (using your file system's content). For a real-world example of how this is being used checkout the [TinaCloud Starter](https://github.com/tinacms/tina-nextjs-starter).
 
 ## Installation
 
@@ -24,7 +24,7 @@ Usage: @tinacms/cli command [options]
 Options:
   -V, --version             output the version number
   -h, --help                display help for command
-  -v, --verbose             increase verbosity of console output   
+  -v, --verbose             increase verbosity of console output
 
 Commands:
   server:start [options]    Start Filesystem Graphql Server
@@ -137,7 +137,7 @@ The top-level key in the schema is an array of _collections_, a `collection` inf
 
 ### `templates`
 
-Templates are responsible for defining the shape of your content, you'll see in the schema for [the starter](https://github.com/tinacms/tina-cloud-starter) that we use `templates` for `collections` as well as `blocks`. One important thing to note is that since a `collection` can have multiple `templates`, each file in your collection must store a `_template` key in it's frontmatter:
+Templates are responsible for defining the shape of your content, you'll see in the schema for [the starter](https://github.com/tinacms/tina-nextjs-starter) that we use `templates` for `collections` as well as `blocks`. One important thing to note is that since a `collection` can have multiple `templates`, each file in your collection must store a `_template` key in it's frontmatter:
 
 ```markdown
 ---
@@ -151,7 +151,7 @@ When you use Tina's GraphQL forms, we know about all of the relationships in you
 
 ### `fields`
 
-For the most part, you can think of `fields` as the backend equivalent to [Tina field plugins](https://tina.io/docs/plugins/fields/). You might notice that we're defining a `type` on each field, rather than a `component`. This is because the backend isn't concerned with `component`s, only the shape of your content. By default we use the built-in Tina fields, to customize your `component` read the [field customization](https://tina.io/docs/tina-cloud/client/#field-customization) instructions.
+For the most part, you can think of `fields` as the backend equivalent to [Tina field plugins](https://tina.io/docs/plugins/fields/). You might notice that we're defining a `type` on each field, rather than a `component`. This is because the backend isn't concerned with `component`s, only the shape of your content. By default we use the built-in Tina fields, to customize your `component` read the [field customization](https://tina.io/docs/tinacloud/client/#field-customization) instructions.
 
 #### `reference` & `reference-list`
 
@@ -229,7 +229,7 @@ getPostsDocument(relativePath: "voteForPedro.md") {
 }
 ```
 
-To learn how to work with this data on a Tina-enabled site, check out the [client documentation](https://tina.io/docs/tina-cloud/client/)
+To learn how to work with this data on a Tina-enabled site, check out the [client documentation](https://tina.io/docs/tinacloud/client/)
 
 > This API is currently somewhat limited. Specifically there's no support for filtering and sorting "list" queries. We have plans to tackle that in upcoming cycles
 

package/dist/cmds/init/prompts/index.d.ts

@@ -8,7 +8,7 @@ export * from './databaseAdapter';
 export * from './authProvider';
 export declare const askCommonSetUp: () => Promise<{
     framework: Framework;
-    packageManager: "pnpm" | "yarn" | "npm";
+    packageManager: "pnpm" | "yarn" | "npm" | "bun";
 }>;
 export declare const askForestryMigrate: ({ framework, env, }: {
     framework: Framework;

package/dist/cmds/init/prompts/types.d.ts

@@ -4,7 +4,7 @@ export type Config = {
     typescript: boolean;
     publicFolder?: string;
     framework: Framework;
-    packageManager: 'pnpm' | 'yarn' | 'npm';
+    packageManager: 'pnpm' | 'yarn' | 'npm' | 'bun';
     forestryMigrate: boolean;
     frontMatterFormat?: ContentFrontmatterFormat;
     hosting?: 'tina-cloud' | 'self-host';

package/dist/index.js

@@ -35,10 +35,10 @@ module.exports = __toCommonJS(index_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.10.3";
+var version = "1.12.0";
 
 // src/next/commands/dev-command/index.ts
-var import_path5 = __toESM(require("path"));
+var import_path7 = __toESM(require("path"));
 var import_graphql10 = require("@tinacms/graphql");
 var import_search = require("@tinacms/search");
 var import_async_lock = __toESM(require("async-lock"));
@@ -601,7 +601,7 @@ var Codegen = class {
       throw new Error(
         `Client not configured properly. Missing ${missing.join(
           ", "
-        )}. Please visit https://tina.io/docs/tina-cloud/overview for more information`
+        )}. Please visit https://tina.io/docs/r/what-is-tinacloud for more information`
       );
     }
     let localUrl = `http://localhost:${this.port}/graphql`;
@@ -775,12 +775,25 @@ var unlinkIfExists = async (filepath) => {
 
 // src/next/config-manager.ts
 var import_fs_extra2 = __toESM(require("fs-extra"));
-var import_path2 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var import_os = __toESM(require("os"));
 var esbuild = __toESM(require("esbuild"));
 var dotenv = __toESM(require("dotenv"));
 var import_normalize_path2 = __toESM(require("normalize-path"));
 var import_chalk3 = __toESM(require("chalk"));
+
+// src/utils/path.ts
+var import_path2 = __toESM(require("path"));
+function stripNativeTrailingSlash(p) {
+  const { root } = import_path2.default.parse(p);
+  let str = p;
+  while (str.length > root.length && str.endsWith(import_path2.default.sep)) {
+    str = str.slice(0, -1);
+  }
+  return str;
+}
+
+// src/next/config-manager.ts
 var TINA_FOLDER = "tina";
 var LEGACY_TINA_FOLDER = ".tina";
 var GENERATED_FOLDER = "__generated__";
@@ -799,7 +812,7 @@ var ConfigManager = class {
     this.legacyNoSDK = legacyNoSDK;
   }
   isUsingTs() {
-    return [".ts", ".tsx"].includes(import_path2.default.extname(this.tinaConfigFilePath));
+    return [".ts", ".tsx"].includes(import_path3.default.extname(this.tinaConfigFilePath));
   }
   hasSelfHostedConfig() {
     return !!this.selfHostedDatabaseFilePath;
@@ -815,12 +828,12 @@ var ConfigManager = class {
   }
   async processConfig() {
     this.tinaFolderPath = await this.getTinaFolderPath(this.rootPath);
-    this.envFilePath = import_path2.default.resolve(
-      import_path2.default.join(this.tinaFolderPath, "..", ".env")
+    this.envFilePath = import_path3.default.resolve(
+      import_path3.default.join(this.tinaFolderPath, "..", ".env")
     );
     dotenv.config({ path: this.envFilePath });
     this.tinaConfigFilePath = await this.getPathWithExtension(
-      import_path2.default.join(this.tinaFolderPath, "config")
+      import_path3.default.join(this.tinaFolderPath, "config")
     );
     if (!this.tinaConfigFilePath) {
       throw new Error(
@@ -828,79 +841,79 @@ var ConfigManager = class {
       );
     }
     this.selfHostedDatabaseFilePath = await this.getPathWithExtension(
-      import_path2.default.join(this.tinaFolderPath, "database")
+      import_path3.default.join(this.tinaFolderPath, "database")
     );
-    this.generatedFolderPath = import_path2.default.join(this.tinaFolderPath, GENERATED_FOLDER);
-    this.generatedCachePath = import_path2.default.join(
+    this.generatedFolderPath = import_path3.default.join(this.tinaFolderPath, GENERATED_FOLDER);
+    this.generatedCachePath = import_path3.default.join(
       this.generatedFolderPath,
       ".cache",
       String((/* @__PURE__ */ new Date()).getTime())
     );
-    this.generatedGraphQLGQLPath = import_path2.default.join(
+    this.generatedGraphQLGQLPath = import_path3.default.join(
       this.generatedFolderPath,
       GRAPHQL_GQL_FILE
     );
-    this.generatedGraphQLJSONPath = import_path2.default.join(
+    this.generatedGraphQLJSONPath = import_path3.default.join(
       this.generatedFolderPath,
       GRAPHQL_JSON_FILE
     );
-    this.generatedSchemaJSONPath = import_path2.default.join(
+    this.generatedSchemaJSONPath = import_path3.default.join(
       this.generatedFolderPath,
       SCHEMA_JSON_FILE
     );
-    this.generatedLookupJSONPath = import_path2.default.join(
+    this.generatedLookupJSONPath = import_path3.default.join(
       this.generatedFolderPath,
       LOOKUP_JSON_FILE
     );
-    this.generatedQueriesFilePath = import_path2.default.join(
+    this.generatedQueriesFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "queries.gql"
     );
-    this.generatedFragmentsFilePath = import_path2.default.join(
+    this.generatedFragmentsFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "frags.gql"
     );
-    this.generatedTypesTSFilePath = import_path2.default.join(
+    this.generatedTypesTSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "types.ts"
     );
-    this.generatedTypesJSFilePath = import_path2.default.join(
+    this.generatedTypesJSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "types.js"
     );
-    this.generatedTypesDFilePath = import_path2.default.join(
+    this.generatedTypesDFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "types.d.ts"
     );
-    this.userQueriesAndFragmentsGlob = import_path2.default.join(
+    this.userQueriesAndFragmentsGlob = import_path3.default.join(
       this.tinaFolderPath,
       "queries/**/*.{graphql,gql}"
     );
-    this.generatedQueriesAndFragmentsGlob = import_path2.default.join(
+    this.generatedQueriesAndFragmentsGlob = import_path3.default.join(
       this.generatedFolderPath,
       "*.{graphql,gql}"
     );
-    this.generatedClientTSFilePath = import_path2.default.join(
+    this.generatedClientTSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "client.ts"
     );
-    this.generatedClientJSFilePath = import_path2.default.join(
+    this.generatedClientJSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "client.js"
     );
-    this.generatedClientDFilePath = import_path2.default.join(
+    this.generatedClientDFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "client.d.ts"
     );
-    this.generatedDatabaseClientDFilePath = import_path2.default.join(
+    this.generatedDatabaseClientDFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "databaseClient.d.ts"
     );
-    this.generatedDatabaseClientTSFilePath = import_path2.default.join(
+    this.generatedDatabaseClientTSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "databaseClient.ts"
     );
-    this.generatedDatabaseClientJSFilePath = import_path2.default.join(
+    this.generatedDatabaseClientJSFilePath = import_path3.default.join(
       this.generatedFolderPath,
       "databaseClient.js"
     );
@@ -920,19 +933,18 @@ var ConfigManager = class {
     this.watchList = watchList;
     this.config = config2;
     this.prebuildFilePath = prebuildPath;
-    this.publicFolderPath = import_path2.default.join(
+    this.publicFolderPath = import_path3.default.join(
       this.rootPath,
       this.config.build.publicFolder
     );
-    this.outputFolderPath = import_path2.default.join(
+    this.outputFolderPath = import_path3.default.join(
       this.publicFolderPath,
       this.config.build.outputFolder
     );
-    this.outputHTMLFilePath = import_path2.default.join(this.outputFolderPath, "index.html");
-    this.outputGitignorePath = import_path2.default.join(this.outputFolderPath, ".gitignore");
-    const fullLocalContentPath = import_path2.default.join(
-      this.tinaFolderPath,
-      this.config.localContentPath || ""
+    this.outputHTMLFilePath = import_path3.default.join(this.outputFolderPath, "index.html");
+    this.outputGitignorePath = import_path3.default.join(this.outputFolderPath, ".gitignore");
+    const fullLocalContentPath = stripNativeTrailingSlash(
+      import_path3.default.join(this.tinaFolderPath, this.config.localContentPath || "")
     );
     if (this.config.localContentPath) {
       const localContentPathExists = await import_fs_extra2.default.pathExists(fullLocalContentPath);
@@ -952,21 +964,21 @@ var ConfigManager = class {
     if (!this.contentRootPath) {
       this.contentRootPath = this.rootPath;
     }
-    this.generatedFolderPathContentRepo = import_path2.default.join(
+    this.generatedFolderPathContentRepo = import_path3.default.join(
       await this.getTinaFolderPath(this.contentRootPath),
       GENERATED_FOLDER
     );
     this.spaMainPath = require.resolve("@tinacms/app");
-    this.spaRootPath = import_path2.default.join(this.spaMainPath, "..", "..");
+    this.spaRootPath = import_path3.default.join(this.spaMainPath, "..", "..");
   }
   async getTinaFolderPath(rootPath) {
-    const tinaFolderPath = import_path2.default.join(rootPath, TINA_FOLDER);
+    const tinaFolderPath = import_path3.default.join(rootPath, TINA_FOLDER);
     const tinaFolderExists = await import_fs_extra2.default.pathExists(tinaFolderPath);
     if (tinaFolderExists) {
       this.isUsingLegacyFolder = false;
       return tinaFolderPath;
     }
-    const legacyFolderPath = import_path2.default.join(rootPath, LEGACY_TINA_FOLDER);
+    const legacyFolderPath = import_path3.default.join(rootPath, LEGACY_TINA_FOLDER);
     const legacyFolderExists = await import_fs_extra2.default.pathExists(legacyFolderPath);
     if (legacyFolderExists) {
       this.isUsingLegacyFolder = true;
@@ -1042,8 +1054,8 @@ var ConfigManager = class {
     return result;
   }
   async loadDatabaseFile() {
-    const tmpdir = import_path2.default.join(import_os.default.tmpdir(), Date.now().toString());
-    const outfile = import_path2.default.join(tmpdir, "database.build.js");
+    const tmpdir = import_path3.default.join(import_os.default.tmpdir(), Date.now().toString());
+    const outfile = import_path3.default.join(tmpdir, "database.build.js");
     await esbuild.build({
       entryPoints: [this.selfHostedDatabaseFilePath],
       bundle: true,
@@ -1056,14 +1068,14 @@ var ConfigManager = class {
     return result.default;
   }
   async loadConfigFile(generatedFolderPath, configFilePath) {
-    const tmpdir = import_path2.default.join(import_os.default.tmpdir(), Date.now().toString());
-    const preBuildConfigPath = import_path2.default.join(
+    const tmpdir = import_path3.default.join(import_os.default.tmpdir(), Date.now().toString());
+    const preBuildConfigPath = import_path3.default.join(
       this.generatedFolderPath,
       "config.prebuild.jsx"
     );
-    const outfile = import_path2.default.join(tmpdir, "config.build.jsx");
-    const outfile2 = import_path2.default.join(tmpdir, "config.build.js");
-    const tempTSConfigFile = import_path2.default.join(tmpdir, "tsconfig.json");
+    const outfile = import_path3.default.join(tmpdir, "config.build.jsx");
+    const outfile2 = import_path3.default.join(tmpdir, "config.build.js");
+    const tempTSConfigFile = import_path3.default.join(tmpdir, "tsconfig.json");
     import_fs_extra2.default.outputFileSync(tempTSConfigFile, "{}");
     const result2 = await esbuild.build({
       entryPoints: [configFilePath],
@@ -1350,7 +1362,7 @@ var BaseCommand = class extends import_clipanion.Command {
             pathFilter
           });
           const tinaPathUpdates = modified.filter(
-            (path14) => path14.startsWith(".tina/__generated__/_schema.json") || path14.startsWith("tina/tina-lock.json")
+            (path15) => path15.startsWith(".tina/__generated__/_schema.json") || path15.startsWith("tina/tina-lock.json")
           );
           if (tinaPathUpdates.length > 0) {
             res = await database.indexContent({
@@ -1428,7 +1440,7 @@ var errorHTML = `<style type="text/css">
   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.
+  Please visit <a href="https://tina.io/docs/r/FAQ/#13-how-do-i-resolve-failed-loading-tinacms-assets-error">this doc</a> for help.
 </p>
 </div>
 </div>`.trim().replace(/[\r\n\s]+/g, " ");
@@ -1681,6 +1693,9 @@ var tinaTailwind = (spaPath, prebuildFilePath) => {
                 500: "#EC4815",
                 600: "#DC4419"
               },
+              "tina-orange": "#EC4815",
+              "tina-orange-dark": "#C2410C",
+              "tina-orange-light": "#FFF7ED",
               background: "#FFFFFF",
               foreground: "#0A0A0A",
               muted: "#F5F5F5",
@@ -1942,17 +1957,17 @@ var import_pluginutils = require("@rollup/pluginutils");
 var import_fs = __toESM(require("fs"));
 var import_vite2 = require("vite");
 var import_esbuild2 = require("esbuild");
-var import_path4 = __toESM(require("path"));
+var import_path6 = __toESM(require("path"));
 var import_body_parser = __toESM(require("body-parser"));
 var import_cors = __toESM(require("cors"));
 var import_graphql9 = require("@tinacms/graphql");
 
 // src/next/commands/dev-command/server/media.ts
 var import_fs_extra5 = __toESM(require("fs-extra"));
-var import_path3 = __toESM(require("path"));
+var import_path5 = __toESM(require("path"));
 var import_busboy = __toESM(require("busboy"));
 var createMediaRouter = (config2) => {
-  const mediaFolder = import_path3.default.join(
+  const mediaFolder = import_path5.default.join(
     config2.rootPath,
     config2.publicFolder,
     config2.mediaRoot
@@ -1979,8 +1994,8 @@ var createMediaRouter = (config2) => {
     const bb = (0, import_busboy.default)({ headers: req.headers });
     bb.on("file", async (_name, file, _info) => {
       const fullPath = decodeURI(req.url?.slice("/media/upload/".length));
-      const saveTo = import_path3.default.join(mediaFolder, ...fullPath.split("/"));
-      await import_fs_extra5.default.ensureDir(import_path3.default.dirname(saveTo));
+      const saveTo = import_path5.default.join(mediaFolder, ...fullPath.split("/"));
+      await import_fs_extra5.default.ensureDir(import_path5.default.dirname(saveTo));
       file.pipe(import_fs_extra5.default.createWriteStream(saveTo));
     });
     bb.on("error", (error) => {
@@ -2014,7 +2029,7 @@ var MediaModel = class {
   }
   async listMedia(args) {
     try {
-      const folderPath = (0, import_path3.join)(
+      const folderPath = (0, import_path5.join)(
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
@@ -2029,7 +2044,7 @@ var MediaModel = class {
       }
       const filesStr = await import_fs_extra5.default.readdir(folderPath);
       const filesProm = filesStr.map(async (file) => {
-        const filePath = (0, import_path3.join)(folderPath, file);
+        const filePath = (0, import_path5.join)(folderPath, file);
         const stat = await import_fs_extra5.default.stat(filePath);
         let src = `/${file}`;
         const isFile = stat.isFile();
@@ -2086,7 +2101,7 @@ var MediaModel = class {
   }
   async deleteMedia(args) {
     try {
-      const file = (0, import_path3.join)(
+      const file = (0, import_path5.join)(
         this.rootPath,
         this.publicFolder,
         this.mediaRoot,
@@ -2151,7 +2166,7 @@ var transformTsxPlugin = ({
   const plug = {
     name: "transform-tsx",
     async transform(code, id) {
-      const extName = import_path4.default.extname(id);
+      const extName = import_path6.default.extname(id);
       if (extName.startsWith(".tsx") || extName.startsWith(".ts")) {
         const result = await (0, import_esbuild2.transform)(code, { loader: "tsx" });
         return {
@@ -2415,14 +2430,14 @@ var DevCommand = class extends BaseCommand {
             graphql: graphqlSchemaObject
           });
           import_fs_extra6.default.writeFileSync(
-            import_path5.default.join(configManager.tinaFolderPath, tinaLockFilename),
+            import_path7.default.join(configManager.tinaFolderPath, tinaLockFilename),
             tinaLockContent
           );
           if (configManager.hasSeparateContentRoot()) {
             const rootPath = await configManager.getTinaFolderPath(
               configManager.contentRootPath
             );
-            const filePath = import_path5.default.join(rootPath, tinaLockFilename);
+            const filePath = import_path7.default.join(rootPath, tinaLockFilename);
             await import_fs_extra6.default.ensureFile(filePath);
             await import_fs_extra6.default.outputFile(filePath, tinaLockContent);
           }
@@ -2582,11 +2597,11 @@ ${dangerText(e.message)}
         //   subItems: [
         //     {
         //       key: 'Custom queries',
-        //       value: 'https://tina.io/querying',
+        //       value: 'https://tina.io/docs/r/content-api-overview',
         //     },
         //     {
         //       key: 'Visual editing',
-        //       value: 'https://tina.io/visual-editing',
+        //       value: 'https://tina.io/docs/r/visual-editing-setup',
         //     },
         //   ],
         // },
@@ -2597,7 +2612,7 @@ ${dangerText(e.message)}
   watchContentFiles(configManager, database, databaseLock, searchIndexer) {
     const collectionContentFiles = [];
     configManager.config.schema.collections.forEach((collection) => {
-      const collectionGlob = `${import_path5.default.join(
+      const collectionGlob = `${import_path7.default.join(
         configManager.contentRootPath,
         collection.path
       )}/**/*.${collection.format || "md"}`;
@@ -2647,7 +2662,7 @@ ${dangerText(e.message)}
 
 // src/next/commands/build-command/index.ts
 var import_crypto = __toESM(require("crypto"));
-var import_path6 = __toESM(require("path"));
+var import_path8 = __toESM(require("path"));
 var import_core3 = require("@graphql-inspector/core");
 var import_graphql11 = require("@tinacms/graphql");
 var import_schema_tools2 = require("@tinacms/schema-tools");
@@ -2662,7 +2677,7 @@ 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";
+      return "https://tina.io/docs/r/FAQ/#2-how-do-i-resolve-the-local-graphql-schema-doesnt-match-the-remote-graphql-schema-error";
     }
     default:
       return null;
@@ -3369,7 +3384,7 @@ Additional info: Branch: ${config2.branch}, Client ID: ${config2.clientId} `;
     }
     const localTinaSchema = JSON.parse(
       await database.bridge.get(
-        import_path6.default.join(database.tinaDirectory, "__generated__", "_schema.json")
+        import_path8.default.join(database.tinaDirectory, "__generated__", "_schema.json")
       )
     );
     localTinaSchema.version = void 0;
@@ -3424,12 +3439,12 @@ async function request(args) {
 Message from server: ${json.message}`;
     }
     throw new Error(
-      `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/r/FAQ/`
     );
   }
   if (json.errors) {
     throw new Error(
-      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/r/FAQ/
 
       Errors: 
 	${json.errors.map((error) => error.message).join("\n")}`
@@ -3740,25 +3755,25 @@ var import_clipanion6 = require("clipanion");
 
 // src/cmds/init/detectEnvironment.ts
 var import_fs_extra8 = __toESM(require("fs-extra"));
-var import_path7 = __toESM(require("path"));
+var import_path9 = __toESM(require("path"));
 var checkGitignoreForItem = async ({
   baseDir,
   line
 }) => {
-  const gitignoreContent = import_fs_extra8.default.readFileSync(import_path7.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = import_fs_extra8.default.readFileSync(import_path9.default.join(baseDir, ".gitignore")).toString();
   return gitignoreContent.split("\n").some((item) => item === line);
 };
 var makeGeneratedFile = async (name2, generatedFileType, parentPath, opts) => {
   const result = {
-    fullPathTS: import_path7.default.join(
+    fullPathTS: import_path9.default.join(
       parentPath,
       `${name2}.${opts?.typescriptSuffix || opts?.extensionOverride || "ts"}`
     ),
-    fullPathJS: import_path7.default.join(
+    fullPathJS: import_path9.default.join(
       parentPath,
       `${name2}.${opts?.extensionOverride || "js"}`
     ),
-    fullPathOverride: opts?.extensionOverride ? import_path7.default.join(parentPath, `${name2}.${opts?.extensionOverride}`) : "",
+    fullPathOverride: opts?.extensionOverride ? import_path9.default.join(parentPath, `${name2}.${opts?.extensionOverride}`) : "",
     generatedFileType,
     name: name2,
     parentPath,
@@ -3787,16 +3802,16 @@ var detectEnvironment = async ({
   debug = false
 }) => {
   const hasForestryConfig = await import_fs_extra8.default.pathExists(
-    import_path7.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+    import_path9.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
-  const sampleContentPath = import_path7.default.join(
+  const sampleContentPath = import_path9.default.join(
     baseDir,
     "content",
     "posts",
     "hello-world.md"
   );
-  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 usingSrc = import_fs_extra8.default.pathExistsSync(import_path9.default.join(baseDir, "src")) && (import_fs_extra8.default.pathExistsSync(import_path9.default.join(baseDir, "src", "app")) || import_fs_extra8.default.pathExistsSync(import_path9.default.join(baseDir, "src", "pages")));
+  const tinaFolder = import_path9.default.join(baseDir, "tina");
   const tinaConfigExists = Boolean(
     // Does the tina folder exist?
     await import_fs_extra8.default.pathExists(tinaFolder) && // Does the tina folder contain a config file?
@@ -3812,12 +3827,12 @@ var detectEnvironment = async ({
     "next-api-handler": await makeGeneratedFile(
       "[...routes]",
       "next-api-handler",
-      import_path7.default.join(...pagesDir, "api", "tina")
+      import_path9.default.join(...pagesDir, "api", "tina")
     ),
     "reactive-example": await makeGeneratedFile(
       "[filename]",
       "reactive-example",
-      import_path7.default.join(...pagesDir, "demo", "blog"),
+      import_path9.default.join(...pagesDir, "demo", "blog"),
       {
         typescriptSuffix: "tsx"
       }
@@ -3825,13 +3840,13 @@ var detectEnvironment = async ({
     "users-json": await makeGeneratedFile(
       "index",
       "users-json",
-      import_path7.default.join(baseDir, "content", "users"),
+      import_path9.default.join(baseDir, "content", "users"),
       { extensionOverride: "json" }
     ),
     "sample-content": await makeGeneratedFile(
       "hello-world",
       "sample-content",
-      import_path7.default.join(baseDir, "content", "posts"),
+      import_path9.default.join(baseDir, "content", "posts"),
       { extensionOverride: "md" }
     )
   };
@@ -3857,13 +3872,13 @@ var detectEnvironment = async ({
       );
     }
   }
-  const hasGitIgnore = await import_fs_extra8.default.pathExists(import_path7.default.join(".gitignore"));
+  const hasGitIgnore = await import_fs_extra8.default.pathExists(import_path9.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_path7.default.join(rootPath, "config.toml");
+    const hugoConfigPath = import_path9.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 = hugoConfig.toString().match(/metaDataFormat = "(.*)"/)?.[1];
@@ -3965,7 +3980,7 @@ var chooseGitProvider = async ({ config: config2 }) => {
 ${logText(
         "Learn more here: "
       )}${linkText(
-        "https://tina.io/docs/self-hosted/existing-site/#github-personal-access-token"
+        "https://tina.io/docs/r/self-hosting-nextjs/#github-personal-access-token"
       )}`,
       initial: process.env.GITHUB_PERSONAL_ACCESS_TOKEN
     },
@@ -4226,7 +4241,8 @@ var askCommonSetUp = async () => {
       choices: [
         { title: "PNPM", value: "pnpm" },
         { title: "Yarn", value: "yarn" },
-        { title: "NPM", value: "npm" }
+        { title: "NPM", value: "npm" },
+        { title: "Bun", value: "bun" }
       ]
     }
   ]);
@@ -4287,7 +4303,7 @@ var askTinaSetupPrompts = async (params) => {
       message: `Where are public assets stored? (default: "public")
 ` + logText(
         `Not sure what value to use? Refer to our "Frameworks" doc: ${linkText(
-          "https://tina.io/docs/integration/frameworks/#configuring-tina-with-each-framework"
+          "https://tina.io/docs/r/framework-guides-overview"
         )}`
       )
     });
@@ -4477,11 +4493,11 @@ var CLICommand = class {
 };
 
 // src/cmds/init/apply.ts
-var import_path11 = __toESM(require("path"));
+var import_path13 = __toESM(require("path"));
 
 // src/cmds/forestry-migrate/index.ts
 var import_fs_extra10 = __toESM(require("fs-extra"));
-var import_path9 = __toESM(require("path"));
+var import_path11 = __toESM(require("path"));
 var import_js_yaml2 = __toESM(require("js-yaml"));
 var import_minimatch = __toESM(require("minimatch"));
 var import_graphql16 = require("@tinacms/graphql");
@@ -4489,7 +4505,7 @@ var import_schema_tools3 = require("@tinacms/schema-tools");
 
 // src/cmds/forestry-migrate/util/index.ts
 var import_fs_extra9 = __toESM(require("fs-extra"));
-var import_path8 = __toESM(require("path"));
+var import_path10 = __toESM(require("path"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_zod = __toESM(require("zod"));
 
@@ -4914,7 +4930,7 @@ var transformForestryFieldsToTinaFields = ({
   return tinaFields;
 };
 var getFieldsFromTemplates = ({ tem, pathToForestryConfig, skipBlocks = false }) => {
-  const templatePath = import_path8.default.join(
+  const templatePath = import_path10.default.join(
     pathToForestryConfig,
     ".forestry",
     "front_matter",
@@ -4989,8 +5005,8 @@ var generateAllTemplates = async ({
   pathToForestryConfig
 }) => {
   const allTemplates = (await import_fs_extra10.default.readdir(
-    import_path9.default.join(pathToForestryConfig, ".forestry", "front_matter", "templates")
-  )).map((tem) => import_path9.default.basename(tem, ".yml"));
+    import_path11.default.join(pathToForestryConfig, ".forestry", "front_matter", "templates")
+  )).map((tem) => import_path11.default.basename(tem, ".yml"));
   const templateMap = /* @__PURE__ */ new Map();
   const proms = allTemplates.map(async (tem) => {
     try {
@@ -5135,9 +5151,9 @@ var generateCollectionFromForestrySection = (args) => {
     return c;
   } else if (section.type === "document") {
     const filePath = section.path;
-    const extname = import_path9.default.extname(filePath);
-    const fileName = import_path9.default.basename(filePath, extname);
-    const dir = import_path9.default.dirname(filePath);
+    const extname = import_path11.default.extname(filePath);
+    const fileName = import_path11.default.basename(filePath, extname);
+    const dir = import_path11.default.dirname(filePath);
     const ext = checkExt(extname);
     if (ext) {
       const fields = [];
@@ -5157,7 +5173,7 @@ var generateCollectionFromForestrySection = (args) => {
           name: "dummy",
           label: "Dummy field",
           type: "string",
-          description: "This is a dummy field, please replace it with the fields you want to edit. See https://tina.io/docs/schema/ for more info"
+          description: "This is a dummy field, please replace it with the fields you want to edit. See https://tina.io/docs/r/content-modelling-collections/ for more info"
         });
         logger.warn(
           warnText(
@@ -5200,7 +5216,7 @@ var generateCollections = async ({
     usingTypescript
   });
   const forestryConfig = await import_fs_extra10.default.readFile(
-    import_path9.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+    import_path11.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
   rewriteTemplateKeysInDocs({
     templateMap,
@@ -5230,11 +5246,11 @@ var rewriteTemplateKeysInDocs = (args) => {
     const { templateObj } = templateMap.get(templateKey);
     templateObj?.pages?.forEach((page) => {
       try {
-        const filePath = import_path9.default.join(page);
+        const filePath = import_path11.default.join(page);
         if (import_fs_extra10.default.lstatSync(filePath).isDirectory()) {
           return;
         }
-        const extname = import_path9.default.extname(filePath);
+        const extname = import_path11.default.extname(filePath);
         const fileContent = import_fs_extra10.default.readFileSync(filePath).toString();
         const content = (0, import_graphql16.parseFile)(
           fileContent,
@@ -5266,7 +5282,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_path10 = __toESM(require("path"));
+var import_path12 = __toESM(require("path"));
 var CodemodCommand = class extends import_clipanion5.Command {
   constructor() {
     super(...arguments);
@@ -5314,7 +5330,7 @@ var moveTinaFolder = async (rootPath = process.cwd()) => {
     logger.error(e.message);
     process.exit(1);
   }
-  const tinaDestination = import_path10.default.join(configManager.rootPath, "tina");
+  const tinaDestination = import_path12.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.`
@@ -5329,7 +5345,7 @@ var moveTinaFolder = async (rootPath = process.cwd()) => {
 };
 var writeGitignore = async (rootPath) => {
   await import_fs_extra11.default.outputFileSync(
-    import_path10.default.join(rootPath, "tina", ".gitignore"),
+    import_path12.default.join(rootPath, "tina", ".gitignore"),
     "__generated__"
   );
 };
@@ -5382,7 +5398,7 @@ const BlogPage = (props) => {
         <div className='bg-green-100 text-center'>
           Lost and looking for a place to start?
           <a
-            href='https://tina.io/guides/tina-cloud/getting-started/overview/'
+            href='https://tina.io/docs/r/beginner-series'
             className='text-blue-500 underline'
           >
             {' '}
@@ -5664,7 +5680,7 @@ import { LocalAuthProvider } from "tinacms";`;
         publicFolder: "${args.publicFolder}",
       },
     },
-    // See docs on content modeling for more info on how to setup new content models: https://tina.io/docs/schema/
+    // See docs on content modeling for more info on how to setup new content models: https://tina.io/docs/r/content-modelling-collections/
     schema: {
       collections: ${generateCollectionString(args)},
     },
@@ -6165,8 +6181,8 @@ async function apply({
     await addConfigFile({
       configArgs: {
         config: config2,
-        publicFolder: import_path11.default.join(
-          import_path11.default.relative(process.cwd(), pathToForestryConfig),
+        publicFolder: import_path13.default.join(
+          import_path13.default.relative(process.cwd(), pathToForestryConfig),
           config2.publicFolder
         ),
         collections,
@@ -6239,18 +6255,18 @@ var createPackageJSON = async () => {
 };
 var createGitignore = async ({ baseDir }) => {
   logger.info(logText("No .gitignore found, creating one"));
-  import_fs_extra13.default.outputFileSync(import_path11.default.join(baseDir, ".gitignore"), "node_modules");
+  import_fs_extra13.default.outputFileSync(import_path13.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_path11.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = import_fs_extra13.default.readFileSync(import_path13.default.join(baseDir, ".gitignore")).toString();
   const newGitignoreContent = [...gitignoreContent.split("\n"), ...items].join(
     "\n"
   );
-  await import_fs_extra13.default.writeFile(import_path11.default.join(baseDir, ".gitignore"), newGitignoreContent);
+  await import_fs_extra13.default.writeFile(import_path13.default.join(baseDir, ".gitignore"), newGitignoreContent);
 };
 var addDependencies = async (config2, env, params) => {
   const { packageManager } = config2;
@@ -6291,7 +6307,8 @@ var addDependencies = async (config2, env, params) => {
   let packageManagers = {
     pnpm: process.env.USE_WORKSPACE ? `pnpm add ${deps.join(" ")} --workspace` : `pnpm add ${deps.join(" ")}`,
     npm: `npm install ${deps.join(" ")}`,
-    yarn: `yarn add ${deps.join(" ")}`
+    yarn: `yarn add ${deps.join(" ")}`,
+    bun: `bun add ${deps.join(" ")}`
   };
   if (packageManagers[packageManager] && deps.length > 0) {
     logger.info(logText("Adding dependencies, this might take a moment..."));
@@ -6302,7 +6319,8 @@ var addDependencies = async (config2, env, params) => {
     packageManagers = {
       pnpm: process.env.USE_WORKSPACE ? `pnpm add -D ${devDeps.join(" ")} --workspace` : `pnpm add -D ${devDeps.join(" ")}`,
       npm: `npm install -D ${devDeps.join(" ")}`,
-      yarn: `yarn add -D ${devDeps.join(" ")}`
+      yarn: `yarn add -D ${devDeps.join(" ")}`,
+      bun: `bun add -D ${devDeps.join(" ")}`
     };
     if (packageManagers[packageManager]) {
       logger.info(
@@ -6319,22 +6337,22 @@ var writeGeneratedFile = async ({
   content,
   typescript
 }) => {
-  const { exists, path: path14, parentPath } = generatedFile.resolve(typescript);
+  const { exists, path: path15, parentPath } = generatedFile.resolve(typescript);
   if (exists) {
     if (overwrite) {
-      logger.info(`Overwriting file at ${path14}... \u2705`);
-      import_fs_extra13.default.outputFileSync(path14, content);
+      logger.info(`Overwriting file at ${path15}... \u2705`);
+      import_fs_extra13.default.outputFileSync(path15, content);
     } else {
-      logger.info(`Not overwriting file at ${path14}.`);
+      logger.info(`Not overwriting file at ${path15}.`);
       logger.info(
-        logText(`Please add the following to ${path14}:
+        logText(`Please add the following to ${path15}:
 ${indentText(content)}}`)
       );
     }
   } else {
-    logger.info(`Adding file at ${path14}... \u2705`);
+    logger.info(`Adding file at ${path15}... \u2705`);
     await import_fs_extra13.default.ensureDir(parentPath);
-    import_fs_extra13.default.outputFileSync(path14, content);
+    import_fs_extra13.default.outputFileSync(path15, content);
   }
 };
 var addConfigFile = async ({
@@ -6412,7 +6430,7 @@ var addContentFile = async ({
         return () => ({
           exists: env.sampleContentExists,
           path: env.sampleContentPath,
-          parentPath: import_path11.default.dirname(env.sampleContentPath)
+          parentPath: import_path13.default.dirname(env.sampleContentPath)
         });
       }
     },
@@ -6435,7 +6453,7 @@ ${titleText(" TinaCMS ")} backend initialized!`));
       return `${x.key}=${x.value || "***"}`;
     }).join("\n") + `
 TINA_PUBLIC_IS_LOCAL=true`;
-    const envFile = import_path11.default.join(process.cwd(), ".env");
+    const envFile = import_path13.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);
@@ -6481,7 +6499,8 @@ var other = ({ packageManager }) => {
     pnpm: `pnpm`,
     npm: `npx`,
     // npx is the way to run executables that aren't in your "scripts"
-    yarn: `yarn`
+    yarn: `yarn`,
+    bun: `bun run`
   };
   return `${packageManagers[packageManager]} tinacms dev -c "<your dev command>"`;
 };
@@ -6494,7 +6513,8 @@ var frameworkDevCmds = {
       pnpm: `pnpm`,
       npm: `npm run`,
       // npx is the way to run executables that aren't in your "scripts"
-      yarn: `yarn`
+      yarn: `yarn`,
+      bun: `bun run`
     };
     return `${packageManagers[packageManager]} dev`;
   }
@@ -6507,7 +6527,7 @@ var addReactiveFile = {
     baseDir,
     dataLayer
   }) => {
-    const packageJsonPath = import_path11.default.join(baseDir, "package.json");
+    const packageJsonPath = import_path13.default.join(baseDir, "package.json");
     await writeGeneratedFile({
       generatedFile,
       typescript: config2.typescript,

package/dist/server/server.d.ts

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

package/dist/utils/path.d.ts

@@ -0,0 +1,3 @@
+/** Removes trailing slash from path. Separator to remove is chosen based on
+ *  operating system. */
+export declare function stripNativeTrailingSlash(p: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.10.3",
+  "version": "1.12.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -37,6 +37,7 @@
     "@types/listr": "0.14.2",
     "@types/log4js": "^2.3.5",
     "@types/multer": "^1.4.12",
+    "@types/node": "^22.13.1",
     "@types/progress": "^2.0.7",
     "@types/prompts": "^2.4.9",
     "@types/yup": "^0.32.0",
@@ -89,12 +90,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.3.3",
+    "@tinacms/app": "2.3.5",
     "@tinacms/graphql": "1.6.1",
     "@tinacms/metrics": "1.1.0",
     "@tinacms/schema-tools": "1.9.1",
     "@tinacms/search": "1.1.1",
-    "tinacms": "2.8.3"
+    "tinacms": "2.9.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"