@tinacms/cli 1.5.0 → 1.5.2

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

@@ -76,7 +76,7 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     name?: string;
-    type?: "number" | "boolean" | "file" | "text" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "include" | "blocks" | "color";
+    type?: "number" | "boolean" | "file" | "text" | "include" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks" | "color";
     label?: string;
     template_types?: string[];
 }, {
@@ -95,7 +95,7 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     name?: string;
-    type?: "number" | "boolean" | "file" | "text" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "include" | "blocks" | "color";
+    type?: "number" | "boolean" | "file" | "text" | "include" | "list" | "select" | "datetime" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks" | "color";
     label?: string;
     template_types?: string[];
 }>;
@@ -150,10 +150,10 @@ export declare const parseSections: ({ val }: {
 }) => {
     sections?: {
         match?: string;
+        exclude?: string;
         path?: string;
         type?: "directory" | "document" | "heading" | "jekyll-pages" | "jekyll-posts";
         label?: string;
-        exclude?: string;
         create?: "none" | "all" | "documents";
         templates?: string[];
         new_doc_ext?: string;

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

@@ -2,7 +2,8 @@ export interface Framework {
     name: 'next' | 'hugo' | 'jekyll' | 'other';
     reactive: boolean;
 }
-export declare function initStaticTina({ pathToForestryConfig, noTelemetry, }: {
+export declare function initStaticTina({ rootPath, pathToForestryConfig, noTelemetry, }: {
+    rootPath: string;
     pathToForestryConfig: string;
     noTelemetry: boolean;
 }): Promise<void>;
@@ -14,6 +15,7 @@ export interface AddConfigArgs {
     collections?: string;
     token?: string;
     clientId?: string;
+    isForestryMigration?: boolean;
 }
 /**
  * Executes a shell command and return it as a Promise.

package/dist/index.js

@@ -28,10 +28,10 @@ __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_clipanion5 = require("clipanion");
+var import_clipanion6 = require("clipanion");
 
 // package.json
-var version = "1.5.0";
+var version = "1.5.2";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion = require("clipanion");
@@ -207,10 +207,6 @@ var ConfigManager = class {
       import_path.default.join(this.tinaFolderPath, "database")
     );
     this.generatedFolderPath = import_path.default.join(this.tinaFolderPath, GENERATED_FOLDER);
-    this.config = await this.loadConfigFile(
-      this.generatedFolderPath,
-      this.tinaConfigFilePath
-    );
     this.generatedGraphQLGQLPath = import_path.default.join(
       this.generatedFolderPath,
       GRAPHQL_GQL_FILE
@@ -235,16 +231,6 @@ var ConfigManager = class {
       this.generatedFolderPath,
       "frags.gql"
     );
-    const fullLocalContentPath = import_path.default.join(
-      this.tinaFolderPath,
-      this.config.localContentPath || ""
-    );
-    if (this.config.localContentPath && await import_fs_extra.default.existsSync(fullLocalContentPath)) {
-      logger.info(`Using separate content repo at ${fullLocalContentPath}`);
-      this.contentRootPath = fullLocalContentPath;
-    } else {
-      this.contentRootPath = this.rootPath;
-    }
     this.generatedTypesTSFilePath = import_path.default.join(
       this.generatedFolderPath,
       "types.ts"
@@ -273,6 +259,19 @@ var ConfigManager = class {
       this.generatedFolderPath,
       "client.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);
+      }
+    }
+    this.config = await this.loadConfigFile(
+      this.generatedFolderPath,
+      this.tinaConfigFilePath
+    );
     this.publicFolderPath = import_path.default.join(
       this.rootPath,
       this.config.build.publicFolder
@@ -283,6 +282,16 @@ var ConfigManager = class {
     );
     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 && await import_fs_extra.default.existsSync(fullLocalContentPath)) {
+      logger.info(`Using separate content repo at ${fullLocalContentPath}`);
+      this.contentRootPath = fullLocalContentPath;
+    } else {
+      this.contentRootPath = this.rootPath;
+    }
     this.spaMainPath = require.resolve("@tinacms/app");
     this.spaRootPath = import_path.default.join(this.spaMainPath, "..", "..");
   }
@@ -364,7 +373,8 @@ var ConfigManager = class {
       entryPoints: [this.selfHostedDatabaseFilePath],
       bundle: true,
       platform: "node",
-      outfile
+      outfile,
+      loader: loaders
     });
     const result = require(outfile);
     await import_fs_extra.default.removeSync(outfile);
@@ -381,13 +391,15 @@ var ConfigManager = class {
       bundle: true,
       target: ["es2020"],
       platform: "node",
-      outfile
+      outfile,
+      loader: loaders
     });
     await esbuild.build({
       entryPoints: [outfile],
       bundle: true,
       platform: "node",
-      outfile: outfile2
+      outfile: outfile2,
+      loader: loaders
     });
     const result = require(outfile2);
     await import_fs_extra.default.removeSync(outfile);
@@ -395,6 +407,31 @@ var ConfigManager = class {
     return result.default;
   }
 };
+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 devHTML = (port) => `<!DOCTYPE html>
@@ -424,7 +461,7 @@ var devHTML = (port) => `<!DOCTYPE html>
 </html>`;
 
 // src/next/commands/dev-command/server/index.ts
-var import_vite2 = require("vite");
+var import_vite3 = require("vite");
 
 // src/next/vite/index.ts
 var import_path3 = __toESM(require("path"));
@@ -768,6 +805,9 @@ var createConfig = async ({
 };
 
 // src/next/vite/plugins.ts
+var import_pluginutils = require("@rollup/pluginutils");
+var import_fs = __toESM(require("fs"));
+var import_vite2 = require("vite");
 var import_esbuild = require("esbuild");
 var import_path5 = __toESM(require("path"));
 var import_body_parser = __toESM(require("body-parser"));
@@ -1001,14 +1041,50 @@ var devServerEndPointsPlugin = ({
   };
   return plug;
 };
+function viteTransformExtension({
+  exportAsDefault = true,
+  svgrOptions,
+  esbuildOptions,
+  include = "**/*.svg",
+  exclude
+} = {}) {
+  const filter = (0, import_pluginutils.createFilter)(include, exclude);
+  return {
+    name: "vite-plugin-svgr",
+    async transform(code, id) {
+      if (filter(id)) {
+        const { transform: transform2 } = await Promise.resolve().then(() => __toESM(require("@svgr/core")));
+        const svgCode = await import_fs.default.promises.readFile(
+          id.replace(/\?.*$/, ""),
+          "utf8"
+        );
+        const componentCode = await transform2(svgCode, svgrOptions, {
+          filePath: id,
+          caller: {
+            previousExport: exportAsDefault ? null : code
+          }
+        });
+        const res = await (0, import_vite2.transformWithEsbuild)(componentCode, id, {
+          loader: "jsx",
+          ...esbuildOptions
+        });
+        return {
+          code: res.code,
+          map: null
+        };
+      }
+    }
+  };
+}
 
 // src/next/commands/dev-command/server/index.ts
 var createDevServer = async (configManager, database, apiURL, noWatch) => {
   const plugins = [
     transformTsxPlugin({ configManager }),
-    devServerEndPointsPlugin({ apiURL, configManager, database })
+    devServerEndPointsPlugin({ apiURL, configManager, database }),
+    viteTransformExtension()
   ];
-  return (0, import_vite2.createServer)(
+  return (0, import_vite3.createServer)(
     await createConfig({
       configManager,
       database,
@@ -1462,7 +1538,7 @@ var createDBServer = (port) => {
   });
   dbServer.listen(port);
 };
-async function createAndInitializeDatabase(configManager, bridgeOverride) {
+async function createAndInitializeDatabase(configManager, datalayerPort, bridgeOverride) {
   let database;
   const bridge = bridgeOverride || new import_graphql7.FilesystemBridge(configManager.rootPath, configManager.contentRootPath);
   if (configManager.hasSelfHostedConfig() && configManager.config.contentApiUrlOverride) {
@@ -1476,7 +1552,7 @@ async function createAndInitializeDatabase(configManager, bridgeOverride) {
         )} but there was no "contentApiUrlOverride" set. Falling back to built-in datalayer`
       );
     }
-    const level = new import_graphql7.TinaLevelClient();
+    const level = new import_graphql7.TinaLevelClient(datalayerPort);
     level.openConnection();
     database = (0, import_graphql7.createDatabase)({
       bridge,
@@ -1531,7 +1607,7 @@ var DevCommand = class extends import_clipanion.Command {
       description: "Specify a port to run the server on. (default 4001)"
     });
     this.datalayerPort = import_clipanion.Option.String("--datalayer-port", "9000", {
-      description: "Specify a port to run the datalayer server on. (default 4001)"
+      description: "Specify a port to run the datalayer server on. (default 9000)"
     });
     this.subCommand = import_clipanion.Option.String("-c,--command", {
       description: "The sub-command to run"
@@ -1608,7 +1684,10 @@ var DevCommand = class extends import_clipanion.Command {
         }
       }
       if (firstTime) {
-        database = await createAndInitializeDatabase(configManager);
+        database = await createAndInitializeDatabase(
+          configManager,
+          Number(this.datalayerPort)
+        );
       } else {
         database.clearCache();
       }
@@ -1816,7 +1895,7 @@ var import_fs_extra5 = __toESM(require("fs-extra"));
 var import_graphql9 = require("@tinacms/graphql");
 
 // src/next/commands/build-command/server.ts
-var import_vite4 = require("vite");
+var import_vite5 = require("vite");
 var buildProductionSpa = async (configManager, database, apiURL) => {
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
@@ -1836,13 +1915,13 @@ var buildProductionSpa = async (configManager, database, apiURL) => {
     }
   });
   const config3 = await createConfig({
-    plugins: [transformTsxPlugin({ configManager })],
+    plugins: [transformTsxPlugin({ configManager }), viteTransformExtension()],
     configManager,
     database,
     apiURL,
     noWatch: true
   });
-  return (0, import_vite4.build)(config3);
+  return (0, import_vite5.build)(config3);
 };
 
 // src/next/commands/build-command/index.ts
@@ -1963,7 +2042,7 @@ var BuildCommand = class extends import_clipanion2.Command {
       description: "DEPRECATED - This should now be set in the config at client.skip = true'. Don't generate the generated client SDK"
     });
     this.datalayerPort = import_clipanion2.Option.String("--datalayer-port", "9000", {
-      description: "Specify a port to run the datalayer server on. (default 4001)"
+      description: "Specify a port to run the datalayer server on. (default 9000)"
     });
     this.isomorphicGitBridge = import_clipanion2.Option.Boolean("--isomorphicGitBridge", {
       description: "DEPRECATED - Enable Isomorphic Git Bridge Implementation"
@@ -2016,7 +2095,10 @@ var BuildCommand = class extends import_clipanion2.Command {
       process.exit(1);
     }
     createDBServer(Number(this.datalayerPort));
-    const database = await createAndInitializeDatabase(configManager);
+    const database = await createAndInitializeDatabase(
+      configManager,
+      Number(this.datalayerPort)
+    );
     const { queryDoc, fragDoc } = await (0, import_graphql9.buildSchema)(
       database,
       configManager.config
@@ -2434,7 +2516,7 @@ var AuditCommand = class extends import_clipanion3.Command {
       description: "Disable anonymous telemetry that is collected"
     });
     this.datalayerPort = import_clipanion3.Option.String("--datalayer-port", "9000", {
-      description: "Specify a port to run the datalayer server on. (default 4001)"
+      description: "Specify a port to run the datalayer server on. (default 9000)"
     });
   }
   async catch(error) {
@@ -2456,6 +2538,7 @@ var AuditCommand = class extends import_clipanion3.Command {
     createDBServer(Number(this.datalayerPort));
     const database = await createAndInitializeDatabase(
       configManager,
+      Number(this.datalayerPort),
       this.clean ? void 0 : new import_graphql13.AuditFileSystemBridge(configManager.rootPath)
     );
     const { tinaSchema, graphQLSchema } = await (0, import_graphql12.buildSchema)(
@@ -2496,12 +2579,12 @@ AuditCommand.usage = import_clipanion3.Command.Usage({
 });
 
 // src/next/commands/init-command/index.ts
-var import_clipanion4 = require("clipanion");
+var import_clipanion5 = require("clipanion");
 
 // src/cmds/init/index.ts
-var import_path9 = __toESM(require("path"));
+var import_path10 = __toESM(require("path"));
 var import_prettier = require("prettier");
-var import_fs_extra8 = __toESM(require("fs-extra"));
+var import_fs_extra9 = __toESM(require("fs-extra"));
 var import_prompts2 = __toESM(require("prompts"));
 var import_metrics2 = require("@tinacms/metrics");
 
@@ -2510,19 +2593,19 @@ var nextPostPage = ({
   usingSrc
 }) => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
   // This is a demo file once you have tina setup feel free to delete this file
-  
+
   import Head from 'next/head'
   import { useTina } from 'tinacms/dist/react'
   import { TinaMarkdown } from 'tinacms/dist/rich-text'
-  import client from '${usingSrc ? "../" : ""}../../../.tina/__generated__/client'
-  
+  import client from '${usingSrc ? "../" : ""}../../../tina/__generated__/client'
+
   const BlogPage = (props) => {
     const { data } = useTina({
       query: props.query,
       variables: props.variables,
       data: props.data,
     })
-  
+
     return (
       <>
         <Head>
@@ -2561,7 +2644,7 @@ var nextPostPage = ({
       </>
     )
   }
-  
+
   export const getStaticProps = async ({ params }) => {
     let data = {}
     let query = {}
@@ -2574,7 +2657,7 @@ var nextPostPage = ({
     } catch {
       // swallow errors related to document creation
     }
-  
+
     return {
       props: {
         variables: variables,
@@ -2584,10 +2667,10 @@ var nextPostPage = ({
       },
     }
   }
-  
+
   export const getStaticPaths = async () => {
     const postsListData = await client.queries.postConnection()
-  
+
     return {
       paths: postsListData.data.postConnection.edges.map((post) => ({
         params: { filename: post.node._sys.filename },
@@ -2595,9 +2678,9 @@ var nextPostPage = ({
       fallback: false,
     }
   }
-  
+
   export default BlogPage
-  
+
   const PageSection = (props) => {
     return (
       <>
@@ -2606,11 +2689,11 @@ var nextPostPage = ({
       </>
     )
   }
-  
+
   const components = {
     PageSection: PageSection,
   }
-  
+
   const ContentSection = ({ content }) => {
     return (
       <div className="relative py-16 bg-white overflow-hidden">
@@ -2740,6 +2823,12 @@ function extendNextScripts(scripts) {
 }
 
 // src/cmds/init/setup-files/config.ts
+var clientConfig = (isForestryMigration) => {
+  if (isForestryMigration) {
+    return "client: {skip: true},";
+  }
+  return "";
+};
 var other = (args) => {
   return `
 import { defineConfig } from "tinacms";
@@ -2751,6 +2840,7 @@ export default defineConfig({
   branch,
   clientId: ${args.clientId ? `'${args.clientId}'` : "null"}, // Get this from tina.io
   token:  ${args.token ? `'${args.token}'` : "null"}, // Get this from tina.io
+  ${clientConfig(args.isForestryMigration)}
   build: {
     outputFolder: "admin",
     publicFolder: "${args.publicFolder}",
@@ -2793,11 +2883,12 @@ var configExamples = {
 
   // Your hosting provider likely exposes this as an environment variable
   const branch = process.env.HEAD || process.env.VERCEL_GIT_COMMIT_REF || 'main'
-  
+
   export default defineConfig({
     branch,
     clientId: ${args.clientId ? `'${args.clientId}'` : "null"}, // Get this from tina.io
     token:  ${args.token ? `'${args.token}'` : "null"}, // Get this from tina.io
+    ${clientConfig(args.isForestryMigration)}
     build: {
       outputFolder: "admin",
       publicFolder: "${args.publicFolder}",
@@ -2996,7 +3087,6 @@ var transformForestryFieldsToTinaFields = ({
   skipBlocks = false
 }) => {
   const tinaFields = [];
-  const blockFields = [];
   fields == null ? void 0 : fields.forEach((forestryField2) => {
     var _a, _b, _c, _d;
     if (forestryField2.name === "menu") {
@@ -3139,7 +3229,6 @@ var transformForestryFieldsToTinaFields = ({
         break;
       case "blocks":
         if (skipBlocks) {
-          blockFields.push(forestryField2.name);
           break;
         }
         const templates = [];
@@ -3154,11 +3243,16 @@ var transformForestryFieldsToTinaFields = ({
             label: template2.label,
             name: stringifyTemplateName(tem, tem)
           };
+          if (t.name != tem) {
+            ;
+            t.nameOverride = tem;
+          }
           templates.push(t);
         });
         field = {
           type: "object",
           list: true,
+          templateKey: "template",
           label: forestryField2.label,
           ...getTinaFieldsFromName(forestryField2.name),
           templates
@@ -3185,20 +3279,9 @@ var transformForestryFieldsToTinaFields = ({
       tinaFields.push(field);
     }
   });
-  if (blockFields.length > 0) {
-    logger.info(
-      warnText(
-        `Skipping blocks field${blockFields.length > 1 ? "s" : ""}: ${blockFields.map((b) => `"${b}"`).join(
-          ", "
-        )}" in ${template}.yaml. Blocks fields need to be manually imported: ${linkText(
-          "https://tina.io/docs/forestry/common-errors/#migrating-blocks"
-        )}`
-      )
-    );
-  }
   return tinaFields;
 };
-var getFieldsFromTemplates = ({ tem, pathToForestryConfig, skipBlocks = true }) => {
+var getFieldsFromTemplates = ({ tem, pathToForestryConfig, skipBlocks = false }) => {
   const templatePath = import_path7.default.join(
     pathToForestryConfig,
     ".forestry",
@@ -3250,7 +3333,11 @@ var transformForestryMatchToTinaMatch = (match) => {
   var _a, _b;
   const newMatch = (_b = (_a = match.replace(" ", "").replace(/\.?(mdx|md|json|yaml|yml|toml)/g, "")) == null ? void 0 : _a.replace(/\..*$/g, "")) == null ? void 0 : _b.replace("{}", "");
   if (match !== newMatch) {
-    logger.warn(`Warning: Match ${match} was transformed to ${newMatch}`);
+    logger.info(
+      `Info: Match ${match} was transformed to ${newMatch}. See ${linkText(
+        "https://tina.io/docs/forestry/common-errors/#info-match-match-was-transformed-to-newmatch"
+      )}`
+    );
   }
   return newMatch;
 };
@@ -3433,6 +3520,9 @@ var rewriteTemplateKeysInDocs = (templateMap, rootPath) => {
     (_a = templateObj == null ? void 0 : templateObj.pages) == null ? void 0 : _a.forEach((page) => {
       try {
         const filePath = import_path8.default.join(page);
+        if (import_fs_extra7.default.lstatSync(filePath).isDirectory()) {
+          return;
+        }
         const extname = import_path8.default.extname(filePath);
         const fileContent = import_fs_extra7.default.readFileSync(filePath).toString();
         const content2 = (0, import_graphql14.parseFile)(fileContent, extname, (yup) => yup.object({}));
@@ -3450,12 +3540,81 @@ var rewriteTemplateKeysInDocs = (templateMap, rootPath) => {
   }
 };
 
+// src/next/commands/codemod-command/index.ts
+var import_clipanion4 = require("clipanion");
+var import_fs_extra8 = __toESM(require("fs-extra"));
+var import_path9 = __toESM(require("path"));
+var CodemodCommand = class extends import_clipanion4.Command {
+  constructor() {
+    super(...arguments);
+    this.rootPath = import_clipanion4.Option.String("--rootPath", {
+      description: "Specify the root directory to run the CLI from"
+    });
+    this.verbose = import_clipanion4.Option.Boolean("-v,--verbose", false, {
+      description: "increase verbosity of logged output"
+    });
+  }
+  async catch(error) {
+    console.log(error);
+  }
+  async execute() {
+    const mod = this.path[1];
+    if (!mod) {
+      logger.error(
+        "Must specify an additional argument (eg. 'move-tina-folder')"
+      );
+      process.exit(1);
+    }
+    const mods = { "move-tina-folder": () => moveTinaFolder(this.rootPath) };
+    const command = mods[mod];
+    if (!command) {
+      logger.error(`Mod not found for ${mod}`);
+      process.exit(1);
+    }
+    await command();
+  }
+};
+CodemodCommand.paths = [["codemod"], ["codemod", "move-tina-folder"]];
+CodemodCommand.usage = import_clipanion4.Command.Usage({
+  category: `Commands`,
+  description: `Use codemods for various Tina tasks`
+});
+var moveTinaFolder = async (rootPath = process.cwd()) => {
+  const configManager = new ConfigManager({ rootPath });
+  try {
+    await configManager.processConfig();
+  } catch (e) {
+    logger.error(e.message);
+    process.exit(1);
+  }
+  const tinaDestination = import_path9.default.join(configManager.rootPath, "tina");
+  if (await import_fs_extra8.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.`
+    );
+  } else {
+    await import_fs_extra8.default.moveSync(configManager.tinaFolderPath, tinaDestination);
+    await writeGitignore(configManager.rootPath);
+    logger.info(
+      "Move to 'tina' folder complete. Be sure to update any imports of the autogenerated client!"
+    );
+  }
+};
+var writeGitignore = async (rootPath) => {
+  await import_fs_extra8.default.outputFileSync(
+    import_path9.default.join(rootPath, "tina", ".gitignore"),
+    "__generated__"
+  );
+};
+
 // src/cmds/init/index.ts
 async function initStaticTina({
+  rootPath,
   pathToForestryConfig,
   noTelemetry
 }) {
   logger.level = "info";
+  process.chdir(rootPath);
   const clientId = await chooseClientId();
   let token = null;
   if (clientId) {
@@ -3466,24 +3625,28 @@ async function initStaticTina({
   const usingTypescript = await chooseTypescript();
   const publicFolder = await choosePublicFolder({ framework });
   let collections;
-  const hasForestryConfig = await import_fs_extra8.default.pathExists(
-    import_path9.default.join(pathToForestryConfig, ".forestry", "settings.yml")
+  const hasForestryConfig = await import_fs_extra9.default.pathExists(
+    import_path10.default.join(pathToForestryConfig, ".forestry", "settings.yml")
   );
+  let isForestryMigration = false;
   if (hasForestryConfig) {
     collections = await forestryMigrate({
       pathToForestryConfig
     });
+    if (collections) {
+      isForestryMigration = true;
+    }
   }
   await reportTelemetry({
     usingTypescript,
     hasForestryConfig,
     noTelemetry
   });
-  const hasPackageJSON = await import_fs_extra8.default.pathExistsSync("package.json");
+  const hasPackageJSON = await import_fs_extra9.default.pathExistsSync("package.json");
   if (!hasPackageJSON) {
     await createPackageJSON();
   }
-  const hasGitignore = await import_fs_extra8.default.pathExistsSync(".gitignore");
+  const hasGitignore = await import_fs_extra9.default.pathExistsSync(".gitignore");
   if (!hasGitignore) {
     await createGitignore({ baseDir: "" });
   } else {
@@ -3496,8 +3659,8 @@ async function initStaticTina({
   }
   await addDependencies(packageManager);
   await addConfigFile({
-    publicFolder: import_path9.default.join(
-      import_path9.default.relative(process.cwd(), pathToForestryConfig),
+    publicFolder: import_path10.default.join(
+      import_path10.default.relative(process.cwd(), pathToForestryConfig),
       publicFolder
     ),
     baseDir: "",
@@ -3505,7 +3668,8 @@ async function initStaticTina({
     framework,
     collections,
     token,
-    clientId
+    clientId,
+    isForestryMigration
   });
   if (!hasForestryConfig) {
     await addContentFile({ baseDir: "" });
@@ -3650,22 +3814,22 @@ var createPackageJSON = async () => {
 };
 var createGitignore = async ({ baseDir }) => {
   logger.info(logText("No .gitignore found, creating one"));
-  await import_fs_extra8.default.outputFileSync(import_path9.default.join(baseDir, ".gitignore"), "node_modules");
+  await import_fs_extra9.default.outputFileSync(import_path10.default.join(baseDir, ".gitignore"), "node_modules");
 };
 var checkGitignoreForNodeModules = async ({
   baseDir
 }) => {
-  const gitignoreContent = await import_fs_extra8.default.readFileSync(import_path9.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = await import_fs_extra9.default.readFileSync(import_path10.default.join(baseDir, ".gitignore")).toString();
   return gitignoreContent.split("\n").some((item) => item === "node_modules");
 };
 var addNodeModulesToGitignore = async ({ baseDir }) => {
   logger.info(logText("Adding node_modules to .gitignore"));
-  const gitignoreContent = await import_fs_extra8.default.readFileSync(import_path9.default.join(baseDir, ".gitignore")).toString();
+  const gitignoreContent = await import_fs_extra9.default.readFileSync(import_path10.default.join(baseDir, ".gitignore")).toString();
   const newGitignoreContent = [
     ...gitignoreContent.split("\n"),
     "node_modules"
   ].join("\n");
-  await import_fs_extra8.default.writeFileSync(import_path9.default.join(baseDir, ".gitignore"), newGitignoreContent);
+  await import_fs_extra9.default.writeFileSync(import_path10.default.join(baseDir, ".gitignore"), newGitignoreContent);
 };
 var addDependencies = async (packageManager) => {
   logger.info(logText("Adding dependencies, this might take a moment..."));
@@ -3680,12 +3844,12 @@ var addDependencies = async (packageManager) => {
 };
 var addConfigFile = async (args) => {
   const { baseDir, usingTypescript } = args;
-  const configPath = import_path9.default.join(
-    ".tina",
+  const configPath = import_path10.default.join(
+    "tina",
     `config.${usingTypescript ? "ts" : "js"}`
   );
-  const fullConfigPath = import_path9.default.join(baseDir, configPath);
-  if (import_fs_extra8.default.pathExistsSync(fullConfigPath)) {
+  const fullConfigPath = import_path10.default.join(baseDir, configPath);
+  if (import_fs_extra9.default.pathExistsSync(fullConfigPath)) {
     const override = await (0, import_prompts2.default)({
       name: "selection",
       type: "confirm",
@@ -3693,23 +3857,24 @@ var addConfigFile = async (args) => {
     });
     if (override["selection"]) {
       logger.info(logText(`Overriding file at ${configPath}.`));
-      await import_fs_extra8.default.outputFileSync(fullConfigPath, config2(args));
+      await import_fs_extra9.default.outputFileSync(fullConfigPath, config2(args));
     } else {
       logger.info(logText(`Not overriding file at ${configPath}.`));
     }
   } else {
     logger.info(
       logText(
-        `Adding config file at .tina/config.${usingTypescript ? "ts" : "js"}`
+        `Adding config file at tina/config.${usingTypescript ? "ts" : "js"}`
       )
     );
-    await import_fs_extra8.default.outputFileSync(fullConfigPath, config2(args));
+    await import_fs_extra9.default.outputFileSync(fullConfigPath, config2(args));
+    await writeGitignore(baseDir);
   }
 };
 var addContentFile = async ({ baseDir }) => {
-  const contentPath = import_path9.default.join("content", "posts", "hello-world.md");
-  const fullContentPath = import_path9.default.join(baseDir, contentPath);
-  if (import_fs_extra8.default.pathExistsSync(fullContentPath)) {
+  const contentPath = import_path10.default.join("content", "posts", "hello-world.md");
+  const fullContentPath = import_path10.default.join(baseDir, contentPath);
+  if (import_fs_extra9.default.pathExistsSync(fullContentPath)) {
     const override = await (0, import_prompts2.default)({
       name: "selection",
       type: "confirm",
@@ -3717,13 +3882,13 @@ var addContentFile = async ({ baseDir }) => {
     });
     if (override["selection"]) {
       logger.info(logText(`Overriding file at ${contentPath}.`));
-      await import_fs_extra8.default.outputFileSync(fullContentPath, content);
+      await import_fs_extra9.default.outputFileSync(fullContentPath, content);
     } else {
       logger.info(logText(`Not overriding file at ${contentPath}.`));
     }
   } else {
     logger.info(logText(`Adding content file at ${contentPath}`));
-    await import_fs_extra8.default.outputFileSync(fullContentPath, content);
+    await import_fs_extra9.default.outputFileSync(fullContentPath, content);
   }
 };
 var logNextSteps = ({
@@ -3783,20 +3948,20 @@ var addReactiveFile = {
     baseDir,
     usingTypescript
   }) => {
-    const usingSrc = !import_fs_extra8.default.pathExistsSync(import_path9.default.join(baseDir, "pages"));
-    const pagesPath = import_path9.default.join(baseDir, usingSrc ? "src" : "", "pages");
-    const packageJSONPath = import_path9.default.join(baseDir, "package.json");
-    const tinaBlogPagePath = import_path9.default.join(pagesPath, "demo", "blog");
-    const tinaBlogPagePathFile = import_path9.default.join(
+    const usingSrc = !import_fs_extra9.default.pathExistsSync(import_path10.default.join(baseDir, "pages"));
+    const pagesPath = import_path10.default.join(baseDir, usingSrc ? "src" : "", "pages");
+    const packageJSONPath = import_path10.default.join(baseDir, "package.json");
+    const tinaBlogPagePath = import_path10.default.join(pagesPath, "demo", "blog");
+    const tinaBlogPagePathFile = import_path10.default.join(
       tinaBlogPagePath,
       `[filename].${usingTypescript ? "tsx" : "js"}`
     );
-    if (!import_fs_extra8.default.pathExistsSync(tinaBlogPagePathFile)) {
-      import_fs_extra8.default.mkdirpSync(tinaBlogPagePath);
-      import_fs_extra8.default.writeFileSync(tinaBlogPagePathFile, nextPostPage({ usingSrc }));
+    if (!import_fs_extra9.default.pathExistsSync(tinaBlogPagePathFile)) {
+      import_fs_extra9.default.mkdirpSync(tinaBlogPagePath);
+      import_fs_extra9.default.writeFileSync(tinaBlogPagePathFile, nextPostPage({ usingSrc }));
     }
     logger.info("Adding a nextjs example... \u2705");
-    const pack = JSON.parse(import_fs_extra8.default.readFileSync(packageJSONPath).toString());
+    const pack = JSON.parse(import_fs_extra9.default.readFileSync(packageJSONPath).toString());
     const oldScripts = pack.scripts || {};
     const newPack = JSON.stringify(
       {
@@ -3806,7 +3971,7 @@ var addReactiveFile = {
       null,
       2
     );
-    import_fs_extra8.default.writeFileSync(packageJSONPath, newPack);
+    import_fs_extra9.default.writeFileSync(packageJSONPath, newPack);
   }
 };
 function execShellCommand(cmd) {
@@ -3822,13 +3987,16 @@ function execShellCommand(cmd) {
 }
 
 // src/next/commands/init-command/index.ts
-var InitCommand = class extends import_clipanion4.Command {
+var InitCommand = class extends import_clipanion5.Command {
   constructor() {
     super(...arguments);
-    this.pathToForestryConfig = import_clipanion4.Option.String("--forestryPath", {
+    this.pathToForestryConfig = import_clipanion5.Option.String("--forestryPath", {
       description: "Specify the relative path to the .forestry directory, if importing an existing forestry site."
     });
-    this.noTelemetry = import_clipanion4.Option.Boolean("--noTelemetry", false, {
+    this.rootPath = import_clipanion5.Option.String("--rootPath", {
+      description: "Specify the root directory to run the CLI from (defaults to current working directory)"
+    });
+    this.noTelemetry = import_clipanion5.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
     });
   }
@@ -3838,21 +4006,23 @@ var InitCommand = class extends import_clipanion4.Command {
     process.exit(1);
   }
   async execute() {
+    const rootPath = this.rootPath || process.cwd();
     await initStaticTina({
-      pathToForestryConfig: this.pathToForestryConfig || process.cwd(),
+      rootPath,
+      pathToForestryConfig: this.pathToForestryConfig || rootPath,
       noTelemetry: this.noTelemetry
     });
     process.exit();
   }
 };
 InitCommand.paths = [["init"]];
-InitCommand.usage = import_clipanion4.Command.Usage({
+InitCommand.usage = import_clipanion5.Command.Usage({
   category: `Commands`,
   description: `Add Tina to an existing project`
 });
 
 // src/index.ts
-var cli = new import_clipanion5.Cli({
+var cli = new import_clipanion6.Cli({
   binaryName: `tinacms`,
   binaryLabel: `TinaCMS`,
   binaryVersion: version
@@ -3861,9 +4031,10 @@ cli.register(DevCommand);
 cli.register(BuildCommand);
 cli.register(AuditCommand);
 cli.register(InitCommand);
-cli.register(import_clipanion5.Builtins.DefinitionsCommand);
-cli.register(import_clipanion5.Builtins.HelpCommand);
-cli.register(import_clipanion5.Builtins.VersionCommand);
+cli.register(CodemodCommand);
+cli.register(import_clipanion6.Builtins.DefinitionsCommand);
+cli.register(import_clipanion6.Builtins.HelpCommand);
+cli.register(import_clipanion6.Builtins.VersionCommand);
 var src_default = cli;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

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

@@ -7,3 +7,4 @@ export declare class CodemodCommand extends Command {
     catch(error: any): Promise<void>;
     execute(): Promise<number | void>;
 }
+export declare const writeGitignore: (rootPath: string) => Promise<void>;

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

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

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

@@ -2,6 +2,7 @@ import { Command } from 'clipanion';
 export declare class InitCommand extends Command {
     static paths: string[][];
     pathToForestryConfig: string;
+    rootPath: string;
     noTelemetry: boolean;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;

package/dist/next/config-manager.d.ts

@@ -1,3 +1,4 @@
+import type { Loader } from 'esbuild';
 import { Config } from '@tinacms/schema-tools';
 export declare const TINA_FOLDER = "tina";
 export declare const LEGACY_TINA_FOLDER = ".tina";
@@ -58,3 +59,6 @@ export declare class ConfigManager {
     loadDatabaseFile(): Promise<any>;
     loadConfigFile(generatedFolderPath: string, configFilePath: string): Promise<any>;
 }
+export declare const loaders: {
+    [ext: string]: Loader;
+};

package/dist/next/database.d.ts

@@ -1,4 +1,4 @@
 import { Database, Bridge } from '@tinacms/graphql';
 import { ConfigManager } from './config-manager';
 export declare const createDBServer: (port: number) => void;
-export declare function createAndInitializeDatabase(configManager: ConfigManager, bridgeOverride?: Bridge): Promise<Database>;
+export declare function createAndInitializeDatabase(configManager: ConfigManager, datalayerPort: number, bridgeOverride?: Bridge): Promise<Database>;

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

@@ -1,4 +1,7 @@
 import type { Plugin } from 'vite';
+import { FilterPattern } from '@rollup/pluginutils';
+import type { Config } from '@svgr/core';
+import { transformWithEsbuild } from 'vite';
 import type { Database } from '@tinacms/graphql';
 import type { ConfigManager } from '../config-manager';
 export declare const transformTsxPlugin: ({ configManager: _configManager, }: {
@@ -9,3 +12,17 @@ export declare const devServerEndPointsPlugin: ({ configManager, apiURL, databas
     database: Database;
     configManager: ConfigManager;
 }) => Plugin;
+export interface ViteSvgrOptions {
+    /**
+     * Export React component as default. Notice that it will overrides
+     * the default behavior of Vite, which exports the URL as default
+     *
+     * @default false
+     */
+    exportAsDefault?: boolean;
+    svgrOptions?: Config;
+    esbuildOptions?: Parameters<typeof transformWithEsbuild>[2];
+    exclude?: FilterPattern;
+    include?: FilterPattern;
+}
+export declare function viteTransformExtension({ exportAsDefault, svgrOptions, esbuildOptions, include, exclude, }?: ViteSvgrOptions): Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -21,7 +21,6 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "1.1.0",
     "@types/clear": "0.1.0",
     "@types/cli-spinner": "^0.2.1",
     "@types/cors": "2.8.5",
@@ -41,7 +40,8 @@
     "@types/prompts": "^2.0.13",
     "@types/yup": "^0.29.11",
     "jest": "^27.0.6",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "@tinacms/scripts": "1.1.0"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.1.0",
@@ -53,15 +53,12 @@
     "@graphql-inspector/core": "^4.0.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
+    "@rollup/pluginutils": "^5.0.2",
+    "@svgr/core": "6.3.1",
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.1",
-    "@tinacms/datalayer": "1.2.1",
-    "@tinacms/graphql": "1.4.1",
-    "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.1",
-    "@vitejs/plugin-react": "^2.1.0",
+    "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
     "auto-bind": "^4.0.0",
@@ -103,7 +100,12 @@
     "vite": "4.1.4",
     "yarn": "^1.22.17",
     "yup": "^0.32.9",
-    "zod": "^3.14.3"
+    "zod": "^3.14.3",
+    "@tinacms/app": "1.2.3",
+    "@tinacms/datalayer": "1.2.3",
+    "@tinacms/graphql": "1.4.3",
+    "@tinacms/metrics": "1.0.2",
+    "@tinacms/schema-tools": "1.4.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"