@tinacms/cli 0.60.28 → 0.61.0

package/dist/index.js

@@ -70,11 +70,11 @@ var init_utils = __esm({
 });
 
 // src/server/models/media.ts
-var import_fs_extra5, import_path6, MediaModel;
+var import_fs_extra7, import_path9, MediaModel;
 var init_media = __esm({
   "src/server/models/media.ts"() {
-    import_fs_extra5 = __toModule(require("fs-extra"));
-    import_path6 = __toModule(require("path"));
+    import_fs_extra7 = __toModule(require("fs-extra"));
+    import_path9 = __toModule(require("path"));
     init_utils();
     MediaModel = class {
       constructor({ publicFolder, mediaRoot }) {
@@ -83,12 +83,12 @@ var init_media = __esm({
       }
       async listMedia(args) {
         try {
-          const folderPath = (0, import_path6.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          const folderPath = (0, import_path9.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           const searchPath = parseMediaFolder(args.searchPath);
-          const filesStr = await import_fs_extra5.default.readdir(folderPath);
+          const filesStr = await import_fs_extra7.default.readdir(folderPath);
           const filesProm = filesStr.map(async (file) => {
-            const filePath = (0, import_path6.join)(folderPath, file);
-            const stat = await import_fs_extra5.default.stat(filePath);
+            const filePath = (0, import_path9.join)(folderPath, file);
+            const stat = await import_fs_extra7.default.stat(filePath);
             let src = `/${file}`;
             const isFile = stat.isFile();
             if (!isFile) {
@@ -144,9 +144,9 @@ var init_media = __esm({
       }
       async deleteMedia(args) {
         try {
-          const file = (0, import_path6.join)(this.publicFolder, this.mediaRoot, args.searchPath);
-          await import_fs_extra5.default.stat(file);
-          await import_fs_extra5.default.remove(file);
+          const file = (0, import_path9.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          await import_fs_extra7.default.stat(file);
+          await import_fs_extra7.default.remove(file);
           return { ok: true };
         } catch (error) {
           console.error(error);
@@ -158,15 +158,15 @@ var init_media = __esm({
 });
 
 // src/server/routes/index.ts
-var import_express, import_path7, import_multer, createMediaRouter;
+var import_express, import_path10, import_multer, createMediaRouter;
 var init_routes = __esm({
   "src/server/routes/index.ts"() {
     import_express = __toModule(require("express"));
-    import_path7 = __toModule(require("path"));
+    import_path10 = __toModule(require("path"));
     import_multer = __toModule(require("multer"));
     init_media();
     createMediaRouter = (config) => {
-      const mediaFolder = (0, import_path7.join)(process.cwd(), config.publicFolder, config.mediaRoot);
+      const mediaFolder = (0, import_path10.join)(process.cwd(), config.publicFolder, config.mediaRoot);
       const storage = import_multer.default.diskStorage({
         destination: function(req, file, cb) {
           cb(null, mediaFolder);
@@ -293,22 +293,11 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.60.28";
+var version = "0.61.0";
 
-// src/cmds/query-gen/attachSchema.ts
+// src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
-var import_datalayer = __toModule(require("@tinacms/datalayer"));
-
-// src/utils/theme.ts
-var import_chalk = __toModule(require("chalk"));
-var successText = import_chalk.default.bold.green;
-var dangerText = import_chalk.default.bold.red;
-var neutralText = import_chalk.default.bold.cyan;
-var labelText = import_chalk.default.bold;
-var cmdText = import_chalk.default.inverse;
-var logText = import_chalk.default.italic.gray;
-var warnText = import_chalk.default.yellowBright.bgBlack;
-var CONFIRMATION_TEXT = import_chalk.default.dim("enter to confirm");
+var import_path = __toModule(require("path"));
 
 // src/logger/index.ts
 var import_log4js = __toModule(require("log4js"));
@@ -321,269 +310,9 @@ import_log4js.default.configure({
 });
 logger.level = "info";
 
-// src/cmds/query-gen/attachSchema.ts
-async function attachSchema(ctx, next, options) {
-  logger.info(logText("Building schema..."));
-  const rootPath2 = process.cwd();
-  const bridge = new import_datalayer.FilesystemBridge(rootPath2);
-  const store = new import_datalayer.FilesystemStore({ rootPath: rootPath2 });
-  const database = await (0, import_graphql.createDatabase)({ store, bridge });
-  const schema = await (0, import_graphql.buildSchema)(rootPath2, database);
-  ctx.schema = schema;
-  next();
-}
-
-// src/cmds/query-gen/genTypes.ts
-var import_graphql6 = __toModule(require("graphql"));
-var import_fs_extra = __toModule(require("fs-extra"));
-
-// src/codegen/index.ts
-var import_graphql5 = __toModule(require("graphql"));
-
-// src/codegen/plugin.ts
-var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
-  return `
-// TinaSDK generated code
-import { createClient, TinaClient } from "tinacms/dist/client";
-
-const generateRequester = (client: TinaClient) => {
-  const requester: (
-    doc: any,
-    vars?: any,
-    options?: any,
-    client
-  ) => Promise<any> = async (doc, vars, _options) => {
-    let data = {};
-    try {
-      data = await client.request({
-        query: doc,
-        variables: vars,
-      });
-    } catch (e) {
-      // swallow errors related to document creation
-      console.warn("Warning: There was an error when fetching data");
-      console.warn(e);
-    }
-
-    return { data: data?.data, query: doc, variables: vars || {} };
-  };
-
-  return requester;
-};
-
-/**
- * @experimental this class can be used but may change in the future
- **/
-export const ExperimentalGetTinaClient = () =>
-  getSdk(
-    generateRequester(createClient({ url: "http://localhost:4001/graphql" }))
-  );
-
-export const queries = (client: TinaClient) => {
-  const requester = generateRequester(client);
-  return getSdk(requester);
-};
-`;
-};
-var AddGeneratedClient = {
-  plugin: AddGeneratedClientFunc
-};
-
-// src/codegen/index.ts
-var import_graphql_file_loader = __toModule(require("@graphql-tools/graphql-file-loader"));
-var import_core = __toModule(require("@graphql-codegen/core"));
-var import_load = __toModule(require("@graphql-tools/load"));
-var import_typescript_operations = __toModule(require("@graphql-codegen/typescript-operations"));
-var import_typescript = __toModule(require("@graphql-codegen/typescript"));
-
-// src/codegen/sdkPlugin/index.ts
-var import_graphql3 = __toModule(require("graphql"));
-var import_graphql4 = __toModule(require("graphql"));
-var import_path = __toModule(require("path"));
-
-// src/codegen/sdkPlugin/visitor.ts
-var import_visitor_plugin_common = __toModule(require("@graphql-codegen/visitor-plugin-common"));
-var import_auto_bind = __toModule(require("auto-bind"));
-var import_graphql2 = __toModule(require("graphql"));
-var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBaseVisitor {
-  constructor(schema, fragments, rawConfig) {
-    super(schema, fragments, rawConfig, {
-      usingObservableFrom: rawConfig.usingObservableFrom
-    });
-    this._operationsToInclude = [];
-    (0, import_auto_bind.default)(this);
-    if (this.config.usingObservableFrom) {
-      this._additionalImports.push(this.config.usingObservableFrom);
-    }
-    if (this.config.documentMode !== import_visitor_plugin_common.DocumentMode.string) {
-    }
-  }
-  buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
-    if (node.name == null) {
-      throw new Error("Plugin 'generic-sdk' cannot generate SDK for unnamed operation.\n\n" + (0, import_graphql2.print)(node));
-    } else {
-      this._operationsToInclude.push({
-        node,
-        documentVariableName,
-        operationType,
-        operationResultType: `{data: ${operationResultType}, variables: ${operationVariablesTypes}, query: string}`,
-        operationVariablesTypes
-      });
-    }
-    return null;
-  }
-  get sdkContent() {
-    const usingObservable = !!this.config.usingObservableFrom;
-    const allPossibleActions = this._operationsToInclude.map((o) => {
-      const optionalVariables = !o.node.variableDefinitions || o.node.variableDefinitions.length === 0 || o.node.variableDefinitions.every((v) => v.type.kind !== import_graphql2.Kind.NON_NULL_TYPE || v.defaultValue);
-      const returnType = usingObservable && o.operationType === "Subscription" ? "Observable" : "Promise";
-      return `${o.node.name.value}(variables${optionalVariables ? "?" : ""}: ${o.operationVariablesTypes}, options?: C): ${returnType}<${o.operationResultType}> {
-    return requester<${o.operationResultType}, ${o.operationVariablesTypes}>(${o.documentVariableName}, variables, options);
-  }`;
-    }).map((s) => (0, import_visitor_plugin_common.indentMultiline)(s, 2));
-    return `export type Requester<C= {}> = <R, V>(doc: ${this.config.documentMode === import_visitor_plugin_common.DocumentMode.string ? "string" : "DocumentNode"}, vars?: V, options?: C) => ${usingObservable ? "Promise<R> & Observable<R>" : "Promise<R>"}
-  export function getSdk<C>(requester: Requester<C>) {
-    return {
-  ${allPossibleActions.join(",\n")}
-    };
-  }
-  export type Sdk = ReturnType<typeof getSdk>;`;
-  }
-};
-
-// src/codegen/sdkPlugin/index.ts
-var plugin = (schema, documents, config) => {
-  const allAst = (0, import_graphql4.concatAST)(documents.reduce((prev, v) => {
-    return [...prev, v.document];
-  }, []));
-  const allFragments = [
-    ...allAst.definitions.filter((d) => d.kind === import_graphql4.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
-      node: fragmentDef,
-      name: fragmentDef.name.value,
-      onType: fragmentDef.typeCondition.name.value,
-      isExternal: false
-    })),
-    ...config.externalFragments || []
-  ];
-  const visitor = new GenericSdkVisitor(schema, allFragments, config);
-  const visitorResult = (0, import_graphql3.visit)(allAst, { leave: visitor });
-  return {
-    content: [
-      visitor.fragments,
-      ...visitorResult.definitions.filter((t) => typeof t === "string"),
-      visitor.sdkContent
-    ].join("\n")
-  };
-};
-
-// src/codegen/index.ts
-var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd(), options = {
-  noSDK: false,
-  verbose: false
-}) => {
-  if (options.verbose)
-    logger.info("Generating types...");
-  try {
-    let docs = [];
-    let fragDocs = [];
-    try {
-      if (!options.noSDK) {
-        docs = await (0, import_load.loadDocuments)(queryPathGlob, {
-          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
-        });
-      }
-    } catch (e) {
-      let showErrorMessage = true;
-      const message = e.message || "";
-      if (message.includes("Unable to find any GraphQL type definitions for the following pointers:")) {
-        showErrorMessage = false;
-      }
-      if (showErrorMessage) {
-        console.error(e);
-      }
-    }
-    try {
-      if (!options.noSDK) {
-        fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
-          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
-        });
-      }
-    } catch (error) {
-      console.error(error);
-    }
-    const res = await (0, import_core.codegen)({
-      filename: process.cwd(),
-      schema: (0, import_graphql5.parse)((0, import_graphql5.printSchema)(schema)),
-      documents: [...docs, ...fragDocs],
-      config: {},
-      plugins: [
-        { typescript: {} },
-        { typescriptOperations: {} },
-        {
-          typescriptSdk: {}
-        },
-        { AddGeneratedClient: {} }
-      ],
-      pluginMap: {
-        typescript: {
-          plugin: import_typescript.plugin
-        },
-        typescriptOperations: {
-          plugin: import_typescript_operations.plugin
-        },
-        typescriptSdk: {
-          plugin
-        },
-        AddGeneratedClient
-      }
-    });
-    return res;
-  } catch (e) {
-    console.error(e);
-  }
-};
-
-// src/cmds/query-gen/genTypes.ts
-async function genTypes({ schema }, next, options) {
-  const typesPath = process.cwd() + "/.tina/__generated__/types.ts";
-  const fragPath = process.cwd() + "/.tina/__generated__/*.{graphql,gql}";
-  const queryPathGlob = process.cwd() + "/.tina/queries/**/*.{graphql,gql}";
-  const typescriptTypes = await generateTypes(schema, queryPathGlob, fragPath, options);
-  await import_fs_extra.default.outputFile(typesPath, `//@ts-nocheck
-// DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
-export function gql(strings: TemplateStringsArray, ...args: string[]): string {
-  let str = ''
-  strings.forEach((string, i) => {
-    str += string + (args[i] || '')
-  })
-  return str
-}
-${typescriptTypes}
-`);
-  logger.info(`	Typescript types => ${logText(typesPath)}`);
-  const schemaString = await (0, import_graphql6.printSchema)(schema);
-  const schemaPath = process.cwd() + "/.tina/__generated__/schema.gql";
-  await import_fs_extra.default.outputFile(schemaPath, `# DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
-${schemaString}
-schema {
-  query: Query
-  mutation: Mutation
-}
-  `);
-  logger.info(`	GraphQL types ====> ${logText(schemaPath)}
-`);
-  next();
-}
-
-// src/cmds/audit/index.ts
-var import_graphql9 = __toModule(require("@tinacms/graphql"));
-var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
-
 // src/cmds/audit/audit.ts
-var import_graphql7 = __toModule(require("@tinacms/graphql"));
-var import_path2 = __toModule(require("path"));
-var import_graphql8 = __toModule(require("@tinacms/graphql"));
-var import_chalk2 = __toModule(require("chalk"));
+var import_graphql2 = __toModule(require("@tinacms/graphql"));
+var import_chalk = __toModule(require("chalk"));
 var auditCollection = async (args) => {
   let warning = false;
   const { collection, database, rootPath: rootPath2 } = args;
@@ -606,7 +335,7 @@ var auditCollection = async (args) => {
         }
       }
       `;
-  const result = await (0, import_graphql7.resolve)({
+  const result = await (0, import_graphql.resolve)({
     database,
     query,
     variables: {}
@@ -617,9 +346,9 @@ var auditCollection = async (args) => {
     const node = x.node;
     if (node._sys.extension.replace(".", "") !== format) {
       warning = true;
-      logger.warn(import_chalk2.default.yellowBright(`WARNING: there is a file with extension \`${node._sys.extension}\` but in your schema it is defined to be \`.${format}\`
+      logger.warn(import_chalk.default.yellowBright(`WARNING: there is a file with extension \`${node._sys.extension}\` but in your schema it is defined to be \`.${format}\`
 
-location: ${import_path2.default.join(rootPath2, node._sys.path)}`));
+location: ${import_path.default.join(rootPath2, node._sys.path)}`));
     }
   });
   return warning;
@@ -646,7 +375,7 @@ var auditDocuments = async (args) => {
         }
       }
       `;
-  const result = await (0, import_graphql7.resolve)({
+  const result = await (0, import_graphql.resolve)({
     database,
     query,
     variables: {}
@@ -655,7 +384,7 @@ var auditDocuments = async (args) => {
   const documents = result.data.collection.documents.edges;
   for (let i = 0; i < documents.length; i++) {
     const node = documents[i].node;
-    const fullPath = import_path2.default.join(rootPath2, node._sys.path);
+    const fullPath = import_path.default.join(rootPath2, node._sys.path);
     logger.info(`Checking document: ${fullPath}`);
     const documentQuery = `query {
         document(collection: "${collection.name}", relativePath: "${node._sys.relativePath}") {
@@ -665,7 +394,7 @@ var auditDocuments = async (args) => {
           }
         }
       }`;
-    const docResult = await (0, import_graphql7.resolve)({
+    const docResult = await (0, import_graphql.resolve)({
       database,
       query: documentQuery,
       variables: {}
@@ -690,7 +419,7 @@ var auditDocuments = async (args) => {
           params: $params
         ){__typename}
       }`;
-    const mutationRes = await (0, import_graphql7.resolve)({
+    const mutationRes = await (0, import_graphql.resolve)({
       database,
       query: mutation,
       variables: {
@@ -704,7 +433,7 @@ var auditDocuments = async (args) => {
     if (mutationRes.errors) {
       mutationRes.errors.forEach((err) => {
         error = true;
-        logger.error(import_chalk2.default.red(err.message));
+        logger.error(import_chalk.default.red(err.message));
       });
     }
   }
@@ -724,7 +453,7 @@ var transformParams = (data) => {
     return data.map((item) => transformParams(item));
   }
   try {
-    (0, import_graphql8.assertShape)(data, (yup) => yup.object({ _template: yup.string().required() }));
+    (0, import_graphql2.assertShape)(data, (yup) => yup.object({ _template: yup.string().required() }));
     const _a = data, { _template, __typename } = _a, rest = __objRest(_a, ["_template", "__typename"]);
     const nested = transformParams(rest);
     return { [_template]: nested };
@@ -755,7 +484,7 @@ function filterObject(obj) {
 }
 
 // src/cmds/audit/index.ts
-var import_chalk3 = __toModule(require("chalk"));
+var import_chalk2 = __toModule(require("chalk"));
 var import_prompts = __toModule(require("prompts"));
 var import_metrics = __toModule(require("@tinacms/metrics"));
 var rootPath = process.cwd();
@@ -769,7 +498,7 @@ var audit = async (ctx, next, options) => {
     }
   });
   if (options.clean) {
-    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk3.default.bold("clean git tree")} so unwanted changes can be undone.
+    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk2.default.bold("clean git tree")} so unwanted changes can be undone.
 
 `);
     const res = await (0, import_prompts.default)({
@@ -778,16 +507,14 @@ var audit = async (ctx, next, options) => {
       message: `Do you want to continue?`
     });
     if (!res.useClean) {
-      logger.warn(import_chalk3.default.yellowBright("\u26A0\uFE0F Audit not complete"));
+      logger.warn(import_chalk2.default.yellowBright("\u26A0\uFE0F Audit not complete"));
       process.exit(0);
     }
   }
   if (options.useDefaultValues && !options.clean) {
-    logger.warn(import_chalk3.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
+    logger.warn(import_chalk2.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
   }
-  const bridge = options.clean ? new import_datalayer2.FilesystemBridge(rootPath) : new import_datalayer2.AuditFileSystemBridge(rootPath);
-  const store = options.clean ? new import_datalayer2.FilesystemStore({ rootPath }) : new import_datalayer2.AuditFilesystemStore({ rootPath });
-  const database = await (0, import_graphql9.createDatabase)({ store, bridge });
+  const database = ctx.database;
   const schema = await database.getSchema();
   const collections = schema.getCollections();
   let warning = false;
@@ -815,17 +542,17 @@ var audit = async (ctx, next, options) => {
 };
 var printFinalMessage = async (ctx, next, _options) => {
   if (ctx.error) {
-    logger.error(import_chalk3.default.redBright(`\u203C\uFE0F Audit ${import_chalk3.default.bold("failed")} with errors`));
+    logger.error(import_chalk2.default.redBright(`\u203C\uFE0F Audit ${import_chalk2.default.bold("failed")} with errors`));
   } else if (ctx.warning) {
-    logger.warn(import_chalk3.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
+    logger.warn(import_chalk2.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
   } else {
-    logger.info(import_chalk3.default.greenBright("\u2705 Audit passed"));
+    logger.info(import_chalk2.default.greenBright("\u2705 Audit passed"));
   }
   next();
 };
 
 // src/cmds/init/setup-files/index.ts
-var import_chalk4 = __toModule(require("chalk"));
+var import_chalk3 = __toModule(require("chalk"));
 var adminPage = `import { TinaAdmin } from 'tinacms';
 export default TinaAdmin;
 `;
@@ -857,65 +584,58 @@ mille rigidi sub taurum.
 
 
 `;
-var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
+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 { staticRequest, gql } from "tinacms";
-  import Head from "next/head";
-  import { createGlobalStyle } from "styled-components";
-  import { useTina } from "tinacms/dist/edit-state";
+  
+  import Head from 'next/head'
+  import { createGlobalStyle } from 'styled-components'
+  import { useTina } from 'tinacms/dist/edit-state'
   import { TinaMarkdown } from 'tinacms/dist/rich-text'
-
-  const query = gql\`
-    query BlogPostQuery($relativePath: String!) {
-      posts(relativePath: $relativePath) {
-        title
-        body
-      }
-    }
-  \`
-
+  import client from '${usingSrc ? "../" : ""}../../../.tina/__generated__/client'
+  
   // Styles for markdown
   const GlobalStyle = createGlobalStyle\`
-  h1,h2,h3,h4,h5 {
-    margin-bottom: 1.5rem;
-    margin-top: 1.5rem;
-  }
-  blockquote {
-    background-color: rgb(209,250,229);
-  }
-  h1 {
-    font-size: 45px;
-  }
-  h2 {
-    font-size: 35px;
-  }
-  h3 {
-    font-size: 25px;
-  }
-  h4 {
-    font-size: 22px;
-  }
-  ul {
-    padding-left: 0;
-  }
-  li {
-    list-style-type: none;
-  }
-  a {
-    font-weight: bold;
-    color: rgb(59,130,246);
-    text-decoration: underline;
-  }
-  \`;
-
+    h1,h2,h3,h4,h5 {
+      margin-bottom: 1.5rem;
+      margin-top: 1.5rem;
+    }
+    blockquote {
+      background-color: rgb(209,250,229);
+    }
+    h1 {
+      font-size: 45px;
+    }
+    h2 {
+      font-size: 35px;
+    }
+    h3 {
+      font-size: 25px;
+    }
+    h4 {
+      font-size: 22px;
+    }
+    ul {
+      padding-left: 0;
+    }
+    li {
+      list-style-type: none;
+    }
+    a {
+      font-weight: bold;
+      color: rgb(59,130,246);
+      text-decoration: underline;
+    }
+    \`
+  
   const BlogPage = (props) => {
     const { data } = useTina({
-      query,
+      query: props.query,
       variables: props.variables,
       data: props.data,
-    });
-
+    })
+  
     return (
       <>
         <Head>
@@ -931,15 +651,13 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
         <div>
           <div
             style={{
-              textAlign: "center",
+              textAlign: 'center',
             }}
           >
             <h1 className="text-3xl m-8 text-center leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">
-              {data.posts.title}
+              {data.post.title}
             </h1>
-            <ContentSection
-              content={data.posts.body}
-            ></ContentSection>
+            <ContentSection content={data.post.body}></ContentSection>
           </div>
           <div className="bg-green-100 text-center">
             Lost and looking for a place to start?
@@ -947,79 +665,65 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
               href="https://tina.io/guides/tina-cloud/getting-started/overview/"
               className="text-blue-500 underline"
             >
-              {" "}
+              {' '}
               Check out this guide
-            </a>{" "}
+            </a>{' '}
             to see how add TinaCMS to an existing Next.js site.
           </div>
         </div>
       </>
-    );
-  };
-
+    )
+  }
+  
   export const getStaticProps = async ({ params }) => {
-    const variables = { relativePath: \`\${params.filename}.md\` }
     let data = {}
+    let query = {}
+    let variables = { relativePath: \`\${params.filename}.mdx\` }
     try {
-      data = await staticRequest({
-        query,
-        variables,
-      })
+      const res = await client.queries.post(variables)
+      query = res.query
+      data = res.data
+      variables = res.variables
     } catch {
       // swallow errors related to document creation
     }
-
+  
     return {
-      props: {
-        variables,
-        data,
-        //myOtherProp: 'some-other-data',
-      },
-    }
-  };
-
-  export const getStaticPaths = async () => {
-    const postsListData = (await staticRequest({
-      query: gql\`
-        query GetPostsList {
-          postsConnection {
-            edges {
-              node {
-                ...on Document {
-                  _sys {
-                    filename
-                  }
-                }
-              }
-            }
-          }
-        }
-      \`,
-    }));
-
+      props: {
+        variables: variables,
+        data: data,
+        query: query,
+        //myOtherProp: 'some-other-data',
+      },
+    }
+  }
+  
+  export const getStaticPaths = async () => {
+    const postsListData = await client.queries.postConnection()
+  
     return {
-      paths: postsListData.postsConnection.edges.map((post) => ({
+      paths: postsListData.data.postConnection.edges.map((post) => ({
         params: { filename: post.node._sys.filename },
       })),
       fallback: false,
-    };
-  };
-
-  export default BlogPage;
-
-  const PageSection = props => {
+    }
+  }
+  
+  export default BlogPage
+  
+  const PageSection = (props) => {
     return (
       <>
-        <h2>{ props.heading }</h2>
-        <p>{ props.content }</p>
+        <h2>{props.heading}</h2>
+        <p>{props.content}</p>
       </>
     )
   }
-
+  
   const components = {
     PageSection: PageSection,
   }
-
+  
   const ContentSection = ({ content }) => {
     return (
       <div className="relative py-16 bg-white overflow-hidden">
@@ -1128,15 +832,13 @@ var nextPostPage = () => `// THIS FILE HAS BEEN GENERATED WITH THE TINA CLI.
         </div>
         <div className="relative px-4 sm:px-6 lg:px-8">
           <div className="text-lg max-w-prose mx-auto">
-            <TinaMarkdown components={components} content={content}/>
+            <TinaMarkdown components={components} content={content} />
             <GlobalStyle />
           </div>
         </div>
       </div>
-    );
-  };
-
-`;
+    )
+  }`;
 var AppJsContent = (usingSrc, extraImports) => {
   const importLine = `import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`;
   return `${importLine}
@@ -1154,15 +856,15 @@ export default App
 `;
 };
 var AppJsContentPrintout = (usingSrc, extraImports) => {
-  const importLine = import_chalk4.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
+  const importLine = import_chalk3.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
   return `${importLine}
   ${extraImports || ""}
 
   const App = ({ Component, pageProps }) => {
   return (
-    ${import_chalk4.default.green("+ <Tina>")}
+    ${import_chalk3.default.green("+ <Tina>")}
         <Component {...pageProps} />
-    ${import_chalk4.default.green("+ </Tina>")}
+    ${import_chalk3.default.green("+ </Tina>")}
   )
 }
 
@@ -1203,24 +905,35 @@ const DynamicTina = ({ children }) => {
 export default DynamicTina
 `;
 
+// src/utils/theme.ts
+var import_chalk4 = __toModule(require("chalk"));
+var successText = import_chalk4.default.bold.green;
+var dangerText = import_chalk4.default.bold.red;
+var neutralText = import_chalk4.default.bold.cyan;
+var labelText = import_chalk4.default.bold;
+var cmdText = import_chalk4.default.inverse;
+var logText = import_chalk4.default.italic.gray;
+var warnText = import_chalk4.default.yellowBright.bgBlack;
+var CONFIRMATION_TEXT = import_chalk4.default.dim("enter to confirm");
+
 // src/utils/script-helpers.ts
 function generateGqlScript(scriptValue) {
-  return `tinacms server:start -c "${scriptValue}"`;
+  return `tinacms dev -c "${scriptValue}"`;
 }
 function extendNextScripts(scripts) {
   return __spreadProps(__spreadValues({}, scripts), {
-    dev: generateGqlScript(scripts.dev || "next dev"),
-    build: generateGqlScript(scripts.build || "next build"),
-    start: generateGqlScript(scripts.start || "next start")
+    dev: generateGqlScript((scripts == null ? void 0 : scripts.dev) || "next dev"),
+    build: `tinacms build && ${(scripts == null ? void 0 : scripts.build) || "next build"}`,
+    start: `tinacms build && ${(scripts == null ? void 0 : scripts.start) || "next start"}`
   });
 }
 
 // src/cmds/init/index.ts
-var import_fs_extra2 = __toModule(require("fs-extra"));
+var import_fs_extra = __toModule(require("fs-extra"));
 var import_progress = __toModule(require("progress"));
 var import_metrics2 = __toModule(require("@tinacms/metrics"));
 var import_chalk5 = __toModule(require("chalk"));
-var import_path3 = __toModule(require("path"));
+var import_path2 = __toModule(require("path"));
 var import_prompts2 = __toModule(require("prompts"));
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
@@ -1247,7 +960,10 @@ async function initTina(ctx, next, options) {
 var MIN_REACT_VERSION = ">=16.14.0";
 async function checkDeps(ctx, next, options) {
   const bar = new import_progress.default("Checking dependencies. :prog", 1);
-  const packageJSON = JSON.parse((await import_fs_extra2.default.readFileSync(packageJSONPath)).toString());
+  if (!import_fs_extra.default.existsSync(packageJSONPath)) {
+    throw new Error("No package.json Found. Please run tinacms init at the root of your app");
+  }
+  const packageJSON = JSON.parse((await import_fs_extra.default.readFileSync(packageJSONPath)).toString());
   if (!checkPackage(packageJSON, "react") || !checkPackage(packageJSON, "react-dom")) {
     const message = `Unable to initialize Tina due to outdated dependencies, try upgrading the following packages:
       "react@${MIN_REACT_VERSION}"
@@ -1269,6 +985,9 @@ var checkPackage = (packageJSON, packageName) => {
       strippedVersion = version2.replace(/^[^a-zA-Z0-9]*|[^a-zA-Z0-9]*$/g, "");
     }
   });
+  if (!strippedVersion) {
+    throw new Error(`Please add ${packageName} to your project`);
+  }
   return checkVersion(strippedVersion);
 };
 var checkVersion = (version2) => {
@@ -1313,33 +1032,33 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-var packageJSONPath = import_path3.default.join(baseDir, "package.json");
-var blogContentPath = import_path3.default.join(baseDir, "content", "posts");
-var blogPostPath = import_path3.default.join(blogContentPath, "HelloWorld.md");
-var TinaFolder = import_path3.default.join(baseDir, ".tina");
-var componentFolder = import_path3.default.join(TinaFolder, "components");
-var TinaProviderPath = import_path3.default.join(componentFolder, "TinaProvider.js");
-var TinaDynamicProvider = import_path3.default.join(componentFolder, "TinaDynamicProvider.js");
+var packageJSONPath = import_path2.default.join(baseDir, "package.json");
+var blogContentPath = import_path2.default.join(baseDir, "content", "posts");
+var blogPostPath = import_path2.default.join(blogContentPath, "HelloWorld.mdx");
+var TinaFolder = import_path2.default.join(baseDir, ".tina");
+var componentFolder = import_path2.default.join(TinaFolder, "components");
+var TinaProviderPath = import_path2.default.join(componentFolder, "TinaProvider.js");
+var TinaDynamicProvider = import_path2.default.join(componentFolder, "TinaDynamicProvider.js");
 async function tinaSetup(_ctx, next, _options) {
-  const usingSrc = !import_fs_extra2.default.pathExistsSync(import_path3.default.join(baseDir, "pages"));
-  if (!import_fs_extra2.default.pathExistsSync(blogPostPath)) {
+  const usingSrc = !import_fs_extra.default.pathExistsSync(import_path2.default.join(baseDir, "pages"));
+  if (!import_fs_extra.default.pathExistsSync(blogPostPath)) {
     logger.info(logText("Adding a content folder..."));
-    import_fs_extra2.default.mkdirpSync(blogContentPath);
-    import_fs_extra2.default.writeFileSync(blogPostPath, blogPost);
+    import_fs_extra.default.mkdirpSync(blogContentPath);
+    import_fs_extra.default.writeFileSync(blogPostPath, blogPost);
   }
-  if (!import_fs_extra2.default.existsSync(TinaProviderPath) && !import_fs_extra2.default.existsSync(TinaDynamicProvider)) {
-    import_fs_extra2.default.mkdirpSync(componentFolder);
-    import_fs_extra2.default.writeFileSync(TinaProviderPath, TinaProvider.replace(/'\.\.\/schema\.ts'/, `'../schema.${_ctx.schemaFileType || "ts"}'`));
-    import_fs_extra2.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
+  if (!import_fs_extra.default.existsSync(TinaProviderPath) && !import_fs_extra.default.existsSync(TinaDynamicProvider)) {
+    import_fs_extra.default.mkdirpSync(componentFolder);
+    import_fs_extra.default.writeFileSync(TinaProviderPath, TinaProvider.replace(/'\.\.\/schema\.ts'/, `'../schema.${_ctx.schemaFileType || "ts"}'`));
+    import_fs_extra.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
   }
   logger.level = "info";
-  const pagesPath = import_path3.default.join(baseDir, usingSrc ? "src" : "", "pages");
-  const appPath = import_path3.default.join(pagesPath, "_app.js");
-  const appPathTS = import_path3.default.join(pagesPath, "_app.tsx");
-  const appExtension = import_fs_extra2.default.existsSync(appPath) ? ".js" : ".tsx";
-  if (!import_fs_extra2.default.pathExistsSync(appPath) && !import_fs_extra2.default.pathExistsSync(appPathTS)) {
+  const pagesPath = import_path2.default.join(baseDir, usingSrc ? "src" : "", "pages");
+  const appPath = import_path2.default.join(pagesPath, "_app.js");
+  const appPathTS = import_path2.default.join(pagesPath, "_app.tsx");
+  const appExtension = import_fs_extra.default.existsSync(appPath) ? ".js" : ".tsx";
+  if (!import_fs_extra.default.pathExistsSync(appPath) && !import_fs_extra.default.pathExistsSync(appPathTS)) {
     logger.info(logText("Adding _app.js ... \u2705"));
-    import_fs_extra2.default.writeFileSync(appPath, AppJsContent(usingSrc));
+    import_fs_extra.default.writeFileSync(appPath, AppJsContent(usingSrc));
   } else {
     const override = await (0, import_prompts2.default)({
       name: "res",
@@ -1349,40 +1068,43 @@ async function tinaSetup(_ctx, next, _options) {
     _ctx.overrideApp = override.res;
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
-      const appPathWithExtension = import_path3.default.join(pagesPath, `_app${appExtension}`);
-      const fileContent = import_fs_extra2.default.pathExistsSync(appPath) ? (0, import_fs_extra2.readFileSync)(appPath) : (0, import_fs_extra2.readFileSync)(appPathTS);
+      const appPathWithExtension = import_path2.default.join(pagesPath, `_app${appExtension}`);
+      const fileContent = import_fs_extra.default.pathExistsSync(appPath) ? (0, import_fs_extra.readFileSync)(appPath) : (0, import_fs_extra.readFileSync)(appPathTS);
       const matches = [
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
       ];
       const primaryMatches = matches.map((x) => x[0]);
-      import_fs_extra2.default.writeFileSync(appPathWithExtension, AppJsContent(usingSrc, primaryMatches.join("\n")));
+      import_fs_extra.default.writeFileSync(appPathWithExtension, AppJsContent(usingSrc, primaryMatches.join("\n")));
     }
   }
-  const tinaBlogPagePath = import_path3.default.join(pagesPath, "demo", "blog");
-  const tinaBlogPagePathFile = import_path3.default.join(tinaBlogPagePath, "[filename].js");
-  if (!import_fs_extra2.default.pathExistsSync(tinaBlogPagePathFile)) {
-    import_fs_extra2.default.mkdirpSync(tinaBlogPagePath);
-    import_fs_extra2.default.writeFileSync(tinaBlogPagePathFile, nextPostPage());
+  const tinaBlogPagePath = import_path2.default.join(pagesPath, "demo", "blog");
+  const tinaBlogPagePathFile = import_path2.default.join(tinaBlogPagePath, "[filename].js");
+  if (!import_fs_extra.default.pathExistsSync(tinaBlogPagePathFile)) {
+    import_fs_extra.default.mkdirpSync(tinaBlogPagePath);
+    import_fs_extra.default.writeFileSync(tinaBlogPagePathFile, nextPostPage({ usingSrc }));
   }
   logger.info("Adding a content folder... \u2705");
-  const packagePath = import_path3.default.join(baseDir, "package.json");
-  const pack = JSON.parse((0, import_fs_extra2.readFileSync)(packagePath).toString());
-  const oldScripts = pack.scripts || {};
-  const newPack = JSON.stringify(__spreadProps(__spreadValues({}, pack), {
-    scripts: extendNextScripts(oldScripts)
-  }), null, 2);
-  (0, import_fs_extra2.writeFileSync)(packagePath, newPack);
-  const adminPath = import_path3.default.join(pagesPath, "admin.js");
-  if (import_fs_extra2.default.pathExistsSync(import_path3.default.join(pagesPath, "admin"))) {
+  if (!import_fs_extra.default.existsSync(packageJSONPath)) {
+    throw new Error("No package.json Found. Please run tinacms init at the root of your app");
+  } else {
+    const pack = JSON.parse((0, import_fs_extra.readFileSync)(packageJSONPath).toString());
+    const oldScripts = pack.scripts || {};
+    const newPack = JSON.stringify(__spreadProps(__spreadValues({}, pack), {
+      scripts: extendNextScripts(oldScripts)
+    }), null, 2);
+    (0, import_fs_extra.writeFileSync)(packageJSONPath, newPack);
+  }
+  const adminPath = import_path2.default.join(pagesPath, "admin.js");
+  if (import_fs_extra.default.pathExistsSync(import_path2.default.join(pagesPath, "admin"))) {
     logger.warn(`Unable to add /pages/admin.js, this path already exists.
 	Learn more about toggling edit-mode at https://tina.io/docs/tinacms-context/#manually-toggling-edit-mode`);
     return next();
   }
-  (0, import_fs_extra2.outputFileSync)(adminPath, adminPage);
+  (0, import_fs_extra.outputFileSync)(adminPath, adminPage);
   next();
 }
 async function successMessage(ctx, next, options) {
-  const usingSrc = import_fs_extra2.default.pathExistsSync(import_path3.default.join(baseDir, "src"));
+  const usingSrc = import_fs_extra.default.pathExistsSync(import_path2.default.join(baseDir, "src"));
   logger.info(`Tina setup ${import_chalk5.default.underline.green("done")} \u2705
 `);
   logger.info("Next Steps: \n");
@@ -1431,7 +1153,7 @@ var chain = async (cmds, options) => {
 var import_chalk7 = __toModule(require("chalk"));
 
 // src/cmds/start-server/errors/index.ts
-var import_graphql10 = __toModule(require("@tinacms/graphql"));
+var import_graphql3 = __toModule(require("@tinacms/graphql"));
 var BuildSchemaError = class extends Error {
   constructor(message) {
     super(message);
@@ -1457,8 +1179,8 @@ var handleServerErrors = (e) => {
     logger.error(`${dangerText("ERROR: your schema was not successfully validated: see https://tina.io/docs/schema/ for instructions on how to setup a schema")}
   Error Message Below
   ${e}`);
-  } else if (e instanceof import_graphql10.TinaFetchError) {
-    (0, import_graphql10.handleFetchErrorError)(e, true);
+  } else if (e instanceof import_graphql3.TinaFetchError) {
+    (0, import_graphql3.handleFetchErrorError)(e, true);
   } else {
     logger.info(dangerText("Compilation failed with errors. Server has not been restarted.") + ` see error below 
  ${e.message}`);
@@ -1466,72 +1188,78 @@ var handleServerErrors = (e) => {
 };
 
 // src/cmds/compile/index.ts
-var import_fs_extra4 = __toModule(require("fs-extra"));
-var import_path5 = __toModule(require("path"));
+var import_fs_extra3 = __toModule(require("fs-extra"));
+var import_path4 = __toModule(require("path"));
 var import_esbuild = __toModule(require("esbuild"));
 
 // src/cmds/compile/defaultSchema.ts
 var defaultSchema = `
-import { defineSchema, defineConfig } from "tinacms";
+import { defineSchema, defineConfig } from 'tinacms'
+import { client } from './__generated__/client'
 
+
+const branch =
+  process.env.NEXT_PUBLIC_TINA_BRANCH ||
+  process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF ||
+  process.env.HEAD ||
+  'main'
 const schema = defineSchema({
+  // See https://tina.io/docs/tina-cloud/connecting-site/ for more information about this config
+  config: {
+    token: '<Your Read Only Token>', // generated on app.tina.io,
+    clientId: '<Your Client ID>', // generated on app.tina.io
+    branch,
+  },
   collections: [
     {
-      label: "Blog Posts",
-      name: "posts",
-      path: "content/posts",
+      label: 'Blog Posts',
+      name: 'post',
+      path: 'content/posts',
+      format: 'mdx',
       fields: [
         {
-          type: "string",
-          label: "Title",
-          name: "title",
+          type: 'string',
+          label: 'Title',
+          name: 'title',
         },
         {
-          type: "rich-text",
-          label: "Blog Post Body",
-          name: "body",
+          type: 'rich-text',
+          label: 'Blog Post Body',
+          name: 'body',
           isBody: true,
           templates: [
             {
-              name: "PageSection",
-              label: "Page Section",
+              name: 'PageSection',
+              label: 'Page Section',
               fields: [
                 {
-                  type: "string",
-                  name: "heading",
-                  label: "Heading",
+                  type: 'string',
+                  name: 'heading',
+                  label: 'Heading',
                 },
                 {
-                  type: "string",
-                  name: "content",
-                  label: "Content",
+                  type: 'string',
+                  name: 'content',
+                  label: 'Content',
                   ui: {
-                    component: "textarea"
-                  }
-                }
+                    component: 'textarea',
+                  },
+                },
               ],
             },
-          ]
+          ],
         },
       ],
     },
   ],
-});
+})
 
 export default schema
 
 // Your tina config
-// ==============
-const branch = 'main'
-// When working locally, hit our local filesystem.
-// On a Vercel deployment, hit the Tina Cloud API
-const apiURL =
-  process.env.NODE_ENV == 'development'
-    ? 'http://localhost:4001/graphql'
-    : \`https://content.tinajs.io/content/\${process.env.NEXT_PUBLIC_TINA_CLIENT_ID}/github/\${branch}\`
 
 export const tinaConfig = defineConfig({
-  apiURL,
+  client,
   schema,
   cmsCallback: (cms) => {
     //  add your CMS callback code here (if you want)
@@ -1540,41 +1268,42 @@ export const tinaConfig = defineConfig({
     /**
      * 1. Import \`tinacms\` and \`RouteMappingPlugin\`
      **/
-    import("tinacms").then(({ RouteMappingPlugin }) => {
+    import('tinacms').then(({ RouteMappingPlugin }) => {
       /**
        * 2. Define the \`RouteMappingPlugin\` see https://tina.io/docs/tinacms-context/#the-routemappingplugin for more details
        **/
       const RouteMapping = new RouteMappingPlugin((collection, document) => {
-        return undefined;
-      });
+        return undefined
+      })
       /**
        * 3. Add the \`RouteMappingPlugin\` to the \`cms\`.
        **/
-      cms.plugins.add(RouteMapping);
-    });
+      cms.plugins.add(RouteMapping)
+    })
 
-    return cms;
+    return cms
   },
-});
+})
+
 `;
 
 // src/lib/getPath.ts
-var import_path4 = __toModule(require("path"));
-var import_fs_extra3 = __toModule(require("fs-extra"));
+var import_path3 = __toModule(require("path"));
+var import_fs_extra2 = __toModule(require("fs-extra"));
 var getPath = ({
   projectDir,
   filename,
   allowedTypes,
   errorMessage
 }) => {
-  if (!import_fs_extra3.default.existsSync(projectDir)) {
+  if (!import_fs_extra2.default.existsSync(projectDir)) {
     throw new Error(errorMessage);
   }
-  const filePaths = allowedTypes.map((ext) => import_path4.default.join(projectDir, `${filename}.${ext}`));
+  const filePaths = allowedTypes.map((ext) => import_path3.default.join(projectDir, `${filename}.${ext}`));
   let inputFile = void 0;
-  filePaths.every((path4) => {
-    if (import_fs_extra3.default.existsSync(path4)) {
-      inputFile = path4;
+  filePaths.every((path7) => {
+    if (import_fs_extra2.default.existsSync(path7)) {
+      inputFile = path7;
       return false;
     }
     return true;
@@ -1598,29 +1327,48 @@ var getClientPath = ({ projectDir }) => {
 };
 
 // src/cmds/compile/index.ts
-var tinaPath = import_path5.default.join(process.cwd(), ".tina");
-var packageJSONFilePath = import_path5.default.join(process.cwd(), "package.json");
-var tinaGeneratedPath = import_path5.default.join(tinaPath, "__generated__");
-var tinaConfigPath = import_path5.default.join(tinaGeneratedPath, "config");
-var resetGeneratedFolder = async () => {
+var resetGeneratedFolder = async ({
+  tinaGeneratedPath,
+  usingTs
+}) => {
   try {
-    await import_fs_extra4.default.rm(tinaGeneratedPath, {
+    await import_fs_extra3.default.rm(tinaGeneratedPath, {
       recursive: true
     });
   } catch (e) {
     console.log(e);
   }
-  await import_fs_extra4.default.mkdir(tinaGeneratedPath);
-  await import_fs_extra4.default.writeFile(import_path5.default.join(tinaGeneratedPath, "types.ts"), `
+  await import_fs_extra3.default.mkdir(tinaGeneratedPath);
+  const ext = usingTs ? "ts" : "js";
+  await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `types.${ext}`), `
 export const queries = (client)=>({})
 `);
-  await import_fs_extra4.default.outputFile(import_path5.default.join(tinaGeneratedPath, ".gitignore"), "db");
+  await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `client.${ext}`), `
+export const client = {}
+`);
+  await import_fs_extra3.default.outputFile(import_path4.default.join(tinaGeneratedPath, ".gitignore"), `db
+client.ts
+client.js
+types.ts
+types.js
+types.d.ts
+frags.gql
+queries.gql
+schema.gql
+`);
 };
 var cleanup = async ({ tinaTempPath }) => {
-  await import_fs_extra4.default.remove(tinaTempPath);
+  await import_fs_extra3.default.remove(tinaTempPath);
 };
 var compileClient = async (ctx, next, options) => {
-  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp_client");
+  const root2 = ctx.rootPath;
+  if (!root2) {
+    throw new Error("ctx.rootPath has not been attached");
+  }
+  const tinaPath = import_path4.default.join(root2, ".tina");
+  const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
+  const packageJSONFilePath = import_path4.default.join(root2, "package.json");
+  const tinaTempPath = import_path4.default.join(tinaGeneratedPath, "temp_client");
   if (!options.clientFileType)
     options = __spreadProps(__spreadValues({}, options), { clientFileType: "ts" });
   if (options.verbose) {
@@ -1635,8 +1383,9 @@ var compileClient = async (ctx, next, options) => {
     ctx.clientFileType = requestedClientFileType;
   }
   let clientExists = true;
+  const projectDir = import_path4.default.join(tinaPath, "__generated__");
   try {
-    getClientPath({ projectDir: tinaPath });
+    getClientPath({ projectDir });
   } catch {
     clientExists = false;
   }
@@ -1651,8 +1400,10 @@ var compileClient = async (ctx, next, options) => {
     if (!process.env.NODE_ENV) {
       define["process.env.NODE_ENV"] = options.dev ? '"development"' : '"production"';
     }
-    const inputFile = getClientPath({ projectDir: tinaPath });
-    await transpile(inputFile, "client.js", tinaTempPath, options.verbose, define);
+    const inputFile = getClientPath({
+      projectDir
+    });
+    await transpile(inputFile, "client.js", tinaTempPath, options.verbose, define, packageJSONFilePath);
   } catch (e) {
     await cleanup({ tinaTempPath });
     throw new BuildSchemaError(e);
@@ -1663,7 +1414,7 @@ var compileClient = async (ctx, next, options) => {
     }
   });
   try {
-    const clientFunc = require(import_path5.default.join(tinaTempPath, "client.js"));
+    const clientFunc = require(import_path4.default.join(tinaTempPath, "client.js"));
     const client = clientFunc.default;
     ctx.client = client;
     await cleanup({ tinaTempPath });
@@ -1678,10 +1429,21 @@ var compileClient = async (ctx, next, options) => {
   }
   return next();
 };
-var compileSchema = async (_ctx, _next, options) => {
-  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp_schema");
-  if (!options.schemaFileType)
-    options = __spreadProps(__spreadValues({}, options), { schemaFileType: "ts" });
+var compileSchema = async (ctx, _next, options) => {
+  const root2 = ctx.rootPath;
+  if (!root2) {
+    throw new Error("ctx.rootPath has not been attached");
+  }
+  const tinaPath = import_path4.default.join(root2, ".tina");
+  const tsConfigPath = import_path4.default.join(root2, "tsconfig.json");
+  const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
+  const tinaTempPath = import_path4.default.join(tinaGeneratedPath, "temp_schema");
+  const tinaConfigPath = import_path4.default.join(tinaGeneratedPath, "config");
+  const packageJSONFilePath = import_path4.default.join(root2, "package.json");
+  if (!options.schemaFileType) {
+    const usingTs = await import_fs_extra3.default.pathExists(tsConfigPath);
+    options = __spreadProps(__spreadValues({}, options), { schemaFileType: usingTs ? "ts" : "js" });
+  }
   if (options.verbose) {
     logger.info(logText("Compiling Schema..."));
   }
@@ -1690,8 +1452,8 @@ var compileSchema = async (_ctx, _next, options) => {
   if (!schemaFileType2) {
     throw new Error(`Requested schema file type '${requestedSchemaFileType}' is not valid. Supported schema file types: 'ts, js, tsx, jsx'`);
   }
-  if (_ctx) {
-    _ctx.schemaFileType = schemaFileType2;
+  if (ctx) {
+    ctx.schemaFileType = schemaFileType2;
   }
   let schemaExists = true;
   try {
@@ -1704,9 +1466,9 @@ var compileSchema = async (_ctx, _next, options) => {
       .tina/schema.${schemaFileType2} not found, Creating one for you...
       See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
       `));
-    const file = import_path5.default.join(tinaPath, `schema.${schemaFileType2}`);
-    await import_fs_extra4.default.ensureFile(file);
-    await import_fs_extra4.default.writeFile(file, defaultSchema);
+    const file = import_path4.default.join(tinaPath, `schema.${schemaFileType2}`);
+    await import_fs_extra3.default.ensureFile(file);
+    await import_fs_extra3.default.writeFile(file, defaultSchema);
   }
   try {
     const define = {};
@@ -1714,7 +1476,7 @@ var compileSchema = async (_ctx, _next, options) => {
       define["process.env.NODE_ENV"] = options.dev ? '"development"' : '"production"';
     }
     const inputFile = getSchemaPath({ projectDir: tinaPath });
-    await transpile(inputFile, "schema.js", tinaTempPath, options.verbose, define);
+    await transpile(inputFile, "schema.js", tinaTempPath, options.verbose, define, packageJSONFilePath);
   } catch (e) {
     await cleanup({ tinaTempPath });
     throw new BuildSchemaError(e);
@@ -1725,104 +1487,376 @@ var compileSchema = async (_ctx, _next, options) => {
     }
   });
   try {
-    const schemaFunc = require(import_path5.default.join(tinaTempPath, "schema.js"));
-    const schemaObject = schemaFunc.default;
-    await import_fs_extra4.default.outputFile(import_path5.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
-    await cleanup({ tinaTempPath });
-  } catch (e) {
-    await cleanup({ tinaTempPath });
-    if (e instanceof Error) {
-      if (e.name === "TinaSchemaValidationError") {
-        throw e;
+    const schemaFunc = require(import_path4.default.join(tinaTempPath, "schema.js"));
+    const schemaObject = schemaFunc.default;
+    ctx.schema = schemaObject;
+    await import_fs_extra3.default.outputFile(import_path4.default.join(tinaConfigPath, "schema.json"), JSON.stringify(schemaObject, null, 2));
+    await cleanup({ tinaTempPath });
+  } catch (e) {
+    await cleanup({ tinaTempPath });
+    if (e instanceof Error) {
+      if (e.name === "TinaSchemaValidationError") {
+        throw e;
+      }
+    }
+    throw new ExecuteSchemaError(e);
+  }
+};
+var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJSONFilePath) => {
+  if (verbose)
+    logger.info(logText("Building javascript..."));
+  const packageJSON = JSON.parse(import_fs_extra3.default.readFileSync(packageJSONFilePath).toString() || "{}");
+  const deps = (packageJSON == null ? void 0 : packageJSON.dependencies) || [];
+  const peerDeps = (packageJSON == null ? void 0 : packageJSON.peerDependencies) || [];
+  const devDeps = (packageJSON == null ? void 0 : packageJSON.devDependencies) || [];
+  const external = Object.keys(__spreadValues(__spreadValues(__spreadValues({}, deps), peerDeps), devDeps));
+  const outputPath = import_path4.default.join(tempDir, outputFile);
+  await (0, import_esbuild.build)({
+    bundle: true,
+    platform: "neutral",
+    target: ["node10.4"],
+    entryPoints: [inputFile],
+    treeShaking: true,
+    external: [...external, "./node_modules/*"],
+    loader: loaders,
+    outfile: outputPath,
+    define
+  });
+  if (verbose)
+    logger.info(logText(`Javascript built`));
+};
+var defineSchema = (config) => {
+  return config;
+};
+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/cmds/start-server/index.ts
+var import_path11 = __toModule(require("path"));
+var import_chalk6 = __toModule(require("chalk"));
+var import_chokidar = __toModule(require("chokidar"));
+var import_metrics3 = __toModule(require("@tinacms/metrics"));
+
+// src/buildTina/index.ts
+var import_async_retry = __toModule(require("async-retry"));
+var import_fs_extra6 = __toModule(require("fs-extra"));
+var import_graphql10 = __toModule(require("@tinacms/graphql"));
+var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
+var import_path8 = __toModule(require("path"));
+
+// src/cmds/query-gen/attachSchema.ts
+var import_graphql4 = __toModule(require("@tinacms/graphql"));
+var import_datalayer = __toModule(require("@tinacms/datalayer"));
+
+// src/cmds/query-gen/genTypes.ts
+var import_graphql9 = __toModule(require("graphql"));
+var import_fs_extra4 = __toModule(require("fs-extra"));
+var import_path6 = __toModule(require("path"));
+
+// src/codegen/index.ts
+var import_graphql8 = __toModule(require("graphql"));
+
+// src/codegen/plugin.ts
+var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
+  return `
+// TinaSDK generated code
+import { createClient, TinaClient } from "tinacms/dist/client";
+
+const generateRequester = (client: TinaClient) => {
+  const requester: (
+    doc: any,
+    vars?: any,
+    options?: any,
+    client
+  ) => Promise<any> = async (doc, vars, _options) => {
+    const data = await client.request({
+      query: doc,
+      variables: vars,
+    });
+
+    return { data: data?.data, query: doc, variables: vars || {} };
+  };
+
+  return requester;
+};
+
+/**
+ * @experimental this class can be used but may change in the future
+ **/
+export const ExperimentalGetTinaClient = () =>
+  getSdk(
+    generateRequester(createClient({ url: "http://localhost:4001/graphql", queries }))
+  );
+
+export const queries = (client: TinaClient) => {
+  const requester = generateRequester(client);
+  return getSdk(requester);
+};
+`;
+};
+var AddGeneratedClient = {
+  plugin: AddGeneratedClientFunc
+};
+
+// src/codegen/index.ts
+var import_graphql_file_loader = __toModule(require("@graphql-tools/graphql-file-loader"));
+var import_core = __toModule(require("@graphql-codegen/core"));
+var import_load = __toModule(require("@graphql-tools/load"));
+var import_typescript_operations = __toModule(require("@graphql-codegen/typescript-operations"));
+var import_typescript = __toModule(require("@graphql-codegen/typescript"));
+
+// src/codegen/sdkPlugin/index.ts
+var import_graphql6 = __toModule(require("graphql"));
+var import_graphql7 = __toModule(require("graphql"));
+var import_path5 = __toModule(require("path"));
+
+// src/codegen/sdkPlugin/visitor.ts
+var import_visitor_plugin_common = __toModule(require("@graphql-codegen/visitor-plugin-common"));
+var import_auto_bind = __toModule(require("auto-bind"));
+var import_graphql5 = __toModule(require("graphql"));
+var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBaseVisitor {
+  constructor(schema, fragments, rawConfig) {
+    super(schema, fragments, rawConfig, {
+      usingObservableFrom: rawConfig.usingObservableFrom
+    });
+    this._operationsToInclude = [];
+    (0, import_auto_bind.default)(this);
+    if (this.config.usingObservableFrom) {
+      this._additionalImports.push(this.config.usingObservableFrom);
+    }
+    if (this.config.documentMode !== import_visitor_plugin_common.DocumentMode.string) {
+    }
+  }
+  buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
+    if (node.name == null) {
+      throw new Error("Plugin 'generic-sdk' cannot generate SDK for unnamed operation.\n\n" + (0, import_graphql5.print)(node));
+    } else {
+      this._operationsToInclude.push({
+        node,
+        documentVariableName,
+        operationType,
+        operationResultType: `{data: ${operationResultType}, variables: ${operationVariablesTypes}, query: string}`,
+        operationVariablesTypes
+      });
+    }
+    return null;
+  }
+  get sdkContent() {
+    const usingObservable = !!this.config.usingObservableFrom;
+    const allPossibleActions = this._operationsToInclude.map((o) => {
+      const optionalVariables = !o.node.variableDefinitions || o.node.variableDefinitions.length === 0 || o.node.variableDefinitions.every((v) => v.type.kind !== import_graphql5.Kind.NON_NULL_TYPE || v.defaultValue);
+      const returnType = usingObservable && o.operationType === "Subscription" ? "Observable" : "Promise";
+      return `${o.node.name.value}(variables${optionalVariables ? "?" : ""}: ${o.operationVariablesTypes}, options?: C): ${returnType}<${o.operationResultType}> {
+    return requester<${o.operationResultType}, ${o.operationVariablesTypes}>(${o.documentVariableName}, variables, options);
+  }`;
+    }).map((s) => (0, import_visitor_plugin_common.indentMultiline)(s, 2));
+    return `export type Requester<C= {}> = <R, V>(doc: ${this.config.documentMode === import_visitor_plugin_common.DocumentMode.string ? "string" : "DocumentNode"}, vars?: V, options?: C) => ${usingObservable ? "Promise<R> & Observable<R>" : "Promise<R>"}
+  export function getSdk<C>(requester: Requester<C>) {
+    return {
+  ${allPossibleActions.join(",\n")}
+    };
+  }
+  export type Sdk = ReturnType<typeof getSdk>;`;
+  }
+};
+
+// src/codegen/sdkPlugin/index.ts
+var plugin = (schema, documents, config) => {
+  const allAst = (0, import_graphql7.concatAST)(documents.reduce((prev, v) => {
+    return [...prev, v.document];
+  }, []));
+  const allFragments = [
+    ...allAst.definitions.filter((d) => d.kind === import_graphql7.Kind.FRAGMENT_DEFINITION).map((fragmentDef) => ({
+      node: fragmentDef,
+      name: fragmentDef.name.value,
+      onType: fragmentDef.typeCondition.name.value,
+      isExternal: false
+    })),
+    ...config.externalFragments || []
+  ];
+  const visitor = new GenericSdkVisitor(schema, allFragments, config);
+  const visitorResult = (0, import_graphql6.visit)(allAst, { leave: visitor });
+  return {
+    content: [
+      visitor.fragments,
+      ...visitorResult.definitions.filter((t) => typeof t === "string"),
+      visitor.sdkContent
+    ].join("\n")
+  };
+};
+
+// src/codegen/index.ts
+var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd(), options = {
+  noSDK: false,
+  verbose: false
+}) => {
+  if (options.verbose)
+    logger.info("Generating types...");
+  try {
+    let docs = [];
+    let fragDocs = [];
+    try {
+      if (!options.noSDK) {
+        docs = await (0, import_load.loadDocuments)(queryPathGlob, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
+    } catch (e) {
+      let showErrorMessage = true;
+      const message = e.message || "";
+      if (message.includes("Unable to find any GraphQL type definitions for the following pointers:")) {
+        showErrorMessage = false;
+      }
+      if (showErrorMessage) {
+        console.error(e);
       }
     }
-    throw new ExecuteSchemaError(e);
+    try {
+      if (!options.noSDK) {
+        fragDocs = await (0, import_load.loadDocuments)(fragDocPath, {
+          loaders: [new import_graphql_file_loader.GraphQLFileLoader()]
+        });
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    const res = await (0, import_core.codegen)({
+      filename: process.cwd(),
+      schema: (0, import_graphql8.parse)((0, import_graphql8.printSchema)(schema)),
+      documents: [...docs, ...fragDocs],
+      config: {},
+      plugins: [
+        { typescript: {} },
+        { typescriptOperations: {} },
+        {
+          typescriptSdk: {}
+        },
+        { AddGeneratedClient: {} }
+      ],
+      pluginMap: {
+        typescript: {
+          plugin: import_typescript.plugin
+        },
+        typescriptOperations: {
+          plugin: import_typescript_operations.plugin
+        },
+        typescriptSdk: {
+          plugin
+        },
+        AddGeneratedClient
+      }
+    });
+    return res;
+  } catch (e) {
+    console.error(e);
   }
 };
-var transpile = async (inputFile, outputFile, tempDir, verbose, define) => {
-  if (verbose)
-    logger.info(logText("Building javascript..."));
-  const packageJSON = JSON.parse(import_fs_extra4.default.readFileSync(packageJSONFilePath).toString() || "{}");
-  const deps = (packageJSON == null ? void 0 : packageJSON.dependencies) || [];
-  const peerDeps = (packageJSON == null ? void 0 : packageJSON.peerDependencies) || [];
-  const devDeps = (packageJSON == null ? void 0 : packageJSON.devDependencies) || [];
-  const external = Object.keys(__spreadValues(__spreadValues(__spreadValues({}, deps), peerDeps), devDeps));
-  const outputPath = import_path5.default.join(tempDir, outputFile);
-  await (0, import_esbuild.build)({
-    bundle: true,
-    platform: "neutral",
-    target: ["node10.4"],
-    entryPoints: [inputFile],
-    treeShaking: true,
-    external: [...external, "./node_modules/*"],
-    loader: loaders,
-    outfile: outputPath,
-    define
-  });
-  if (verbose)
-    logger.info(logText(`Javascript built`));
-};
-var defineSchema = (config) => {
-  return config;
-};
-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/cmds/start-server/index.ts
-var import_datalayer3 = __toModule(require("@tinacms/datalayer"));
-var import_graphql11 = __toModule(require("@tinacms/graphql"));
 
-// src/cmds/start-server/lock.ts
-var AsyncLock = class {
-  constructor() {
-    this.disable = () => {
-    };
-    this.promise = Promise.resolve();
-  }
-  enable() {
-    this.promise = new Promise((resolve2) => this.disable = resolve2);
+// src/cmds/query-gen/genTypes.ts
+var import_esbuild2 = __toModule(require("esbuild"));
+var TINA_HOST = "content.tinajs.io";
+var root = process.cwd();
+var generatedPath = import_path6.default.join(root, ".tina", "__generated__");
+async function genClient({
+  tinaSchema,
+  usingTs
+}, next, options) {
+  var _a, _b, _c;
+  const branch = (_a = tinaSchema == null ? void 0 : tinaSchema.config) == null ? void 0 : _a.branch;
+  const clientId = (_b = tinaSchema == null ? void 0 : tinaSchema.config) == null ? void 0 : _b.clientId;
+  const token = (_c = tinaSchema.config) == null ? void 0 : _c.token;
+  if ((!branch || !clientId || !token) && !(options == null ? void 0 : options.local)) {
+    const missing = [];
+    if (!branch)
+      missing.push("branch");
+    if (!clientId)
+      missing.push("clientId");
+    if (!token)
+      missing.push("token");
+    throw new Error(`Client not configured properly. Missing ${missing.join(", ")}. Please visit https://tina.io/docs/tina-cloud/connecting-site/ for more information`);
+  }
+  const apiURL = options.local ? "http://localhost:4001/graphql" : `https://${TINA_HOST}/content/${clientId}/github/${branch}`;
+  const clientPath = import_path6.default.join(generatedPath, `client.${usingTs ? "ts" : "js"}`);
+  import_fs_extra4.default.writeFileSync(clientPath, `import { createClient } from "tinacms/dist/client";
+import { queries } from "./types";
+export const client = createClient({ url: '${apiURL}', token: '${token}', queries });
+export default client;
+  `);
+  return next();
+}
+async function genTypes({ schema, usingTs }, next, options) {
+  const typesPath = process.cwd() + "/.tina/__generated__/types.ts";
+  const typesJSPath = process.cwd() + "/.tina/__generated__/types.js";
+  const typesDPath = process.cwd() + "/.tina/__generated__/types.d.ts";
+  const fragPath = process.cwd() + "/.tina/__generated__/*.{graphql,gql}";
+  const queryPathGlob = process.cwd() + "/.tina/queries/**/*.{graphql,gql}";
+  const typescriptTypes = await generateTypes(schema, queryPathGlob, fragPath, options);
+  const code = `//@ts-nocheck
+  // DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
+  export function gql(strings: TemplateStringsArray, ...args: string[]): string {
+    let str = ''
+    strings.forEach((string, i) => {
+      str += string + (args[i] || '')
+    })
+    return str
+  }
+  ${typescriptTypes}
+  `;
+  if (usingTs) {
+    await import_fs_extra4.default.outputFile(typesPath, code);
+    logger.info(`	Typescript types => ${logText(typesPath)}`);
+  } else {
+    await import_fs_extra4.default.outputFile(typesDPath, code);
+    const jsCode = await (0, import_esbuild2.transform)(code, { loader: "ts" });
+    await import_fs_extra4.default.outputFile(typesJSPath, jsCode.code);
   }
-};
+  const schemaString = await (0, import_graphql9.printSchema)(schema);
+  const schemaPath = process.cwd() + "/.tina/__generated__/schema.gql";
+  await import_fs_extra4.default.outputFile(schemaPath, `# DO NOT MODIFY THIS FILE. This file is automatically generated by Tina
+${schemaString}
+schema {
+  query: Query
+  mutation: Mutation
+}
+  `);
+  logger.info(`	GraphQL types ====> ${logText(schemaPath)}
+`);
+  next();
+}
 
-// src/cmds/start-server/index.ts
-var import_metrics3 = __toModule(require("@tinacms/metrics"));
-var import_chalk6 = __toModule(require("chalk"));
-var import_chokidar = __toModule(require("chokidar"));
-var import_fs_extra6 = __toModule(require("fs-extra"));
+// src/buildTina/git.ts
+var import_fs_extra5 = __toModule(require("fs-extra"));
 var import_ini = __toModule(require("ini"));
 var import_os = __toModule(require("os"));
-var import_path8 = __toModule(require("path"));
-var buildLock = new AsyncLock();
-var reBuildLock = new AsyncLock();
-var gqlPackageFile = require.resolve("@tinacms/graphql");
+var import_path7 = __toModule(require("path"));
 var resolveGitRoot = async () => {
-  const pathParts = process.cwd().split(import_path8.default.sep);
+  const pathParts = process.cwd().split(import_path7.default.sep);
   while (true) {
-    const pathToGit = pathParts.join(import_path8.default.sep);
-    if (await import_fs_extra6.default.pathExists(import_path8.default.join(pathToGit, ".git"))) {
+    const pathToGit = pathParts.join(import_path7.default.sep);
+    if (await import_fs_extra5.default.pathExists(import_path7.default.join(pathToGit, ".git"))) {
       return pathToGit;
     }
     if (!pathParts.length) {
@@ -1847,9 +1881,9 @@ async function makeIsomorphicOptions(fsBridge) {
       await fsBridge.delete(filepath);
     }
   };
-  const userGitConfig = `${import_os.default.homedir()}${import_path8.default.sep}.gitconfig`;
-  if (await import_fs_extra6.default.pathExists(userGitConfig)) {
-    const config = import_ini.default.parse(await import_fs_extra6.default.readFile(userGitConfig, "utf-8"));
+  const userGitConfig = `${import_os.default.homedir()}${import_path7.default.sep}.gitconfig`;
+  if (await import_fs_extra5.default.pathExists(userGitConfig)) {
+    const config = import_ini.default.parse(await import_fs_extra5.default.readFile(userGitConfig, "utf-8"));
     if ((_a = config["user"]) == null ? void 0 : _a["name"]) {
       options.author.name = config["user"]["name"];
     }
@@ -1859,7 +1893,7 @@ async function makeIsomorphicOptions(fsBridge) {
   }
   let repoGitConfig = void 0;
   if (!options.author.name) {
-    repoGitConfig = import_ini.default.parse(await import_fs_extra6.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
+    repoGitConfig = import_ini.default.parse(await import_fs_extra5.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
     if ((_c = repoGitConfig["user"]) == null ? void 0 : _c["name"]) {
       options.author.name = repoGitConfig["user"]["name"];
     }
@@ -1868,7 +1902,7 @@ async function makeIsomorphicOptions(fsBridge) {
     }
   }
   if (!options.author.email) {
-    repoGitConfig = repoGitConfig || import_ini.default.parse(await import_fs_extra6.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
+    repoGitConfig = repoGitConfig || import_ini.default.parse(await import_fs_extra5.default.readFile(`${gitRoot}/.git/config`, "utf-8"));
     if ((_d = repoGitConfig["user"]) == null ? void 0 : _d["email"]) {
       options.author.email = repoGitConfig["user"]["email"];
     }
@@ -1878,63 +1912,188 @@ async function makeIsomorphicOptions(fsBridge) {
   }
   return options;
 }
-async function startServer(_ctx, next, {
+
+// src/buildTina/index.ts
+var buildSetupCmdBuild = async (ctx, next, opts) => {
+  const rootPath2 = ctx.rootPath;
+  const { bridge, database, store } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
+    rootPath: rootPath2,
+    useMemoryStore: true
+  }));
+  ctx.bridge = bridge;
+  ctx.database = database;
+  ctx.store = store;
+  next();
+};
+var buildSetupCmdServerStart = async (ctx, next, opts) => {
+  const rootPath2 = ctx.rootPath;
+  const { bridge, database, store } = await buildSetup(__spreadProps(__spreadValues({}, opts), {
+    rootPath: rootPath2,
+    useMemoryStore: false
+  }));
+  ctx.bridge = bridge;
+  ctx.database = database;
+  ctx.store = store;
+  next();
+};
+var buildSetupCmdAudit = async (ctx, next, options) => {
+  const rootPath2 = ctx.rootPath;
+  const bridge = options.clean ? new import_datalayer2.FilesystemBridge(rootPath2) : new import_datalayer2.AuditFileSystemBridge(rootPath2);
+  const store = new import_datalayer2.LevelStore(rootPath2, false);
+  const database = await (0, import_graphql10.createDatabase)({ store, bridge });
+  ctx.bridge = bridge;
+  ctx.database = database;
+  ctx.store = store;
+  next();
+};
+var buildSetup = async ({
+  isomorphicGitBridge: isomorphicGitBridge2,
+  experimentalData,
+  rootPath: rootPath2,
+  useMemoryStore
+}) => {
+  const fsBridge = new import_datalayer2.FilesystemBridge(rootPath2);
+  const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
+  const bridge = isomorphicGitBridge2 ? new import_datalayer2.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
+  const store = new import_datalayer2.LevelStore(rootPath2, useMemoryStore);
+  const database = await (0, import_graphql10.createDatabase)({ store, bridge });
+  return { database, bridge, store };
+};
+var buildCmdBuild = async (ctx, next, options) => {
+  const bridge = ctx.bridge;
+  const database = ctx.database;
+  const store = ctx.store;
+  await build2(__spreadProps(__spreadValues({}, options), {
+    bridge,
+    database,
+    store,
+    ctx,
+    skipIndex: true
+  }));
+  next();
+};
+var auditCmdBuild = async (ctx, next, options) => {
+  const bridge = ctx.bridge;
+  const database = ctx.database;
+  const store = ctx.store;
+  await build2(__spreadProps(__spreadValues({}, options), {
+    local: true,
+    verbose: true,
+    bridge,
+    database,
+    store,
+    ctx
+  }));
+  next();
+};
+var build2 = async ({
+  noWatch,
+  ctx,
+  bridge,
+  database,
+  store,
+  beforeBuild,
+  afterBuild,
+  dev,
+  local,
+  verbose,
+  noSDK,
+  skipIndex
+}) => {
+  const rootPath2 = ctx.rootPath;
+  if (!rootPath2) {
+    throw new Error("Root path has not been attached");
+  }
+  const tinaGeneratedPath = import_path8.default.join(rootPath2, ".tina", "__generated__");
+  database.clearCache();
+  if (beforeBuild) {
+    await beforeBuild();
+  }
+  try {
+    await import_fs_extra6.default.mkdirp(tinaGeneratedPath);
+    await store.close();
+    await resetGeneratedFolder({
+      tinaGeneratedPath,
+      usingTs: ctx.usingTs
+    });
+    await store.open();
+    const cliFlags = [];
+    cliFlags.push("experimentalData");
+    cliFlags.push("isomorphicGitBridge");
+    const database2 = await (0, import_graphql10.createDatabase)({ store, bridge });
+    await compileSchema(ctx, null, { verbose, dev });
+    const schema = await (0, import_async_retry.default)(async () => await (0, import_graphql10.buildSchema)(rootPath2, database2, cliFlags, skipIndex));
+    await genTypes({ schema, usingTs: ctx.usingTs }, () => {
+    }, {
+      noSDK,
+      verbose
+    });
+    await genClient({ tinaSchema: ctx.schema, usingTs: ctx.usingTs }, () => {
+    }, {
+      local
+    });
+  } catch (error) {
+    throw error;
+  } finally {
+    if (afterBuild) {
+      await afterBuild();
+    }
+  }
+};
+
+// src/cmds/start-server/lock.ts
+var AsyncLock = class {
+  constructor() {
+    this.disable = () => {
+    };
+    this.promise = Promise.resolve();
+  }
+  enable() {
+    this.promise = new Promise((resolve2) => this.disable = resolve2);
+  }
+};
+
+// src/cmds/start-server/index.ts
+var buildLock = new AsyncLock();
+var reBuildLock = new AsyncLock();
+var gqlPackageFile = require.resolve("@tinacms/graphql");
+async function startServer(ctx, next, {
   port = 4001,
   noWatch,
-  experimentalData,
   isomorphicGitBridge: isomorphicGitBridge2,
   noSDK,
   noTelemetry,
   watchFolders,
   verbose,
-  dev
+  dev,
+  local
 }) {
   buildLock.disable();
   reBuildLock.disable();
-  const rootPath2 = process.cwd();
+  const rootPath2 = ctx.rootPath;
   const t = new import_metrics3.Telemetry({ disabled: Boolean(noTelemetry) });
   t.submitRecord({
     event: {
       name: "tinacms:cli:server:start:invoke"
     }
   });
-  const fsBridge = new import_datalayer3.FilesystemBridge(rootPath2);
-  const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
-  const bridge = isomorphicGitBridge2 ? new import_datalayer3.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
-  const store = experimentalData ? new import_datalayer3.LevelStore(rootPath2) : new import_datalayer3.FilesystemStore({ rootPath: rootPath2 });
+  const bridge = ctx.bridge;
+  const database = ctx.database;
+  const store = ctx.store;
   const shouldBuild = bridge.supportsBuilding();
-  const database = await (0, import_graphql11.createDatabase)({ store, bridge });
   let ready = false;
-  const build2 = async (noSDK2) => {
-    database.clearCache();
-    await buildLock.promise;
-    buildLock.enable();
-    try {
-      if (!process.env.CI && !noWatch) {
-        await store.close();
-        await resetGeneratedFolder();
-        await store.open();
-      }
-      const cliFlags = [];
-      if (isomorphicGitBridge2) {
-        cliFlags.push("isomorphicGitBridge");
-      }
-      const database2 = await (0, import_graphql11.createDatabase)({ store, bridge });
-      await compileSchema(null, null, { verbose, dev });
-      const schema = await (0, import_graphql11.buildSchema)(rootPath2, database2, cliFlags);
-      await genTypes({ schema }, () => {
-      }, { noSDK: noSDK2, verbose });
-    } catch (error) {
-      throw error;
-    } finally {
-      buildLock.disable();
-    }
-  };
   const state = {
     server: null,
     sockets: []
   };
   let isReady = false;
+  const beforeBuild = async () => {
+    await buildLock.promise;
+    buildLock.enable();
+  };
+  const afterBuild = async () => {
+    buildLock.disable();
+  };
   const start = async () => {
     await buildLock.promise;
     buildLock.enable();
@@ -1983,7 +2142,7 @@ or`);
       });
     });
   };
-  const foldersToWatch = (watchFolders || []).map((x) => import_path8.default.join(rootPath2, x));
+  const foldersToWatch = (watchFolders || []).map((x) => import_path11.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
       ...foldersToWatch,
@@ -1993,14 +2152,27 @@ or`);
       ignored: [
         "**/node_modules/**/*",
         "**/.next/**/*",
-        `${import_path8.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+        `${import_path11.default.resolve(rootPath2)}/.tina/__generated__/**/*`
       ]
     }).on("ready", async () => {
       if (verbose)
         console.log("Generating Tina config");
       try {
         if (shouldBuild) {
-          await build2(noSDK);
+          await build2({
+            bridge,
+            ctx,
+            database,
+            store,
+            dev,
+            isomorphicGitBridge: isomorphicGitBridge2,
+            local: true,
+            noSDK,
+            noWatch,
+            verbose,
+            beforeBuild,
+            afterBuild
+          });
         }
         ready = true;
         isReady = true;
@@ -2018,7 +2190,20 @@ or`);
         logger.info("Tina change detected, regenerating config");
         try {
           if (shouldBuild) {
-            await build2(noSDK);
+            await build2({
+              bridge,
+              ctx,
+              database,
+              store,
+              dev,
+              isomorphicGitBridge: isomorphicGitBridge2,
+              local: true,
+              noSDK,
+              noWatch,
+              verbose,
+              beforeBuild,
+              afterBuild
+            });
           }
           if (isReady) {
             await restart();
@@ -2041,7 +2226,20 @@ or`);
       logger.info("Detected CI environment, omitting watch commands...");
     }
     if (shouldBuild) {
-      await build2(noSDK);
+      await build2({
+        bridge,
+        ctx,
+        database,
+        store,
+        dev,
+        isomorphicGitBridge: isomorphicGitBridge2,
+        local: true,
+        noSDK,
+        noWatch,
+        verbose,
+        beforeBuild,
+        afterBuild
+      });
     }
     await start();
     next();
@@ -2147,13 +2345,22 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 };
 
+// src/buildTina/attachPath.ts
+var import_fs_extra8 = __toModule(require("fs-extra"));
+var import_path12 = __toModule(require("path"));
+var attachPath = async (ctx, next, _options) => {
+  ctx.rootPath = process.cwd();
+  const tinaPath = import_path12.default.join(ctx.rootPath, ".tina");
+  ctx.usingTs = await (0, import_fs_extra8.pathExists)(import_path12.default.join(tinaPath, "schema.ts")) || await (0, import_fs_extra8.pathExists)(import_path12.default.join(tinaPath, "schema.tsx"));
+  next();
+};
+
 // src/cmds/baseCmds.ts
-var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
-var CMD_COMPILE_MODELS = "schema:compile";
-var CMD_WAIT_FOR_DB = "server:waitForDB";
+var CMD_DEV = "dev";
 var INIT = "init";
 var AUDIT = "audit";
+var CMD_BUILD = "build";
 var startServerPortOption = {
   name: "--port <port>",
   description: "Specify a port to run the server on. (default 4001)"
@@ -2207,6 +2414,17 @@ var developmentOption = {
   name: "--dev",
   description: "Uses NODE_ENV=development when compiling client and schema"
 };
+var localOption = {
+  name: "--local",
+  description: "Uses the local file system graphql server",
+  defaultValue: false
+};
+var checkOptions = async (_ctx, next, options) => {
+  if (options == null ? void 0 : options.experimentalData) {
+    logger.warn(warnText("Warning: you are using the `--experimentalData`flag. This flag is not needed and can safely be removed. It will be deprecated in a future version"));
+  }
+  next();
+};
 var baseCmds = [
   {
     command: CMD_START_SERVER,
@@ -2221,39 +2439,62 @@ var baseCmds = [
       noTelemetryOption,
       watchFileOption,
       verboseOption,
-      developmentOption
+      developmentOption,
+      localOption
     ],
-    action: (options) => chain([startServer, startSubprocess], options)
+    action: (options) => chain([
+      attachPath,
+      async (ctx, next, _) => {
+        logger.warn(warnText("server:start will be deprecated in the future, please use `tinacms dev` instead"));
+        next();
+      },
+      checkOptions,
+      buildSetupCmdServerStart,
+      startServer,
+      startSubprocess
+    ], options)
   },
   {
-    command: CMD_WAIT_FOR_DB,
-    description: "Wait for DB to finish indexing, start subprocess",
+    command: CMD_DEV,
+    description: "Builds tina and starts the dev server.",
     options: [
+      startServerPortOption,
       subCommand,
-      experimentalDatalayer,
       isomorphicGitBridge,
+      noWatchOption,
+      noSDKCodegenOption,
       noTelemetryOption,
-      verboseOption,
-      developmentOption
+      watchFileOption,
+      verboseOption
     ],
-    action: (options) => chain([compileClient, waitForDB, startSubprocess], options)
-  },
-  {
-    command: CMD_COMPILE_MODELS,
-    description: "Compile schema into static files for the server",
-    options: [experimentalDatalayer, isomorphicGitBridge, noTelemetryOption],
-    action: (options) => chain([compileSchema], options)
+    action: (options) => chain([
+      attachPath,
+      checkOptions,
+      buildSetupCmdServerStart,
+      startServer,
+      startSubprocess
+    ], options)
   },
   {
-    command: CMD_GEN_TYPES,
-    description: "Generate a GraphQL query for your site's schema, (and optionally Typescript types)",
+    command: CMD_BUILD,
+    description: "Build Tina",
     options: [
       experimentalDatalayer,
       isomorphicGitBridge,
       noSDKCodegenOption,
-      noTelemetryOption
+      noTelemetryOption,
+      verboseOption,
+      developmentOption,
+      localOption
     ],
-    action: (options) => chain([attachSchema, genTypes], options)
+    action: (options) => chain([
+      attachPath,
+      checkOptions,
+      buildSetupCmdBuild,
+      buildCmdBuild,
+      compileClient,
+      waitForDB
+    ], options)
   },
   {
     command: INIT,
@@ -2265,15 +2506,13 @@ var baseCmds = [
     ],
     description: "Add Tina Cloud to an existing project",
     action: (options) => chain([
+      attachPath,
+      checkOptions,
       checkDeps,
       initTina,
       installDeps,
-      async (_ctx, next, options2) => {
-        await compileSchema(_ctx, next, options2);
-        next();
-      },
-      attachSchema,
-      genTypes,
+      buildSetupCmdBuild,
+      buildCmdBuild,
       tinaSetup,
       successMessage
     ], options)
@@ -2283,16 +2522,9 @@ var baseCmds = [
     command: AUDIT,
     description: "Audit your schema and the files to check for errors",
     action: (options) => chain([
-      async (_ctx, next) => {
-        logger.level = "error";
-        next();
-      },
-      async (_ctx, next) => {
-        await compileSchema(_ctx, next, options);
-        next();
-      },
-      attachSchema,
-      genTypes,
+      attachPath,
+      buildSetupCmdAudit,
+      auditCmdBuild,
       async (_ctx, next) => {
         logger.level = "info";
         logger.info(import_chalk7.default.hex("#eb6337").bgWhite("Welcome to tina audit \u{1F999}"));