@tinacms/cli 0.60.25 → 0.60.26

package/dist/index.js

@@ -37,9 +37,6 @@ var __objRest = (source, exclude) => {
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[Object.keys(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name2 in all)
@@ -57,127 +54,10 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js
-var require_main = __commonJS({
-  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/main.js"(exports, module2) {
-    var fs7 = require("fs");
-    var path4 = require("path");
-    var os2 = require("os");
-    var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-    function parse2(src) {
-      const obj = {};
-      let lines = src.toString();
-      lines = lines.replace(/\r\n?/mg, "\n");
-      let match;
-      while ((match = LINE.exec(lines)) != null) {
-        const key = match[1];
-        let value = match[2] || "";
-        value = value.trim();
-        const maybeQuote = value[0];
-        value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
-        if (maybeQuote === '"') {
-          value = value.replace(/\\n/g, "\n");
-          value = value.replace(/\\r/g, "\r");
-        }
-        obj[key] = value;
-      }
-      return obj;
-    }
-    function _log(message) {
-      console.log(`[dotenv][DEBUG] ${message}`);
-    }
-    function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path4.join(os2.homedir(), envPath.slice(1)) : envPath;
-    }
-    function config(options) {
-      let dotenvPath = path4.resolve(process.cwd(), ".env");
-      let encoding = "utf8";
-      const debug = Boolean(options && options.debug);
-      const override = Boolean(options && options.override);
-      if (options) {
-        if (options.path != null) {
-          dotenvPath = _resolveHome(options.path);
-        }
-        if (options.encoding != null) {
-          encoding = options.encoding;
-        }
-      }
-      try {
-        const parsed = DotenvModule.parse(fs7.readFileSync(dotenvPath, { encoding }));
-        Object.keys(parsed).forEach(function(key) {
-          if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
-            process.env[key] = parsed[key];
-          } else {
-            if (override === true) {
-              process.env[key] = parsed[key];
-            }
-            if (debug) {
-              if (override === true) {
-                _log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
-              } else {
-                _log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
-              }
-            }
-          }
-        });
-        return { parsed };
-      } catch (e) {
-        if (debug) {
-          _log(`Failed to load ${dotenvPath} ${e.message}`);
-        }
-        return { error: e };
-      }
-    }
-    var DotenvModule = {
-      config,
-      parse: parse2
-    };
-    module2.exports.config = DotenvModule.config;
-    module2.exports.parse = DotenvModule.parse;
-    module2.exports = DotenvModule;
-  }
-});
-
-// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/env-options.js
-var require_env_options = __commonJS({
-  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/env-options.js"(exports, module2) {
-    var options = {};
-    if (process.env.DOTENV_CONFIG_ENCODING != null) {
-      options.encoding = process.env.DOTENV_CONFIG_ENCODING;
-    }
-    if (process.env.DOTENV_CONFIG_PATH != null) {
-      options.path = process.env.DOTENV_CONFIG_PATH;
-    }
-    if (process.env.DOTENV_CONFIG_DEBUG != null) {
-      options.debug = process.env.DOTENV_CONFIG_DEBUG;
-    }
-    if (process.env.DOTENV_CONFIG_OVERRIDE != null) {
-      options.override = process.env.DOTENV_CONFIG_OVERRIDE;
-    }
-    module2.exports = options;
-  }
-});
-
-// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/cli-options.js
-var require_cli_options = __commonJS({
-  "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/lib/cli-options.js"(exports, module2) {
-    var re = /^dotenv_config_(encoding|path|debug|override)=(.+)$/;
-    module2.exports = function optionMatcher(args) {
-      return args.reduce(function(acc, cur) {
-        const matches = cur.match(re);
-        if (matches) {
-          acc[matches[1]] = matches[2];
-        }
-        return acc;
-      }, {});
-    };
-  }
-});
-
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/index.ts
+// src/utils/index.ts
 var parseMediaFolder;
 var init_utils = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/index.ts"() {
