@tinacms/cli 0.61.12 → 0.61.14

package/dist/index.js

@@ -70,11 +70,11 @@ var init_utils = __esm({
 });
 
 // src/server/models/media.ts
-var import_fs_extra8, import_path10, MediaModel;
+var import_fs_extra8, import_path11, MediaModel;
 var init_media = __esm({
   "src/server/models/media.ts"() {
     import_fs_extra8 = __toModule(require("fs-extra"));
-    import_path10 = __toModule(require("path"));
+    import_path11 = __toModule(require("path"));
     init_utils();
     MediaModel = class {
       constructor({ publicFolder, mediaRoot }) {
@@ -83,11 +83,11 @@ var init_media = __esm({
       }
       async listMedia(args) {
         try {
-          const folderPath = (0, import_path10.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          const folderPath = (0, import_path11.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           const searchPath = parseMediaFolder(args.searchPath);
           const filesStr = await import_fs_extra8.default.readdir(folderPath);
           const filesProm = filesStr.map(async (file) => {
-            const filePath = (0, import_path10.join)(folderPath, file);
+            const filePath = (0, import_path11.join)(folderPath, file);
             const stat = await import_fs_extra8.default.stat(filePath);
             let src = `/${file}`;
             const isFile = stat.isFile();
@@ -144,7 +144,7 @@ var init_media = __esm({
       }
       async deleteMedia(args) {
         try {
-          const file = (0, import_path10.join)(this.publicFolder, this.mediaRoot, args.searchPath);
+          const file = (0, import_path11.join)(this.publicFolder, this.mediaRoot, args.searchPath);
           await import_fs_extra8.default.stat(file);
           await import_fs_extra8.default.remove(file);
           return { ok: true };
@@ -158,15 +158,15 @@ var init_media = __esm({
 });
 
 // src/server/routes/index.ts
-var import_express, import_path11, import_multer, createMediaRouter;
+var import_express, import_path12, import_multer, createMediaRouter;
 var init_routes = __esm({
   "src/server/routes/index.ts"() {
     import_express = __toModule(require("express"));
-    import_path11 = __toModule(require("path"));
+    import_path12 = __toModule(require("path"));
     import_multer = __toModule(require("multer"));
     init_media();
-    createMediaRouter = (config) => {
-      const mediaFolder = (0, import_path11.join)(process.cwd(), config.publicFolder, config.mediaRoot);
+    createMediaRouter = (config2) => {
+      const mediaFolder = (0, import_path12.join)(process.cwd(), config2.publicFolder, config2.mediaRoot);
       const storage = import_multer.default.diskStorage({
         destination: function(req, file, cb) {
           cb(null, mediaFolder);
@@ -177,7 +177,8 @@ var init_routes = __esm({
         }
       });
       const upload = (0, import_multer.default)({ storage });
-      const mediaModel = new MediaModel(config);
+      const uploadRoute = upload.single("file");
+      const mediaModel = new MediaModel(config2);
       const mediaRouter = (0, import_express.Router)();
       mediaRouter.get("/list/*", async (req, res) => {
         const folder = req.params[0];
@@ -195,8 +196,16 @@ var init_routes = __esm({
         const didDelete = await mediaModel.deleteMedia({ searchPath: file });
         res.json(didDelete);
       });
-      mediaRouter.post("/upload/*", upload.single("file"), function(req, res) {
-        res.json({ success: true });
+      mediaRouter.post("/upload/*", async function(req, res) {
+        await uploadRoute(req, res, (err) => {
+          if (err instanceof import_multer.default.MulterError) {
+            res.status(500).json({ message: err.message });
+          } else if (err) {
+            res.status(500).json({ message: err.message });
+          } else {
+            res.json({ success: true });
+          }
+        });
       });
       return mediaRouter;
     };
@@ -240,11 +249,11 @@ var init_server = __esm({
       }));
       app.post("/graphql", async (req, res) => {
         const { query, variables } = req.body;
-        const config = {
+        const config2 = {
           useRelativeMedia: true
         };
         const result = await gqlPackage.resolve({
-          config,
+          config: config2,
           database,
           query,
           variables,
@@ -254,7 +263,7 @@ var init_server = __esm({
       });
       const db = database;
       const schema = await db.getSchema();
-      const mediaPaths = ((_c = (_b = (_a = schema == null ? void 0 : schema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.media) == null ? void 0 : _c.tina) || {};
+      const mediaPaths = (_c = (_b = (_a = schema == null ? void 0 : schema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.media) == null ? void 0 : _c.tina;
       app.use("/media", createMediaRouter({
         publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
         mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
@@ -293,7 +302,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.61.12";
+var version = "0.61.14";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -506,6 +515,9 @@ var printFinalMessage = async (ctx, next, _options) => {
   next();
 };
 
+// src/cmds/init/index.ts
+var import_path3 = __toModule(require("path"));
+
 // src/cmds/init/setup-files/index.ts
 var import_chalk4 = __toModule(require("chalk"));
 var adminPage = `import { TinaAdmin } from 'tinacms';
@@ -873,12 +885,145 @@ function extendNextScripts(scripts) {
 }
 
 // src/cmds/init/index.ts
-var import_fs_extra = __toModule(require("fs-extra"));
+var import_fs_extra2 = __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_path2 = __toModule(require("path"));
+var import_path4 = __toModule(require("path"));
 var import_prompts2 = __toModule(require("prompts"));
+
+// src/lib/getPath.ts
+var import_path2 = __toModule(require("path"));
+var import_fs_extra = __toModule(require("fs-extra"));
+var fileExists = ({
+  projectDir,
+  filename,
+  allowedTypes
+}) => {
+  if (!import_fs_extra.default.existsSync(projectDir)) {
+    return false;
+  }
+  const filePaths = allowedTypes.map((ext) => import_path2.default.join(projectDir, `${filename}.${ext}`));
+  let inputFile = void 0;
+  filePaths.every((path10) => {
+    if (import_fs_extra.default.existsSync(path10)) {
+      inputFile = path10;
+      return false;
+    }
+    return true;
+  });
+  return Boolean(inputFile);
+};
+var getPath = ({
+  projectDir,
+  filename,
+  allowedTypes,
+  errorMessage
+}) => {
+  if (!import_fs_extra.default.existsSync(projectDir)) {
+    throw new Error(errorMessage);
+  }
+  const filePaths = allowedTypes.map((ext) => import_path2.default.join(projectDir, `${filename}.${ext}`));
+  let inputFile = void 0;
+  filePaths.every((path10) => {
+    if (import_fs_extra.default.existsSync(path10)) {
+      inputFile = path10;
+      return false;
+    }
+    return true;
+  });
+  if (!inputFile) {
+    throw new Error(errorMessage);
+  }
+  return inputFile;
+};
+var getClientPath = ({ projectDir }) => {
+  const filename = "client";
+  const allowedTypes = ["js", "ts"];
+  const errorMessage = "Must provide a `.tina/client.{ts,js}`";
+  return getPath({ projectDir, filename, allowedTypes, errorMessage });
+};
+
+// src/cmds/compile/defaultSchema.ts
+var defaultSchema = `
+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: 'post',
+      path: 'content/posts',
+      format: 'mdx',
+      ui: {
+        router: ({ document }) => {
+          // This can be used to add contextual editing to your site. See https://tina.io/docs/tinacms-context/#accessing-contextual-editing-from-the-cms for more information.
+          return \`/demo/blog/\${document._sys.filename}\`
+        },
+      },
+      fields: [
+        {
+          type: 'string',
+          label: 'Title',
+          name: 'title',
+        },
+        {
+          type: 'rich-text',
+          label: 'Blog Post Body',
+          name: 'body',
+          isBody: true,
+          templates: [
+            {
+              name: 'PageSection',
+              label: 'Page Section',
+              fields: [
+                {
+                  type: 'string',
+                  name: 'heading',
+                  label: 'Heading',
+                },
+                {
+                  type: 'string',
+                  name: 'content',
+                  label: 'Content',
+                  ui: {
+                    component: 'textarea',
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  ],
+})
+
+export default schema
+
+// Your tina config
+
+export const tinaConfig = defineConfig({
+  client,
+  schema,
+})
+
+`;
+
+// src/cmds/init/index.ts
 function execShellCommand(cmd) {
   const exec = require("child_process").exec;
   return new Promise((resolve2, _reject) => {
@@ -892,22 +1037,37 @@ function execShellCommand(cmd) {
 }
 async function initTina(ctx, next, options) {
   const telemetry = new import_metrics2.Telemetry({ disabled: options.noTelemetry });
+  const root2 = ctx.rootPath;
+  const tsConfigPath = import_path3.default.join(root2, "tsconfig.json");
+  const usingTs = await import_fs_extra2.default.pathExists(tsConfigPath);
+  const schemaFileType2 = (options == null ? void 0 : options.schemaFileType) || usingTs ? "ts" : "js";
   await telemetry.submitRecord({
     event: {
       name: "tinacms:cli:init:invoke",
-      schemaFileType: options.schemaFileType || "ts"
+      schemaFileType: schemaFileType2
     }
   });
   logger.info(successText("Setting up Tina..."));
+  const tinaPath = import_path3.default.join(root2, ".tina");
+  const schemaExists = fileExists({
+    projectDir: tinaPath,
+    filename: "schema",
+    allowedTypes: ["js", "jsx", "tsx", "ts"]
+  });
+  if (!schemaExists) {
+    const file = import_path3.default.join(tinaPath, `schema.${schemaFileType2}`);
+    await import_fs_extra2.default.ensureFile(file);
+    await import_fs_extra2.default.writeFile(file, defaultSchema);
+  }
   next();
 }
 var MIN_REACT_VERSION = ">=16.14.0";
 async function checkDeps(ctx, next, options) {
   const bar = new import_progress.default("Checking dependencies. :prog", 1);
-  if (!import_fs_extra.default.existsSync(packageJSONPath)) {
+  if (!import_fs_extra2.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());
+  const packageJSON = JSON.parse((await import_fs_extra2.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}"
@@ -976,33 +1136,33 @@ async function installDeps(ctx, next, options) {
   next();
 }
 var baseDir = process.cwd();
-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");
+var packageJSONPath = import_path4.default.join(baseDir, "package.json");
+var blogContentPath = import_path4.default.join(baseDir, "content", "posts");
+var blogPostPath = import_path4.default.join(blogContentPath, "HelloWorld.mdx");
+var TinaFolder = import_path4.default.join(baseDir, ".tina");
+var componentFolder = import_path4.default.join(TinaFolder, "components");
+var TinaProviderPath = import_path4.default.join(componentFolder, "TinaProvider.js");
+var TinaDynamicProvider = import_path4.default.join(componentFolder, "TinaDynamicProvider.js");
 async function tinaSetup(_ctx, next, _options) {
-  const usingSrc = !import_fs_extra.default.pathExistsSync(import_path2.default.join(baseDir, "pages"));
-  if (!import_fs_extra.default.pathExistsSync(blogPostPath)) {
+  const usingSrc = !import_fs_extra2.default.pathExistsSync(import_path4.default.join(baseDir, "pages"));
+  if (!import_fs_extra2.default.pathExistsSync(blogPostPath)) {
     logger.info(logText("Adding a content folder..."));
-    import_fs_extra.default.mkdirpSync(blogContentPath);
-    import_fs_extra.default.writeFileSync(blogPostPath, blogPost);
+    import_fs_extra2.default.mkdirpSync(blogContentPath);
+    import_fs_extra2.default.writeFileSync(blogPostPath, blogPost);
   }
-  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.usingTs ? "ts" : "js"}'`));
-    import_fs_extra.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
+  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.usingTs ? "ts" : "js"}'`));
+    import_fs_extra2.default.writeFileSync(TinaDynamicProvider, TinaProviderDynamic);
   }
   logger.level = "info";
-  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)) {
+  const pagesPath = import_path4.default.join(baseDir, usingSrc ? "src" : "", "pages");
+  const appPath = import_path4.default.join(pagesPath, "_app.js");
+  const appPathTS = import_path4.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)) {
     logger.info(logText("Adding _app.js ... \u2705"));
-    import_fs_extra.default.writeFileSync(appPath, AppJsContent(usingSrc));
+    import_fs_extra2.default.writeFileSync(appPath, AppJsContent(usingSrc));
   } else {
     const override = await (0, import_prompts2.default)({
       name: "res",
@@ -1012,43 +1172,43 @@ async function tinaSetup(_ctx, next, _options) {
     _ctx.overrideApp = override.res;
     if (override.res) {
       logger.info(logText(`Adding _app${appExtension} ... \u2705`));
-      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 appPathWithExtension = import_path4.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 matches = [
         ...fileContent.toString().matchAll(/^.*import.*\.css("|').*$/gm)
       ];
       const primaryMatches = matches.map((x) => x[0]);
-      import_fs_extra.default.writeFileSync(appPathWithExtension, AppJsContent(usingSrc, primaryMatches.join("\n")));
+      import_fs_extra2.default.writeFileSync(appPathWithExtension, AppJsContent(usingSrc, primaryMatches.join("\n")));
     }
   }
-  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 }));
+  const tinaBlogPagePath = import_path4.default.join(pagesPath, "demo", "blog");
+  const tinaBlogPagePathFile = import_path4.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({ usingSrc }));
   }
   logger.info("Adding a content folder... \u2705");
-  if (!import_fs_extra.default.existsSync(packageJSONPath)) {
+  if (!import_fs_extra2.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 pack = JSON.parse((0, import_fs_extra2.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);
+    (0, import_fs_extra2.writeFileSync)(packageJSONPath, newPack);
   }
-  const adminPath = import_path2.default.join(pagesPath, "admin.js");
-  if (import_fs_extra.default.pathExistsSync(import_path2.default.join(pagesPath, "admin"))) {
+  const adminPath = import_path4.default.join(pagesPath, "admin.js");
+  if (import_fs_extra2.default.pathExistsSync(import_path4.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_extra.outputFileSync)(adminPath, adminPage);
+  (0, import_fs_extra2.outputFileSync)(adminPath, adminPage);
   next();
 }
 async function successMessage(ctx, next, options) {
-  const usingSrc = import_fs_extra.default.pathExistsSync(import_path2.default.join(baseDir, "src"));
+  const usingSrc = import_fs_extra2.default.pathExistsSync(import_path4.default.join(baseDir, "src"));
   logger.info(`Tina setup ${import_chalk5.default.underline.green("done")} \u2705
 `);
   logger.info("Next Steps: \n");
@@ -1139,122 +1299,8 @@ var handleServerErrors = (e) => {
 
 // src/cmds/compile/index.ts
 var import_fs_extra3 = __toModule(require("fs-extra"));
-var import_path4 = __toModule(require("path"));
+var import_path5 = __toModule(require("path"));
 var import_esbuild = __toModule(require("esbuild"));
-
-// src/cmds/compile/defaultSchema.ts
-var defaultSchema = `
-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: 'post',
-      path: 'content/posts',
-      format: 'mdx',
-      ui: {
-        router: ({ document }) => {
-          // This can be used to add contextual editing to your site. See https://tina.io/docs/tinacms-context/#accessing-contextual-editing-from-the-cms for more information.
-          return \`/demo/blog/\${document._sys.filename}\`
-        },
-      },
-      fields: [
-        {
-          type: 'string',
-          label: 'Title',
-          name: 'title',
-        },
-        {
-          type: 'rich-text',
-          label: 'Blog Post Body',
-          name: 'body',
-          isBody: true,
-          templates: [
-            {
-              name: 'PageSection',
-              label: 'Page Section',
-              fields: [
-                {
-                  type: 'string',
-                  name: 'heading',
-                  label: 'Heading',
-                },
-                {
-                  type: 'string',
-                  name: 'content',
-                  label: 'Content',
-                  ui: {
-                    component: 'textarea',
-                  },
-                },
-              ],
-            },
-          ],
-        },
-      ],
-    },
-  ],
-})
-
-export default schema
-
-// Your tina config
-
-export const tinaConfig = defineConfig({
-  client,
-  schema,
-})
-
-`;
-
-// src/lib/getPath.ts
-var import_path3 = __toModule(require("path"));
-var import_fs_extra2 = __toModule(require("fs-extra"));
-var getPath = ({
-  projectDir,
-  filename,
-  allowedTypes,
-  errorMessage
-}) => {
-  if (!import_fs_extra2.default.existsSync(projectDir)) {
-    throw new Error(errorMessage);
-  }
-  const filePaths = allowedTypes.map((ext) => import_path3.default.join(projectDir, `${filename}.${ext}`));
-  let inputFile = void 0;
-  filePaths.every((path8) => {
-    if (import_fs_extra2.default.existsSync(path8)) {
-      inputFile = path8;
-      return false;
-    }
-    return true;
-  });
-  if (!inputFile) {
-    throw new Error(errorMessage);
-  }
-  return inputFile;
-};
-var getClientPath = ({ projectDir }) => {
-  const filename = "client";
-  const allowedTypes = ["js", "ts"];
-  const errorMessage = "Must provide a `.tina/client.{ts,js}`";
-  return getPath({ projectDir, filename, allowedTypes, errorMessage });
-};
-
-// src/cmds/compile/index.ts
 var resetGeneratedFolder = async ({
   tinaGeneratedPath,
   usingTs
@@ -1266,14 +1312,14 @@ var resetGeneratedFolder = async ({
   }
   await import_fs_extra3.default.mkdirp(tinaGeneratedPath);
   const ext = usingTs ? "ts" : "js";
-  await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `types.${ext}`), `
+  await import_fs_extra3.default.writeFile(import_path5.default.join(tinaGeneratedPath, `types.${ext}`), `
 export const queries = (client)=>({})
 `);
-  await import_fs_extra3.default.writeFile(import_path4.default.join(tinaGeneratedPath, `client.${ext}`), `
+  await import_fs_extra3.default.writeFile(import_path5.default.join(tinaGeneratedPath, `client.${ext}`), `
 export const client = ()=>{}
 export default client
 `);
-  await import_fs_extra3.default.outputFile(import_path4.default.join(tinaGeneratedPath, ".gitignore"), `db
+  await import_fs_extra3.default.outputFile(import_path5.default.join(tinaGeneratedPath, ".gitignore"), `db
 client.ts
 client.js
 types.ts
@@ -1282,6 +1328,7 @@ types.d.ts
 frags.gql
 queries.gql
 schema.gql
+out.jsx
 `);
 };
 var cleanup = async ({ tinaTempPath }) => {
@@ -1292,10 +1339,10 @@ var compileClient = async (ctx, next, options) => {
   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");
+  const tinaPath = import_path5.default.join(root2, ".tina");
+  const tinaGeneratedPath = import_path5.default.join(tinaPath, "__generated__");
+  const packageJSONFilePath = import_path5.default.join(root2, "package.json");
+  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, "temp_client");
   if (!options.clientFileType)
     options = __spreadProps(__spreadValues({}, options), { clientFileType: "ts" });
   if (options.verbose) {
@@ -1310,7 +1357,7 @@ var compileClient = async (ctx, next, options) => {
     ctx.clientFileType = requestedClientFileType;
   }
   let clientExists = true;
-  const projectDir = import_path4.default.join(tinaPath, "__generated__");
+  const projectDir = import_path5.default.join(tinaPath, "__generated__");
   try {
     getClientPath({ projectDir });
   } catch {
@@ -1341,7 +1388,7 @@ var compileClient = async (ctx, next, options) => {
     }
   });
   try {
-    const clientFunc = require(import_path4.default.join(tinaTempPath, "client.js"));
+    const clientFunc = require(import_path5.default.join(tinaTempPath, "client.js"));
     const client = clientFunc.default;
     ctx.client = client;
     await cleanup({ tinaTempPath });
@@ -1361,11 +1408,11 @@ var compileFile = async (options, fileName) => {
   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_${fileName}`);
-  const packageJSONFilePath = import_path4.default.join(root2, "package.json");
+  const tinaPath = import_path5.default.join(root2, ".tina");
+  const tsConfigPath = import_path5.default.join(root2, "tsconfig.json");
+  const tinaGeneratedPath = import_path5.default.join(tinaPath, "__generated__");
+  const tinaTempPath = import_path5.default.join(tinaGeneratedPath, `temp_${fileName}`);
+  const packageJSONFilePath = import_path5.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" });
@@ -1389,15 +1436,6 @@ var compileFile = async (options, fileName) => {
   } catch {
     schemaExists = false;
   }
-  if (!schemaExists && fileName === "schema") {
-    logger.info(dangerText(`
-      .tina/schema.${schemaFileType2} not found, Creating one for you...
-      See Documentation: https://tina.io/docs/tina-cloud/cli/#getting-started"
-      `));
-    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 = {};
     if (!process.env.NODE_ENV) {
@@ -1421,7 +1459,7 @@ var compileFile = async (options, fileName) => {
   });
   let returnObject = {};
   try {
-    const schemaFunc = require(import_path4.default.join(tinaTempPath, `${fileName}.js`));
+    const schemaFunc = require(import_path5.default.join(tinaTempPath, `${fileName}.js`));
     returnObject = schemaFunc.default;
     await cleanup({ tinaTempPath });
   } catch (e) {
@@ -1437,20 +1475,35 @@ var compileFile = async (options, fileName) => {
 };
 var compileSchema = async (options) => {
   const root2 = options.rootPath;
-  const tinaPath = import_path4.default.join(root2, ".tina");
-  const tinaGeneratedPath = import_path4.default.join(tinaPath, "__generated__");
-  const tinaConfigPath = import_path4.default.join(tinaGeneratedPath, "config");
-  let schema = await compileFile(options, "schema");
-  try {
-    const config = await compileFile(options, "config");
-    const configCopy = _.cloneDeep(config);
+  const tinaPath = import_path5.default.join(root2, ".tina");
+  const tinaGeneratedPath = import_path5.default.join(tinaPath, "__generated__");
+  const tinaConfigPath = import_path5.default.join(tinaGeneratedPath, "config");
+  let schemaExists = fileExists({
+    projectDir: tinaPath,
+    filename: "schema",
+    allowedTypes: ["js", "jsx", "tsx", "ts"]
+  });
+  const configExists = fileExists({
+    projectDir: tinaPath,
+    filename: "config",
+    allowedTypes: ["js", "jsx", "tsx", "ts"]
+  });
+  if (!schemaExists && !configExists) {
+    throw new Error("No schema or config file found in .tina folder. Please run `npx @tinacms/cli@latest init` to generate a schema file.");
+  }
+  let schema;
+  if (schemaExists) {
+    schema = await compileFile(options, "schema");
+  }
+  if (configExists) {
+    const config2 = await compileFile(options, "config");
+    const configCopy = _.cloneDeep(config2);
     delete configCopy.schema;
-    if (config == null ? void 0 : config.schema) {
-      schema = __spreadProps(__spreadValues({}, config.schema), { config: configCopy });
+    if (config2 == null ? void 0 : config2.schema) {
+      schema = __spreadProps(__spreadValues({}, config2.schema), { config: configCopy });
     }
-  } catch (e) {
   }
-  await import_fs_extra3.default.outputFile(import_path4.default.join(tinaConfigPath, `schema.json`), JSON.stringify(schema, null, 2));
+  await import_fs_extra3.default.outputFile(import_path5.default.join(tinaConfigPath, `schema.json`), JSON.stringify(schema, null, 2));
   return schema;
 };
 var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJSONFilePath) => {
@@ -1461,7 +1514,7 @@ var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJ
   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 prebuiltInputPath = import_path4.default.join(tempDir, "temp-output.jsx");
+  const prebuiltInputPath = import_path5.default.join(tempDir, "temp-output.jsx");
   await (0, import_esbuild.build)({
     bundle: true,
     platform: "neutral",
@@ -1473,9 +1526,9 @@ var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJ
     outfile: prebuiltInputPath,
     define
   });
-  const tempTsConfigPath = import_path4.default.join(tempDir, "temp-tsconfig.json");
+  const tempTsConfigPath = import_path5.default.join(tempDir, "temp-tsconfig.json");
   await import_fs_extra3.default.outputFileSync(tempTsConfigPath, "{}");
-  const outputPath = import_path4.default.join(tempDir, outputFile);
+  const outputPath = import_path5.default.join(tempDir, outputFile);
   await (0, import_esbuild.build)({
     bundle: true,
     platform: "neutral",
@@ -1491,8 +1544,8 @@ var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJ
   if (verbose)
     logger.info(logText(`Javascript built`));
 };
-var defineSchema = (config) => {
-  return config;
+var defineSchema = (config2) => {
+  return config2;
 };
 var loaders = {
   ".aac": "file",
@@ -1521,7 +1574,7 @@ var loaders = {
 };
 
 // src/cmds/start-server/index.ts
-var import_path12 = __toModule(require("path"));
+var import_path13 = __toModule(require("path"));
 var import_chalk6 = __toModule(require("chalk"));
 var import_chokidar = __toModule(require("chokidar"));
 var import_metrics3 = __toModule(require("@tinacms/metrics"));
@@ -1542,12 +1595,12 @@ var AsyncLock = class {
 var import_fs_extra7 = __toModule(require("fs-extra"));
 var import_graphql9 = __toModule(require("@tinacms/graphql"));
 var import_datalayer = __toModule(require("@tinacms/datalayer"));
-var import_path9 = __toModule(require("path"));
+var import_path10 = __toModule(require("path"));
 
 // src/cmds/query-gen/genTypes.ts
 var import_graphql8 = __toModule(require("graphql"));
 var import_fs_extra4 = __toModule(require("fs-extra"));
-var import_path6 = __toModule(require("path"));
+var import_path7 = __toModule(require("path"));
 
 // src/codegen/index.ts
 var import_graphql7 = __toModule(require("graphql"));
@@ -1604,7 +1657,7 @@ var import_typescript = __toModule(require("@graphql-codegen/typescript"));
 // src/codegen/sdkPlugin/index.ts
 var import_graphql5 = __toModule(require("graphql"));
 var import_graphql6 = __toModule(require("graphql"));
-var import_path5 = __toModule(require("path"));
+var import_path6 = __toModule(require("path"));
 
 // src/codegen/sdkPlugin/visitor.ts
 var import_visitor_plugin_common = __toModule(require("@graphql-codegen/visitor-plugin-common"));
@@ -1657,7 +1710,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
 };
 
 // src/codegen/sdkPlugin/index.ts
-var plugin = (schema, documents, config) => {
+var plugin = (schema, documents, config2) => {
   const allAst = (0, import_graphql6.concatAST)(documents.reduce((prev, v) => {
     return [...prev, v.document];
   }, []));
@@ -1668,9 +1721,9 @@ var plugin = (schema, documents, config) => {
       onType: fragmentDef.typeCondition.name.value,
       isExternal: false
     })),
-    ...config.externalFragments || []
+    ...config2.externalFragments || []
   ];
-  const visitor = new GenericSdkVisitor(schema, allFragments, config);
+  const visitor = new GenericSdkVisitor(schema, allFragments, config2);
   const visitorResult = (0, import_graphql5.visit)(allAst, { leave: visitor });
   return {
     content: [
@@ -1741,15 +1794,16 @@ var loadGraphQLDocuments = async (globPath) => {
 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__");
+var generatedPath = import_path7.default.join(root, ".tina", "__generated__");
 async function genClient({
   tinaSchema,
   usingTs
-}, next, options) {
-  var _a, _b, _c;
+}, options) {
+  var _a, _b, _c, _d, _e;
   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;
+  const baseUrl = ((_e = (_d = tinaSchema == null ? void 0 : tinaSchema.config) == null ? void 0 : _d.tinaioConfig) == null ? void 0 : _e.contentApiUrlOverride) || `https://${TINA_HOST}`;
   if ((!branch || !clientId || !token) && !(options == null ? void 0 : options.local)) {
     const missing = [];
     if (!branch)
@@ -1760,14 +1814,14 @@ async function genClient({
       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"}`);
+  const apiURL = options.local ? `http://localhost:${options.port || 4001}/graphql` : `${baseUrl}/content/${clientId}/github/${branch}`;
+  const clientPath = import_path7.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();
+  return apiURL;
 }
 async function genTypes({ schema, usingTs }, next, options) {
   const typesPath = process.cwd() + "/.tina/__generated__/types.ts";
@@ -1813,12 +1867,12 @@ schema {
 var import_fs_extra5 = __toModule(require("fs-extra"));
 var import_ini = __toModule(require("ini"));
 var import_os = __toModule(require("os"));
-var import_path7 = __toModule(require("path"));
+var import_path8 = __toModule(require("path"));
 var resolveGitRoot = async () => {
-  const pathParts = process.cwd().split(import_path7.default.sep);
+  const pathParts = process.cwd().split(import_path8.default.sep);
   while (true) {
-    const pathToGit = pathParts.join(import_path7.default.sep);
-    if (await import_fs_extra5.default.pathExists(import_path7.default.join(pathToGit, ".git"))) {
+    const pathToGit = pathParts.join(import_path8.default.sep);
+    if (await import_fs_extra5.default.pathExists(import_path8.default.join(pathToGit, ".git"))) {
       return pathToGit;
     }
     if (!pathParts.length) {
@@ -1843,14 +1897,14 @@ async function makeIsomorphicOptions(fsBridge) {
       await fsBridge.delete(filepath);
     }
   };
-  const userGitConfig = `${import_os.default.homedir()}${import_path7.default.sep}.gitconfig`;
+  const userGitConfig = `${import_os.default.homedir()}${import_path8.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"];
+    const config2 = import_ini.default.parse(await import_fs_extra5.default.readFile(userGitConfig, "utf-8"));
+    if ((_a = config2["user"]) == null ? void 0 : _a["name"]) {
+      options.author.name = config2["user"]["name"];
     }
-    if ((_b = config["user"]) == null ? void 0 : _b["email"]) {
-      options.author.email = config["user"]["email"];
+    if ((_b = config2["user"]) == null ? void 0 : _b["email"]) {
+      options.author.email = config2["user"]["email"];
     }
   }
   let repoGitConfig = void 0;
@@ -1896,20 +1950,21 @@ async function spin({
   spinner.start();
   const res = await waitFor();
   spinner.stop();
+  console.log("");
   return res;
 }
 
 // src/buildTina/attachPath.ts
 var import_fs_extra6 = __toModule(require("fs-extra"));
-var import_path8 = __toModule(require("path"));
+var import_path9 = __toModule(require("path"));
 var attachPath = async (ctx, next, _options) => {
   ctx.rootPath = process.cwd();
   ctx.usingTs = await isProjectTs(ctx.rootPath);
   next();
 };
 var isProjectTs = async (rootPath2) => {
-  const tinaPath = import_path8.default.join(rootPath2, ".tina");
-  return await (0, import_fs_extra6.pathExists)(import_path8.default.join(tinaPath, "schema.ts")) || await (0, import_fs_extra6.pathExists)(import_path8.default.join(tinaPath, "schema.tsx"));
+  const tinaPath = import_path9.default.join(rootPath2, ".tina");
+  return await (0, import_fs_extra6.pathExists)(import_path9.default.join(tinaPath, "schema.ts")) || await (0, import_fs_extra6.pathExists)(import_path9.default.join(tinaPath, "schema.tsx"));
 };
 
 // src/buildTina/index.ts
@@ -1938,6 +1993,7 @@ var buildSetupCmdServerStart = async (ctx, next, opts) => {
 var buildSetupCmdAudit = async (ctx, next, options) => {
   const rootPath2 = ctx.rootPath;
   const bridge = options.clean ? new import_datalayer.FilesystemBridge(rootPath2) : new import_datalayer.AuditFileSystemBridge(rootPath2);
+  await import_fs_extra7.default.ensureDirSync(import_path10.default.join(rootPath2, ".tina", "__generated__"));
   const store = new import_datalayer.LevelStore(rootPath2, false);
   const database = await (0, import_graphql9.createDatabase)({ store, bridge });
   ctx.bridge = bridge;
@@ -1953,6 +2009,7 @@ var buildSetup = async ({
   const fsBridge = new import_datalayer.FilesystemBridge(rootPath2);
   const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
   const bridge = isomorphicGitBridge2 ? new import_datalayer.IsomorphicBridge(rootPath2, isomorphicOptions) : fsBridge;
+  await import_fs_extra7.default.ensureDirSync(import_path10.default.join(rootPath2, ".tina", "__generated__"));
   const store = new import_datalayer.LevelStore(rootPath2, useMemoryStore);
   const database = await (0, import_graphql9.createDatabase)({ store, bridge });
   return { database, bridge, store };
@@ -1961,17 +2018,20 @@ var buildCmdBuild = async (ctx, next, options) => {
   const { schema } = await ctx.builder.build(__spreadValues({
     rootPath: ctx.rootPath
   }, options));
-  await ctx.builder.genTypedClient({
+  ctx.schema = schema;
+  const apiUrl = await ctx.builder.genTypedClient({
     compiledSchema: schema,
     local: options.local,
     noSDK: options.noSDK,
     verbose: options.verbose,
-    usingTs: ctx.usingTs
+    usingTs: ctx.usingTs,
+    port: options.port
   });
   await buildAdmin({
     local: options.local,
     rootPath: ctx.rootPath,
-    schema
+    schema,
+    apiUrl
   });
   next();
 };
@@ -1981,7 +2041,12 @@ var auditCmdBuild = async (ctx, next, options) => {
   }, options), {
     verbose: true
   }));
-  await ctx.database.indexContent({ graphQLSchema, tinaSchema });
+  await spin({
+    waitFor: async () => {
+      await ctx.database.indexContent({ graphQLSchema, tinaSchema });
+    },
+    text: "Indexing local files"
+  });
   next();
 };
 var ConfigBuilder = class {
@@ -1993,7 +2058,7 @@ var ConfigBuilder = class {
     if (!rootPath2) {
       throw new Error("Root path has not been attached");
     }
-    const tinaGeneratedPath = import_path9.default.join(rootPath2, ".tina", "__generated__");
+    const tinaGeneratedPath = import_path10.default.join(rootPath2, ".tina", "__generated__");
     this.database.clearCache();
     await import_fs_extra7.default.mkdirp(tinaGeneratedPath);
     await this.database.store.close();
@@ -2015,7 +2080,8 @@ var ConfigBuilder = class {
     compiledSchema,
     noSDK,
     verbose,
-    local
+    local,
+    port
   }) {
     const astSchema = await (0, import_graphql9.getASTSchema)(this.database);
     await genTypes({ schema: astSchema, usingTs }, () => {
@@ -2023,32 +2089,40 @@ var ConfigBuilder = class {
       noSDK,
       verbose
     });
-    await genClient({ tinaSchema: compiledSchema, usingTs }, () => {
-    }, {
-      local
+    return genClient({ tinaSchema: compiledSchema, usingTs }, {
+      local,
+      port
     });
   }
 };
 var buildAdmin = async ({
   schema,
   local,
-  rootPath: rootPath2
+  rootPath: rootPath2,
+  apiUrl
 }) => {
   var _a;
   if ((_a = schema == null ? void 0 : schema.config) == null ? void 0 : _a.build) {
-    await spin({
-      text: "Building static site",
-      waitFor: async () => {
-        var _a2, _b, _c, _d;
-        await (0, import_app.viteBuild)({
-          local,
-          rootPath: rootPath2,
-          outputFolder: (_b = (_a2 = schema == null ? void 0 : schema.config) == null ? void 0 : _a2.build) == null ? void 0 : _b.outputFolder,
-          publicFolder: (_d = (_c = schema == null ? void 0 : schema.config) == null ? void 0 : _c.build) == null ? void 0 : _d.publicFolder
-        });
-      }
-    });
-    console.log("\nDone building static site");
+    const buildVite = async () => {
+      var _a2, _b, _c, _d;
+      await (0, import_app.viteBuild)({
+        local,
+        rootPath: rootPath2,
+        outputFolder: (_b = (_a2 = schema == null ? void 0 : schema.config) == null ? void 0 : _a2.build) == null ? void 0 : _b.outputFolder,
+        publicFolder: (_d = (_c = schema == null ? void 0 : schema.config) == null ? void 0 : _c.build) == null ? void 0 : _d.publicFolder,
+        apiUrl
+      });
+    };
+    if (local) {
+      console.log("Starting Tina asset server");
+      await buildVite();
+    } else {
+      await spin({
+        text: "Building static site",
+        waitFor: buildVite
+      });
+      console.log("\nDone building static site");
+    }
   }
 };
 
@@ -2096,25 +2170,28 @@ async function startServer(ctx, next, {
     try {
       const s = (init_server3(), server_exports);
       state.server = await s.default(database);
-      state.server.listen(port, () => {
-        const altairUrl = `http://localhost:${port}/altair/`;
-        const cmsUrl = `[your-development-url]/admin`;
-        if (verbose)
-          logger.info(`Started Filesystem GraphQL server on port: ${port}`);
-        logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
+      await new Promise((resolve2, reject) => {
+        state.server.listen(port, () => {
+          var _a, _b;
+          const altairUrl = `http://localhost:${port}/altair/`;
+          const cmsUrl = ((_b = (_a = ctx.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.build) ? `[your-development-url]/${ctx.schema.config.build.outputFolder}/index.html` : `[your-development-url]/admin`;
+          if (verbose)
+            logger.info(`Started Filesystem GraphQL server on port: ${port}`);
+          logger.info(`Visit the GraphQL playground at ${import_chalk6.default.underline.blueBright(altairUrl)}
 or`);
-        logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
+          logger.info(`Enter the CMS at ${import_chalk6.default.underline.blueBright(cmsUrl)} 
 `);
-      });
-      state.server.on("error", function(e) {
-        if (e.code === "EADDRINUSE") {
-          logger.error(dangerText(`Port 4001 already in use`));
-          process.exit();
-        }
-        throw e;
-      });
-      state.server.on("connection", (socket) => {
-        state.sockets.push(socket);
+          resolve2();
+        });
+        state.server.on("error", function(e) {
+          if (e.code === "EADDRINUSE") {
+            logger.error(dangerText(`Port ${port} already in use`));
+          }
+          reject(e);
+        });
+        state.server.on("connection", (socket) => {
+          state.sockets.push(socket);
+        });
       });
     } catch (error) {
       throw error;
@@ -2146,18 +2223,26 @@ or`);
         dev,
         verbose
       });
-      await ctx.builder.genTypedClient({
+      ctx.schema = schema;
+      const apiUrl = await ctx.builder.genTypedClient({
         compiledSchema: schema,
         local: true,
         noSDK,
         verbose,
-        usingTs: ctx.usingTs
+        usingTs: ctx.usingTs,
+        port
+      });
+      await spin({
+        waitFor: async () => {
+          await ctx.database.indexContent({ graphQLSchema, tinaSchema });
+        },
+        text: "Indexing local files"
       });
-      await ctx.database.indexContent({ graphQLSchema, tinaSchema });
       await buildAdmin({
         local: true,
         rootPath: ctx.rootPath,
-        schema
+        schema,
+        apiUrl
       });
     } catch (error) {
       throw error;
@@ -2165,7 +2250,7 @@ or`);
       await afterBuild();
     }
   };
-  const foldersToWatch = (watchFolders || []).map((x) => import_path12.default.join(rootPath2, x));
+  const foldersToWatch = (watchFolders || []).map((x) => import_path13.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
       ...foldersToWatch,
@@ -2175,7 +2260,7 @@ or`);
       ignored: [
         "**/node_modules/**/*",
         "**/.next/**/*",
-        `${import_path12.default.resolve(rootPath2)}/.tina/__generated__/**/*`
+        `${import_path13.default.resolve(rootPath2)}/.tina/__generated__/**/*`
       ]
     }).on("ready", async () => {
       if (verbose)
@@ -2190,8 +2275,7 @@ or`);
         next();
       } catch (e) {
         handleServerErrors(e);
-        console.log(e);
-        process.exit(0);
+        throw e;
       }
     }).on("all", async () => {
       if (ready) {
@@ -2230,7 +2314,8 @@ or`);
   }
 }
 
-// src/cmds/waitForDB/index.ts
+// src/cmds/statusChecks/waitForIndexing.ts
+var import_progress2 = __toModule(require("progress"));
 var POLLING_INTERVAL = 5e3;
 var STATUS_INPROGRESS = "inprogress";
 var STATUS_COMPLETE = "complete";
@@ -2242,23 +2327,15 @@ var IndexFailedError = class extends Error {
   }
 };
 var waitForDB = async (ctx, next, options) => {
-  if (options.verbose) {
-    logger.info(logText("Waiting for DB..."));
-  }
   if (!ctx.client) {
-    if (options.verbose) {
-      logger.info(logText("client is unavailable, skipping..."));
-    }
-    return next();
+    throw new Error("No Tina Cloud found. For more information on how to setup the tina cloud see https://tina.io/docs/features/data-fetching/#making-requests-with-the-tina-client");
   }
   const client = ctx.client;
   const { host, clientId, branch, isLocalClient } = client.parseURL();
   if (isLocalClient) {
-    if (options.verbose) {
-      logger.info(logText("client is local, skipping..."));
-    }
     return next();
   }
+  const bar = new import_progress2.default("Checking indexing process in Tina Cloud... :prog", 1);
   const pollForStatus = async () => {
     try {
       if (options.verbose) {
@@ -2274,11 +2351,11 @@ var waitForDB = async (ctx, next, options) => {
         headers
       });
       const { status, error } = await response.json();
-      const statusMessage = `DB responded with: '${status}'`;
+      const statusMessage = `Indexing status: '${status}'`;
       if (status === STATUS_COMPLETE) {
-        if (options.verbose) {
-          logger.info(logText(`${statusMessage}`));
-        }
+        bar.tick({
+          prog: "\u2705"
+        });
         return next();
       } else if (status === STATUS_INPROGRESS) {
         if (options.verbose) {
@@ -2286,22 +2363,25 @@ var waitForDB = async (ctx, next, options) => {
         }
         setTimeout(pollForStatus, POLLING_INTERVAL);
       } else if (status === STATUS_FAILED) {
-        throw new IndexFailedError(`Attempting to index DB responded with status 'failed', ${error}`);
+        throw new IndexFailedError(`Attempting to index but responded with status 'failed', ${error}`);
       } else {
-        if (options.verbose) {
-          logger.info(logText(`${statusMessage}`));
-        }
-        return next();
+        throw new IndexFailedError(`Attempting to index but responded with status 'unknown', ${error}`);
       }
     } catch (e) {
       if (e instanceof IndexFailedError) {
+        bar.tick({
+          prog: "\u274C"
+        });
         throw e;
       } else {
         throw new Error(`Unable to query DB for indexing status, encountered error: ${e.message}`);
       }
     }
   };
-  pollForStatus();
+  spin({
+    text: "Checking indexing process in Tina Cloud...",
+    waitFor: pollForStatus
+  });
 };
 
 // src/cmds/startSubprocess/index.ts
@@ -2329,6 +2409,252 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 };
 
+// src/cmds/init/static.ts
+var import_path14 = __toModule(require("path"));
+var import_fs_extra9 = __toModule(require("fs-extra"));
+var import_prompts3 = __toModule(require("prompts"));
+var import_metrics4 = __toModule(require("@tinacms/metrics"));
+async function initStaticTina(ctx, next, options) {
+  logger.level = "info";
+  const packageManager = await choosePackageManager();
+  const usingTypescript = await chooseTypescript();
+  const publicFolder = await choosePublicFolder();
+  await reportTelemetry(usingTypescript, options.noTelemetry);
+  const hasPackageJSON = await import_fs_extra9.default.pathExistsSync("package.json");
+  if (!hasPackageJSON) {
+    await createPackageJSON();
+  }
+  const hasGitignore = await import_fs_extra9.default.pathExistsSync(".gitignore");
+  if (!hasGitignore) {
+    await createGitignore();
+  } else {
+    const hasNodeModulesIgnored = await checkGitignoreForNodeModules();
+    if (!hasNodeModulesIgnored) {
+      await addNodeModulesToGitignore();
+    }
+  }
+  await addDependencies(packageManager);
+  await addConfigFile(publicFolder, usingTypescript);
+  await addContentFile();
+  logNextSteps(packageManager);
+}
+var baseDir2 = process.cwd();
+var choosePackageManager = async () => {
+  const option = await (0, import_prompts3.default)({
+    name: "selection",
+    type: "select",
+    message: "Choose your package manager",
+    choices: [
+      { title: "PNPM", value: "pnpm" },
+      { title: "Yarn", value: "yarn" },
+      { title: "NPM", value: "npm" }
+    ]
+  });
+  return option["selection"];
+};
+var chooseTypescript = async () => {
+  const option = await (0, import_prompts3.default)({
+    name: "selection",
+    type: "confirm",
+    initial: true,
+    message: "Would you like to use Typescript?"
+  });
+  return option["selection"];
+};
+var choosePublicFolder = async () => {
+  const option = await (0, import_prompts3.default)({
+    name: "selection",
+    type: "text",
+    message: 'Where are public assets stored? (default: "public")'
+  });
+  return option["selection"] || "public";
+};
+var reportTelemetry = async (usingTypescript, noTelemetry) => {
+  if (noTelemetry) {
+    logger.info(logText("Telemetry disabled"));
+  }
+  const telemetry = new import_metrics4.Telemetry({ disabled: noTelemetry });
+  const schemaFileType2 = usingTypescript ? "ts" : "js";
+  await telemetry.submitRecord({
+    event: {
+      name: "tinacms:cli:init:invoke",
+      schemaFileType: schemaFileType2
+    }
+  });
+};
+var createPackageJSON = async () => {
+  logger.info(logText("No package.json found, creating one"));
+  execShellCommand(`npm init --yes`);
+};
+var createGitignore = async () => {
+  logger.info(logText("No .gitignore found, creating one"));
+  await import_fs_extra9.default.outputFileSync(import_path14.default.join(baseDir2, ".gitignore"), "node_modules");
+};
+var checkGitignoreForNodeModules = async () => {
+  const gitignoreContent = await import_fs_extra9.default.readFileSync(import_path14.default.join(baseDir2, ".gitignore")).toString();
+  return gitignoreContent.split("\n").some((item) => item === "node_modules");
+};
+var addNodeModulesToGitignore = async () => {
+  logger.info(logText("Adding node_modules to .gitignore"));
+  const gitignoreContent = await import_fs_extra9.default.readFileSync(import_path14.default.join(baseDir2, ".gitignore")).toString();
+  const newGitignoreContent = [
+    ...gitignoreContent.split("\n"),
+    "node_modules"
+  ].join("\n");
+  await import_fs_extra9.default.writeFileSync(import_path14.default.join(baseDir2, ".gitignore"), newGitignoreContent);
+};
+var addDependencies = async (packageManager) => {
+  logger.info(logText("Adding dependencies, this might take a moment..."));
+  const internalDeps = ["tinacms", "@tinacms/cli"];
+  const externalDeps = ["styled-components"];
+  const deps = [...internalDeps, externalDeps];
+  const packageManagers = {
+    pnpm: process.env.USE_WORKSPACE ? `pnpm add ${internalDeps.join(" ")} --workspace && pnpm add ${externalDeps.join(" ")}` : `pnpm add ${deps.join(" ")}`,
+    npm: `npm install ${deps.join(" ")}`,
+    yarn: `yarn add ${deps.join(" ")}`
+  };
+  logger.info(`  ${logText(packageManagers[packageManager])}`);
+  await execShellCommand(packageManagers[packageManager]);
+};
+var addConfigFile = async (publicFolder, usingTypescript) => {
+  const configPath = import_path14.default.join(".tina", `config.${usingTypescript ? "ts" : "js"}`);
+  const fullConfigPath = import_path14.default.join(baseDir2, configPath);
+  if (import_fs_extra9.default.pathExistsSync(fullConfigPath)) {
+    const override = await (0, import_prompts3.default)({
+      name: "selection",
+      type: "confirm",
+      message: `Found existing file at ${configPath}. Would you like to override?`
+    });
+    if (override["selection"]) {
+      logger.info(logText(`Overriding file at ${configPath}.`));
+      await import_fs_extra9.default.outputFileSync(fullConfigPath, config({ publicFolder }));
+    } else {
+      logger.info(logText(`Not overriding file at ${configPath}.`));
+    }
+  } else {
+    logger.info(logText(`Adding config file at .tina/config.${usingTypescript ? "ts" : "js"}`));
+    await import_fs_extra9.default.outputFileSync(fullConfigPath, config({ publicFolder }));
+  }
+};
+var addContentFile = async () => {
+  const contentPath = import_path14.default.join("content", "posts", "hello-world.md");
+  const fullContentPath = import_path14.default.join(baseDir2, contentPath);
+  if (import_fs_extra9.default.pathExistsSync(fullContentPath)) {
+    const override = await (0, import_prompts3.default)({
+      name: "selection",
+      type: "confirm",
+      message: `Found existing file at ${contentPath}. Would you like to override?`
+    });
+    if (override["selection"]) {
+      logger.info(logText(`Overriding file at ${contentPath}.`));
+      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_extra9.default.outputFileSync(fullContentPath, content);
+  }
+};
+var logNextSteps = (packageManager) => {
+  logger.info(`
+${successText("TinaCMS has been initialized, to get started run:")}
+
+    ${packageManager} tinacms dev -c "<your dev command>"
+`);
+};
+var config = (args) => `
+import { defineStaticConfig } from "tinacms";
+
+// Your hosting provider likely exposes this as an environment variable
+const branch = process.env.HEAD || process.env.VERCEL_GIT_COMMIT_REF || "main";
+
+export default defineStaticConfig({
+  branch,
+  clientId: null,   // Get this from tina.io
+  token: null,      // Get this from tina.io
+  build: {
+    outputFolder: "admin",
+    publicFolder: "${args.publicFolder}",
+  },
+  media: {
+    tina: {
+      mediaRoot: "uploads",
+      publicFolder: "${args.publicFolder}",
+    },
+  },
+  schema: {
+    collections: [
+      {
+        name: "post",
+        label: "Posts",
+        path: "content/posts",
+        fields: [
+          {
+            type: "string",
+            name: "title",
+            label: "Title",
+            isTitle: true,
+          },
+          {
+            type: "rich-text",
+            name: "body",
+            label: "Body",
+            isBody: true,
+          },
+        ],
+      },
+    ],
+  },
+});
+`;
+var content = `---
+title: Hello, World!
+---
+
+## Hello World!
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non lorem diam. Quisque vulputate nibh sodales eros pretium tincidunt. Aenean porttitor efficitur convallis. Nulla sagittis finibus convallis. Phasellus in fermentum quam, eu egestas tortor. Maecenas ac mollis leo. Integer maximus eu nisl vel sagittis.
+
+Suspendisse facilisis, mi ac scelerisque interdum, ligula ex imperdiet felis, a posuere eros justo nec sem. Nullam laoreet accumsan metus, sit amet tincidunt orci egestas nec. Pellentesque ut aliquet ante, at tristique nunc. Donec non massa nibh. Ut posuere lacus non aliquam laoreet. Fusce pharetra ligula a felis porttitor, at mollis ipsum maximus. Donec quam tortor, vehicula a magna sit amet, tincidunt dictum enim. In hac habitasse platea dictumst. Mauris sit amet ornare ligula, blandit consequat risus. Duis malesuada pellentesque lectus, non feugiat turpis eleifend a. Nullam tempus ante et diam pretium, ac faucibus ligula interdum.
+`;
+
+// src/cmds/statusChecks/checkClientInformation.ts
+var import_progress3 = __toModule(require("progress"));
+var checkClientInfo = async (ctx, next, _options) => {
+  var _a;
+  const client = ctx.client;
+  const config2 = (_a = ctx.schema) == null ? void 0 : _a.config;
+  const bar = new import_progress3.default("Checking clientId, token and branch. :prog", 1);
+  try {
+    await client.request({
+      query: `query {
+        collections {
+          name
+        }
+      }`
+    });
+    bar.tick({
+      prog: "\u2705"
+    });
+  } catch (e) {
+    bar.tick({
+      prog: "\u274C"
+    });
+    console.warn(`Error when checking client information. You provided 
+
+ ${JSON.stringify({
+      branch: config2 == null ? void 0 : config2.branch,
+      clientId: config2 == null ? void 0 : config2.clientId,
+      token: config2 == null ? void 0 : config2.token
+    }, null, 2)}
+
+ Please check you have the correct "clientId", "branch" and "token" configured. For more information see https://tina.io/docs/tina-cloud/connecting-site/`);
+    throw e;
+  }
+  next();
+};
+
 // src/cmds/baseCmds.ts
 var CMD_START_SERVER = "server:start";
 var CMD_DEV = "dev";
@@ -2367,6 +2693,10 @@ var cleanOption = {
   name: "--clean",
   description: "Updates all content files to remove any data not explicitly permitted by the current schema definition"
 };
+var staticOption = {
+  name: "--static",
+  description: "Bundle Tina as a static assset"
+};
 var useDefaultValuesOption = {
   name: "--useDefaultValues",
   description: "Adds default values to the graphQL mutation so that default values can be filled into existing documents (useful for adding a field with `required: true`)"
@@ -2467,6 +2797,7 @@ var baseCmds = [
       buildSetupCmdBuild,
       buildCmdBuild,
       compileClient,
+      checkClientInfo,
       waitForDB
     ], options)
   },
@@ -2476,20 +2807,27 @@ var baseCmds = [
       experimentalDatalayer,
       isomorphicGitBridge,
       noTelemetryOption,
-      schemaFileType
+      schemaFileType,
+      staticOption
     ],
     description: "Add Tina Cloud to an existing project",
-    action: (options) => chain([
-      attachPath,
-      checkOptions,
-      checkDeps,
-      initTina,
-      installDeps,
-      buildSetupCmdBuild,
-      buildCmdBuild,
-      tinaSetup,
-      successMessage
-    ], options)
+    action: (options) => {
+      if (options.static) {
+        chain([attachPath, checkOptions, initStaticTina], options);
+      } else {
+        chain([
+          attachPath,
+          checkOptions,
+          checkDeps,
+          initTina,
+          installDeps,
+          buildSetupCmdBuild,
+          buildCmdBuild,
+          tinaSetup,
+          successMessage
+        ], options);
+      }
+    }
   },
   {
     options: [