+  "src/utils/index.ts"() {
     parseMediaFolder = (str) => {
       let returnString = str;
       if (returnString.startsWith("/"))
@@ -189,10 +69,10 @@ var init_utils = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/models/media.ts
+// src/server/models/media.ts
 var import_fs_extra5, import_path6, MediaModel;
 var init_media = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/models/media.ts"() {
+  "src/server/models/media.ts"() {
     import_fs_extra5 = __toModule(require("fs-extra"));
     import_path6 = __toModule(require("path"));
     init_utils();
@@ -277,10 +157,10 @@ var init_media = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/routes/index.ts
+// src/server/routes/index.ts
 var import_express, import_path7, import_multer, createMediaRouter;
 var init_routes = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/routes/index.ts"() {
+  "src/server/routes/index.ts"() {
     import_express = __toModule(require("express"));
     import_path7 = __toModule(require("path"));
     import_multer = __toModule(require("multer"));
@@ -323,10 +203,10 @@ var init_routes = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/server.ts
+// src/server/server.ts
 var import_cors, import_http, import_express2, import_altair_express_middleware, import_body_parser, gqlServer;
 var init_server = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/server.ts"() {
+  "src/server/server.ts"() {
     import_cors = __toModule(require("cors"));
     import_http = __toModule(require("http"));
     import_express2 = __toModule(require("express"));
@@ -384,42 +264,42 @@ var init_server = __esm({
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/index.ts
+// src/server/index.ts
 var init_server2 = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/server/index.ts"() {
+  "src/server/index.ts"() {
     init_server();
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts
+// src/cmds/start-server/server.ts
 var server_exports = {};
 __export(server_exports, {
   default: () => server_default
 });
 var server_default;
 var init_server3 = __esm({
-  "pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/server.ts"() {
+  "src/cmds/start-server/server.ts"() {
     init_server2();
     server_default = gqlServer;
   }
 });
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// src/index.ts
 __export(exports, {
   defineSchema: () => defineSchema,
   init: () => init
 });
 var commander = __toModule(require("commander"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/package.json
+// package.json
 var name = "@tinacms/cli";
-var version = "0.60.25";
+var version = "0.60.26";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// src/cmds/query-gen/attachSchema.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
 var import_datalayer = __toModule(require("@tinacms/datalayer"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/theme.ts
+// src/utils/theme.ts
 var import_chalk = __toModule(require("chalk"));
 var successText = import_chalk.default.bold.green;
 var dangerText = import_chalk.default.bold.red;
@@ -430,7 +310,7 @@ var logText = import_chalk.default.italic.gray;
 var warnText = import_chalk.default.yellowBright.bgBlack;
 var CONFIRMATION_TEXT = import_chalk.default.dim("enter to confirm");
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/logger/index.ts
+// src/logger/index.ts
 var import_log4js = __toModule(require("log4js"));
 var logger = import_log4js.default.getLogger();
 import_log4js.default.configure({
@@ -441,7 +321,7 @@ import_log4js.default.configure({
 });
 logger.level = "info";
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/attachSchema.ts
+// src/cmds/query-gen/attachSchema.ts
 async function attachSchema(ctx, next, options) {
   logger.info(logText("Building schema..."));
   const rootPath2 = process.cwd();
@@ -453,14 +333,14 @@ async function attachSchema(ctx, next, options) {
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
+// src/cmds/query-gen/genTypes.ts
 var import_graphql6 = __toModule(require("graphql"));
 var import_fs_extra = __toModule(require("fs-extra"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+// src/codegen/index.ts
 var import_graphql5 = __toModule(require("graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/plugin.ts
+// src/codegen/plugin.ts
 var AddGeneratedClientFunc = (_schema, _documents, _config, _info) => {
   return `
 // TinaSDK generated code
@@ -509,19 +389,19 @@ var AddGeneratedClient = {
   plugin: AddGeneratedClientFunc
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+// 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"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+// src/codegen/sdkPlugin/index.ts
 var import_graphql3 = __toModule(require("graphql"));
 var import_graphql4 = __toModule(require("graphql"));
 var import_path = __toModule(require("path"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/visitor.ts
+// 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"));
@@ -571,7 +451,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/sdkPlugin/index.ts
+// src/codegen/sdkPlugin/index.ts
 var plugin = (schema, documents, config) => {
   const allAst = (0, import_graphql4.concatAST)(documents.reduce((prev, v) => {
     return [...prev, v.document];
@@ -596,7 +476,7 @@ var plugin = (schema, documents, config) => {
   };
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/codegen/index.ts
+// src/codegen/index.ts
 var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath = process.cwd(), options = {
   noSDK: false,
   verbose: false
@@ -663,7 +543,7 @@ var generateTypes = async (schema, queryPathGlob = process.cwd(), fragDocPath =
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/query-gen/genTypes.ts
+// 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}";
@@ -695,11 +575,11 @@ schema {
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/audit/index.ts
+// src/cmds/audit/index.ts
 var import_graphql9 = __toModule(require("@tinacms/graphql"));
 var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/audit/audit.ts
+// 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"));
@@ -874,7 +754,7 @@ function filterObject(obj) {
   return ret;
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/audit/index.ts
+// src/cmds/audit/index.ts
 var import_chalk3 = __toModule(require("chalk"));
 var import_prompts = __toModule(require("prompts"));
 var import_metrics = __toModule(require("@tinacms/metrics"));
@@ -944,7 +824,7 @@ var printFinalMessage = async (ctx, next, _options) => {
   next();
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/index.ts
+// src/cmds/init/setup-files/index.ts
 var import_chalk4 = __toModule(require("chalk"));
 var adminPage = `import { TinaAdmin } from 'tinacms';
 export default TinaAdmin;
@@ -1290,7 +1170,7 @@ export default App
 `;
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/setup-files/tinaProvider.ts
+// src/cmds/init/setup-files/tinaProvider.ts
 var TinaProvider = `import TinaCMS from 'tinacms'
 import { tinaConfig } from '../schema.ts'
 
@@ -1323,7 +1203,7 @@ const DynamicTina = ({ children }) => {
 export default DynamicTina
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/utils/script-helpers.ts
+// src/utils/script-helpers.ts
 function generateGqlScript(scriptValue) {
   return `tinacms server:start -c "${scriptValue}"`;
 }
@@ -1335,7 +1215,7 @@ function extendNextScripts(scripts) {
   });
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/init/index.ts
+// src/cmds/init/index.ts
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var import_progress = __toModule(require("progress"));
 var import_metrics2 = __toModule(require("@tinacms/metrics"));
@@ -1525,12 +1405,10 @@ async function successMessage(ctx, next, options) {
   next();
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/dotenv-npm-16.0.1-d99e72bb95-e97e94476c.zip/node_modules/dotenv/config.js
-(function() {
-  require_main().config(Object.assign({}, require_env_options(), require_cli_options()(process.argv)));
-})();
+// src/cmds/baseCmds.ts
+var import_config = __toModule(require("dotenv/config"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/middleware.ts
+// src/middleware.ts
 var chain = async (cmds, options) => {
   const ctx = {};
   const next = async (middlewareIndex) => {
@@ -1549,10 +1427,10 @@ var chain = async (cmds, options) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
+// src/cmds/baseCmds.ts
 var import_chalk7 = __toModule(require("chalk"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/errors/index.ts
+// src/cmds/start-server/errors/index.ts
 var import_graphql10 = __toModule(require("@tinacms/graphql"));
 var BuildSchemaError = class extends Error {
   constructor(message) {
@@ -1587,12 +1465,12 @@ var handleServerErrors = (e) => {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+// src/cmds/compile/index.ts
 var import_fs_extra4 = __toModule(require("fs-extra"));
 var import_path5 = __toModule(require("path"));
 var import_esbuild = __toModule(require("esbuild"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/defaultSchema.ts
+// src/cmds/compile/defaultSchema.ts
 var defaultSchema = `
 import { defineSchema, defineConfig } from "tinacms";
 
@@ -1680,7 +1558,7 @@ export const tinaConfig = defineConfig({
 });
 `;
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/lib/getPath.ts
+// src/lib/getPath.ts
 var import_path4 = __toModule(require("path"));
 var import_fs_extra3 = __toModule(require("fs-extra"));
 var getPath = ({
@@ -1719,14 +1597,14 @@ var getClientPath = ({ projectDir }) => {
   return getPath({ projectDir, filename, allowedTypes, errorMessage });
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/compile/index.ts
+// 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 () => {
   try {
-    await import_fs_extra4.default.rmdir(tinaGeneratedPath, {
+    await import_fs_extra4.default.rm(tinaGeneratedPath, {
       recursive: true
     });
   } catch (e) {
@@ -1913,11 +1791,11 @@ var loaders = {
   ".tsx": "tsx"
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// src/cmds/start-server/index.ts
 var import_datalayer3 = __toModule(require("@tinacms/datalayer"));
 var import_graphql11 = __toModule(require("@tinacms/graphql"));
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/lock.ts
+// src/cmds/start-server/lock.ts
 var AsyncLock = class {
   constructor() {
     this.disable = () => {
@@ -1929,7 +1807,7 @@ var AsyncLock = class {
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/start-server/index.ts
+// 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"));
@@ -1937,7 +1815,8 @@ var import_fs_extra6 = __toModule(require("fs-extra"));
 var import_ini = __toModule(require("ini"));
 var import_os = __toModule(require("os"));
 var import_path8 = __toModule(require("path"));
-var lock = new AsyncLock();
+var buildLock = new AsyncLock();
+var reBuildLock = new AsyncLock();
 var gqlPackageFile = require.resolve("@tinacms/graphql");
 var resolveGitRoot = async () => {
   const pathParts = process.cwd().split(import_path8.default.sep);
@@ -2010,7 +1889,8 @@ async function startServer(_ctx, next, {
   verbose,
   dev
 }) {
-  lock.disable();
+  buildLock.disable();
+  reBuildLock.disable();
   const rootPath2 = process.cwd();
   const t = new import_metrics3.Telemetry({ disabled: Boolean(noTelemetry) });
   t.submitRecord({
@@ -2020,9 +1900,6 @@ async function startServer(_ctx, next, {
   });
   const fsBridge = new import_datalayer3.FilesystemBridge(rootPath2);
   const isomorphicOptions = isomorphicGitBridge2 && await makeIsomorphicOptions(fsBridge);
-  if (!process.env.CI && !noWatch) {
-    await resetGeneratedFolder();
-  }
   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 shouldBuild = bridge.supportsBuilding();
@@ -2030,8 +1907,8 @@ async function startServer(_ctx, next, {
   let ready = false;
   const build2 = async (noSDK2) => {
     database.clearCache();
-    await lock.promise;
-    lock.enable();
+    await buildLock.promise;
+    buildLock.enable();
     try {
       if (!process.env.CI && !noWatch) {
         await store.close();
@@ -2050,14 +1927,68 @@ async function startServer(_ctx, next, {
     } catch (error) {
       throw error;
     } finally {
-      lock.disable();
+      buildLock.disable();
     }
   };
+  const state = {
+    server: null,
+    sockets: []
+  };
+  let isReady = false;
+  const start = async () => {
+    await buildLock.promise;
+    buildLock.enable();
+    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)}
+or`);
+        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);
+      });
+    } catch (error) {
+      throw error;
+    } finally {
+      buildLock.disable();
+    }
+  };
+  const restart = async () => {
+    return new Promise((resolve2, reject) => {
+      logger.info("restarting local server...");
+      delete require.cache[gqlPackageFile];
+      state.sockets.forEach((socket) => {
+        if (socket.destroyed === false) {
+          socket.destroy();
+        }
+      });
+      state.sockets = [];
+      state.server.close(async () => {
+        logger.info("Server closed");
+        start().then((x) => resolve2(x)).catch((err) => reject(err));
+      });
+    });
+  };
   const foldersToWatch = (watchFolders || []).map((x) => import_path8.default.join(rootPath2, x));
   if (!noWatch && !process.env.CI) {
     import_chokidar.default.watch([
       ...foldersToWatch,
-      `${rootPath2}/.tina/**/*.{ts,gql,graphql,js,tsx,jsx}`
+      `${rootPath2}/.tina/**/*.{ts,gql,graphql,js,tsx,jsx}`,
+      gqlPackageFile
     ], {
       ignored: [
         "**/node_modules/**/*",
@@ -2072,6 +2003,8 @@ async function startServer(_ctx, next, {
           await build2(noSDK);
         }
         ready = true;
+        isReady = true;
+        await start();
         next();
       } catch (e) {
         handleServerErrors(e);
@@ -2080,6 +2013,8 @@ async function startServer(_ctx, next, {
       }
     }).on("all", async () => {
       if (ready) {
+        await reBuildLock.promise;
+        reBuildLock.enable();
         logger.info("Tina change detected, regenerating config");
         try {
           if (shouldBuild) {
@@ -2096,84 +2031,24 @@ async function startServer(_ctx, next, {
               errorMessage: e.message
             }
           });
+        } finally {
+          reBuildLock.disable();
         }
       }
     });
-  } else {
-    if (shouldBuild) {
-      await build2(noSDK);
-    }
-  }
-  const state = {
-    server: null,
-    sockets: []
-  };
-  let isReady = false;
-  const start = async () => {
-    await lock.promise;
-    lock.enable();
-    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)}
-or`);
-        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);
-      });
-    } catch (error) {
-      throw error;
-    } finally {
-      lock.disable();
-    }
-  };
-  const restart = async () => {
-    logger.info("restarting local server...");
-    delete require.cache[gqlPackageFile];
-    state.sockets.forEach((socket) => {
-      if (socket.destroyed === false) {
-        socket.destroy();
-      }
-    });
-    state.sockets = [];
-    await state.server.close(async () => {
-      logger.info("Server closed");
-      await start();
-    });
-  };
-  if (!noWatch && !process.env.CI) {
-    import_chokidar.default.watch([gqlPackageFile]).on("ready", async () => {
-      isReady = true;
-      start();
-    }).on("all", async () => {
-      if (isReady) {
-        restart();
-      }
-    });
   } else {
     if (process.env.CI) {
       logger.info("Detected CI environment, omitting watch commands...");
     }
-    start();
+    if (shouldBuild) {
+      await build2(noSDK);
+    }
+    await start();
     next();
   }
 }
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/waitForDB/index.ts
+// src/cmds/waitForDB/index.ts
 var POLLING_INTERVAL = 5e3;
 var STATUS_INPROGRESS = "inprogress";
 var STATUS_COMPLETE = "complete";
@@ -2247,7 +2122,7 @@ var waitForDB = async (ctx, next, options) => {
   pollForStatus();
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/startSubprocess/index.ts
+// src/cmds/startSubprocess/index.ts
 var import_child_process = __toModule(require("child_process"));
 var startSubprocess = async (_ctx, next, { command }) => {
   if (typeof command === "string") {
@@ -2272,7 +2147,7 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/cmds/baseCmds.ts
+// src/cmds/baseCmds.ts
 var CMD_GEN_TYPES = "schema:types";
 var CMD_START_SERVER = "server:start";
 var CMD_COMPILE_MODELS = "schema:compile";
@@ -2429,7 +2304,7 @@ var baseCmds = [
   }
 ];
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/cli/src/index.ts
+// src/index.ts
 var program = new commander.Command(name);
 var registerCommands = (commands, noHelp = false) => {
   commands.forEach((command, i) => {