npm - @tinacms/cli - Versions diffs - 1.5.11 → 1.5.13 - Mend

@tinacms/cli 1.5.11 → 1.5.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.js +294 -198
package/dist/next/codegen/index.d.ts +7 -1
package/dist/next/commands/baseCommands.d.ts +26 -0
package/dist/next/commands/build-command/index.d.ts +6 -9
package/dist/next/commands/dev-command/index.d.ts +3 -11
package/package.json +5 -6

package/dist/index.js CHANGED Viewed

@@ -28,13 +28,13 @@ __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_clipanion6 = require("clipanion");
+var import_clipanion7 = require("clipanion");
 // package.json
-var version = "1.5.11";
+var version = "1.5.13";
 // src/next/commands/dev-command/index.ts
-var import_clipanion = require("clipanion");
+var import_clipanion2 = require("clipanion");
 var import_fs_extra4 = __toESM(require("fs-extra"));
 var import_path7 = __toESM(require("path"));
 var import_chokidar = __toESM(require("chokidar"));
@@ -92,15 +92,16 @@ ${message}
       len - strip(ln).length
     )}${import_chalk.default.gray(bar)}`
   ).join("\n");
+  const underscoreLen = len - title.length - 1 > 0 ? len - title.length - 1 : 0;
   process.stdout.write(
     `${import_chalk.default.gray(bar)}
 ${import_chalk.default.green("\u25CB")}  ${import_chalk.default.reset(
       title
-    )} ${import_chalk.default.gray(
-      "\u2500".repeat(len - title.length - 1) + "\u256E"
-    )}
+    )} ${import_chalk.default.gray("\u2500".repeat(underscoreLen) + "\u256E")}
 ${msg}
-${import_chalk.default.gray("\u251C" + "\u2500".repeat(len + 2) + "\u256F")}
+${import_chalk.default.gray(
+      "\u251C" + "\u2500".repeat(len + 2) + "\u256F"
+    )}
 `
   );
 };
@@ -451,6 +452,48 @@ var loaders = {
 };
 // src/next/commands/dev-command/html.ts
+var errorHTML = `<style type="text/css">
+#no-assets-placeholder body {
+  font-family: sans-serif;
+  font-size: 16px;
+  line-height: 1.4;
+  color: #333;
+  background-color: #f5f5f5;
+}
+#no-assets-placeholder {
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 40px;
+  text-align: center;
+  background-color: #fff;
+  box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.1);
+}
+#no-assets-placeholder h1 {
+  font-size: 24px;
+  margin-bottom: 20px;
+}
+#no-assets-placeholder p {
+  margin-bottom: 10px;
+}
+#no-assets-placeholder a {
+  color: #0077cc;
+  text-decoration: none;
+}
+#no-assets-placeholder a:hover {
+  text-decoration: underline;
+}
+</style>
+<div id="no-assets-placeholder">
+<h1>Failed loading TinaCMS assets</h1>
+<p>
+  Your TinaCMS configuration may be misconfigured, and we could not load
+  the assets for this page.
+</p>
+<p>
+  Please visit <a href="https://tina.io/docs/tina-cloud/faq/#how-do-i-resolve-failed-loading-tinacms-assets-error">this doc</a> for help.
+</p>
+</div>
+</div>`.trim().replace(/[\r\n\s]+/g, " ");
 var devHTML = (port) => `<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -468,9 +511,16 @@ var devHTML = (port) => `<!DOCTYPE html>
     window.__vite_plugin_react_preamble_installed__ = true
   <\/script>
   <script type="module" src="http://localhost:${port}/@vite/client"><\/script>
+  <script>
+  function handleLoadError() {
+    // Assets have failed to load
+    document.getElementById('root').innerHTML = '${errorHTML}';
+  }
+  <\/script>
   <script
     type="module"
     src="http://localhost:${port}/src/main.tsx"
+    onerror="handleLoadError()"
   ><\/script>
   <body class="tina-tailwind">
     <div id="root"></div>
@@ -779,9 +829,15 @@ var createConfig = async ({
   } else {
     alias["CLIENT_IMPORT"] = configManager.isUsingTs() ? configManager.generatedTypesTSFilePath : configManager.generatedTypesJSFilePath;
   }
+  let basePath;
+  if (configManager.config.build.basePath) {
+    basePath = configManager.config.build.basePath;
+  }
   const config3 = {
     root: configManager.spaRootPath,
-    base: `/${(0, import_normalize_path2.default)(configManager.config.build.outputFolder)}/`,
+    base: `/${basePath ? `${(0, import_normalize_path2.default)(basePath)}/` : ""}${(0, import_normalize_path2.default)(
+      configManager.config.build.outputFolder
+    )}/`,
     appType: "spa",
     resolve: {
       alias,
@@ -794,6 +850,7 @@ var createConfig = async ({
       __TOKEN__: `"${configManager.config.token}"`,
       __TINA_GRAPHQL_VERSION__: `"${configManager.getTinaGraphQLVersion()}"`
     },
+    logLevel: "error",
     optimizeDeps: {
       force: true,
       include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
@@ -863,8 +920,11 @@ var createMediaRouter = (config3) => {
   };
   const handlePost = async function(req, res) {
     const bb = (0, import_busboy.default)({ headers: req.headers });
-    bb.on("file", (name2, file, info) => {
-      const saveTo = import_path4.default.join(mediaFolder, info.filename);
+    bb.on("file", async (_name, file, _info) => {
+      var _a;
+      const fullPath = (_a = req.url) == null ? void 0 : _a.slice("/media/upload/".length);
+      const saveTo = import_path4.default.join(mediaFolder, ...fullPath.split("/"));
+      await import_fs_extra2.default.ensureDir(import_path4.default.dirname(saveTo));
       file.pipe(import_fs_extra2.default.createWriteStream(saveTo));
     });
     bb.on("error", (error) => {
@@ -906,6 +966,12 @@ var MediaModel = class {
         args.searchPath
       );
       const searchPath = parseMediaFolder(args.searchPath);
+      if (!await import_fs_extra2.default.pathExists(folderPath)) {
+        return {
+          files: [],
+          directories: []
+        };
+      }
       const filesStr = await import_fs_extra2.default.readdir(folderPath);
       const filesProm = filesStr.map(async (file) => {
         const filePath = (0, import_path4.join)(folderPath, file);
@@ -1323,10 +1389,12 @@ var Codegen = class {
     port,
     queryDoc,
     fragDoc,
+    isLocal,
     graphqlSchemaDoc,
     tinaSchema,
     lookup
   }) {
+    this.isLocal = isLocal;
     this.graphqlSchemaDoc = graphqlSchemaDoc;
     this.configManager = configManager;
     this.port = port;
@@ -1359,7 +1427,6 @@ var Codegen = class {
     await unlinkIfExists(this.configManager.generatedFragmentsFilePath);
   }
   async execute() {
-    console.log("Generating Tina Files");
     await this.writeConfigFile(
       "_graphql.json",
       JSON.stringify(this.graphqlSchemaDoc)
@@ -1369,7 +1436,10 @@ var Codegen = class {
       JSON.stringify(this.tinaSchema.schema)
     );
     await this.writeConfigFile("_lookup.json", JSON.stringify(this.lookup));
-    const apiURL = this.getApiURL();
+    const { apiURL, localUrl, tinaCloudUrl } = this._createApiUrl();
+    this.apiURL = apiURL;
+    this.localUrl = localUrl;
+    this.productionUrl = tinaCloudUrl;
     if (this.configManager.shouldSkipSDK()) {
       await this.removeGeneratedFilesIfExists();
       return apiURL;
@@ -1420,7 +1490,7 @@ var Codegen = class {
     }
     return apiURL;
   }
-  getApiURL() {
+  _createApiUrl() {
     var _a, _b, _c, _d;
     const branch = (_a = this.configManager.config) == null ? void 0 : _a.branch;
     const clientId = (_b = this.configManager.config) == null ? void 0 : _b.clientId;
@@ -1441,11 +1511,20 @@ var Codegen = class {
         )}. Please visit https://tina.io/docs/tina-cloud/connecting-site/ for more information`
       );
     }
-    let apiURL = this.port ? `http://localhost:${this.port}/graphql` : `${baseUrl}/${version2}/content/${clientId}/github/${branch}`;
+    let localUrl = `http://localhost:${this.port}/graphql`;
+    let tinaCloudUrl = `${baseUrl}/${version2}/content/${clientId}/github/${branch}`;
+    let apiURL = this.isLocal ? `http://localhost:${this.port}/graphql` : `${baseUrl}/${version2}/content/${clientId}/github/${branch}`;
     if (this.configManager.config.contentApiUrlOverride) {
       apiURL = this.configManager.config.contentApiUrlOverride;
+      localUrl = apiURL;
+      tinaCloudUrl = apiURL;
     }
-    return apiURL;
+    return { apiURL, localUrl, tinaCloudUrl };
+  }
+  getApiURL() {
+    if (!this.apiURL)
+      throw new Error("apiURL not set. Please run execute() first");
+    return this.apiURL;
   }
   async genClient() {
     var _a;
@@ -1509,7 +1588,58 @@ var unlinkIfExists = async (filepath) => {
   }
 };
-// src/next/commands/dev-command/index.ts
+// src/next/database.ts
+var import_graphql7 = require("@tinacms/graphql");
+var import_readable_stream = require("readable-stream");
+var import_net = require("net");
+var import_many_level = require("many-level");
+var import_memory_level = require("memory-level");
+var createDBServer = (port) => {
+  const levelHost = new import_many_level.ManyLevelHost(
+    new import_memory_level.MemoryLevel({
+      valueEncoding: "json"
+    })
+  );
+  const dbServer = (0, import_net.createServer)(function(socket) {
+    return (0, import_readable_stream.pipeline)(socket, levelHost.createRpcStream(), socket, () => {
+    });
+  });
+  dbServer.once("error", (err) => {
+    if ((err == null ? void 0 : err.code) === "EADDRINUSE") {
+      throw new Error(
+        `Tina Dev server is already in use. Datalayer server is busy on port ${port}`
+      );
+    }
+  });
+  dbServer.listen(port);
+};
+async function createAndInitializeDatabase(configManager, datalayerPort, bridgeOverride) {
+  let database;
+  const bridge = bridgeOverride || new import_graphql7.FilesystemBridge(configManager.rootPath, configManager.contentRootPath);
+  if (configManager.hasSelfHostedConfig() && configManager.config.contentApiUrlOverride) {
+    database = await configManager.loadDatabaseFile();
+    database.bridge = bridge;
+  } else {
+    if (configManager.hasSelfHostedConfig() && !configManager.config.contentApiUrlOverride) {
+      logger.warn(
+        `Found a database config file at ${configManager.printRelativePath(
+          configManager.selfHostedDatabaseFilePath
+        )} but there was no "contentApiUrlOverride" set. Falling back to built-in datalayer`
+      );
+    }
+    const level = new import_graphql7.TinaLevelClient(datalayerPort);
+    level.openConnection();
+    database = (0, import_graphql7.createDatabase)({
+      bridge,
+      level,
+      tinaDirectory: configManager.isUsingLegacyFolder ? LEGACY_TINA_FOLDER : TINA_FOLDER
+    });
+  }
+  return database;
+}
+// src/next/commands/baseCommands.ts
+var import_clipanion = require("clipanion");
 var import_chalk4 = __toESM(require("chalk"));
 // src/utils/start-subprocess.ts
@@ -1561,56 +1691,6 @@ stack: ${code.stack || "No stack was provided"}`);
   }
 };
-// src/next/database.ts
-var import_graphql7 = require("@tinacms/graphql");
-var import_readable_stream = require("readable-stream");
-var import_net = require("net");
-var import_many_level = require("many-level");
-var import_memory_level = require("memory-level");
-var createDBServer = (port) => {
-  const levelHost = new import_many_level.ManyLevelHost(
-    new import_memory_level.MemoryLevel({
-      valueEncoding: "json"
-    })
-  );
-  const dbServer = (0, import_net.createServer)(function(socket) {
-    return (0, import_readable_stream.pipeline)(socket, levelHost.createRpcStream(), socket, () => {
-    });
-  });
-  dbServer.once("error", (err) => {
-    if ((err == null ? void 0 : err.code) === "EADDRINUSE") {
-      throw new Error(
-        `Tina Dev server is already in use. Datalayer server is busy on port ${port}`
-      );
-    }
-  });
-  dbServer.listen(port);
-};
-async function createAndInitializeDatabase(configManager, datalayerPort, bridgeOverride) {
-  let database;
-  const bridge = bridgeOverride || new import_graphql7.FilesystemBridge(configManager.rootPath, configManager.contentRootPath);
-  if (configManager.hasSelfHostedConfig() && configManager.config.contentApiUrlOverride) {
-    database = await configManager.loadDatabaseFile();
-    database.bridge = bridge;
-  } else {
-    if (configManager.hasSelfHostedConfig() && !configManager.config.contentApiUrlOverride) {
-      logger.warn(
-        `Found a database config file at ${configManager.printRelativePath(
-          configManager.selfHostedDatabaseFilePath
-        )} but there was no "contentApiUrlOverride" set. Falling back to built-in datalayer`
-      );
-    }
-    const level = new import_graphql7.TinaLevelClient(datalayerPort);
-    level.openConnection();
-    database = (0, import_graphql7.createDatabase)({
-      bridge,
-      level,
-      tinaDirectory: configManager.isUsingLegacyFolder ? LEGACY_TINA_FOLDER : TINA_FOLDER
-    });
-  }
-  return database;
-}
 // src/utils/spinner.ts
 var import_cli_spinner = require("cli-spinner");
 async function localSpin({
@@ -1647,10 +1727,16 @@ function spin({
   }
 }
-// src/next/commands/dev-command/index.ts
-var DevCommand = class extends import_clipanion.Command {
+// src/next/commands/baseCommands.ts
+var BaseCommand = class extends import_clipanion.Command {
   constructor() {
     super(...arguments);
+    this.experimentalDataLayer = import_clipanion.Option.Boolean("--experimentalData", {
+      description: "DEPRECATED - Build the server with additional data querying capabilities"
+    });
+    this.isomorphicGitBridge = import_clipanion.Option.Boolean("--isomorphicGitBridge", {
+      description: "DEPRECATED - Enable Isomorphic Git Bridge Implementation"
+    });
     this.port = import_clipanion.Option.String("-p,--port", "4001", {
       description: "Specify a port to run the server on. (default 4001)"
     });
@@ -1663,21 +1749,9 @@ var DevCommand = class extends import_clipanion.Command {
     this.rootPath = import_clipanion.Option.String("--rootPath", {
       description: "Specify the root directory to run the CLI from (defaults to current working directory)"
     });
-    this.watchFolders = import_clipanion.Option.String("-w,--watchFolders", {
-      description: "DEPRECATED - a list of folders (relative to where this is being run) that the cli will watch for changes"
-    });
-    this.isomorphicGitBridge = import_clipanion.Option.Boolean("--isomorphicGitBridge", {
-      description: "DEPRECATED - Enable Isomorphic Git Bridge Implementation"
-    });
-    this.experimentalDataLayer = import_clipanion.Option.Boolean("--experimentalData", {
-      description: "DEPRECATED - Build the server with additional data querying capabilities"
-    });
     this.verbose = import_clipanion.Option.Boolean("-v,--verbose", false, {
       description: "increase verbosity of logged output"
     });
-    this.noWatch = import_clipanion.Option.Boolean("--noWatch", false, {
-      description: "Don't regenerate config on file changes"
-    });
     this.noSDK = import_clipanion.Option.Boolean("--noSDK", false, {
       description: "DEPRECATED - This should now be set in the config at client.skip = true'. Don't generate the generated client SDK"
     });
@@ -1685,17 +1759,25 @@ var DevCommand = class extends import_clipanion.Command {
       description: "Disable anonymous telemetry that is collected"
     });
   }
-  async catch(error) {
-    logger.error("Error occured during tinacms dev");
-    console.error(error);
-    process.exit(1);
-  }
-  async execute() {
-    if (this.watchFolders) {
-      logger.warn(
-        "--watchFolders has been deprecated, imports from your Tina config file will be watched automatically. If you still need it please open a ticket at https://github.com/tinacms/tinacms/issues"
-      );
+  async startSubCommand() {
+    let subProc;
+    if (this.subCommand) {
+      subProc = await startSubprocess2({ command: this.subCommand });
+      logger.info(`Starting subprocess: ${import_chalk4.default.cyan(this.subCommand)}`);
     }
+    function exitHandler(options, exitCode) {
+      if (subProc) {
+        subProc.kill();
+      }
+      process.exit();
+    }
+    process.on("exit", exitHandler);
+    process.on("SIGINT", exitHandler);
+    process.on("SIGUSR1", exitHandler);
+    process.on("SIGUSR2", exitHandler);
+    process.on("uncaughtException", exitHandler);
+  }
+  logDeprecationWarnings() {
     if (this.isomorphicGitBridge) {
       logger.warn("--isomorphicGitBridge has been deprecated");
     }
@@ -1709,11 +1791,63 @@ var DevCommand = class extends import_clipanion.Command {
         "--noSDK has been deprecated, and will be unsupported in a future release. This should be set in the config at client.skip = true"
       );
     }
+  }
+  async indexContentWithSpinner({
+    database,
+    graphQLSchema,
+    tinaSchema
+  }) {
+    const warnings = [];
+    await spin({
+      waitFor: async () => {
+        const res = await database.indexContent({
+          graphQLSchema,
+          tinaSchema
+        });
+        warnings.push(...res.warnings);
+      },
+      text: "Indexing local files"
+    });
+    if (warnings.length > 0) {
+      logger.warn(`Indexing completed with ${warnings.length} warning(s)`);
+      warnings.forEach((warning) => {
+        logger.warn(warnText(`${warning}`));
+      });
+    }
+  }
+};
+// src/next/commands/dev-command/index.ts
+var DevCommand = class extends BaseCommand {
+  constructor() {
+    super(...arguments);
+    this.watchFolders = import_clipanion2.Option.String("-w,--watchFolders", {
+      description: "DEPRECATED - a list of folders (relative to where this is being run) that the cli will watch for changes"
+    });
+    this.noWatch = import_clipanion2.Option.Boolean("--noWatch", false, {
+      description: "Don't regenerate config on file changes"
+    });
+  }
+  async catch(error) {
+    logger.error("Error occured during tinacms dev");
+    console.error(error);
+    process.exit(1);
+  }
+  logDeprecationWarnings() {
+    super.logDeprecationWarnings();
+    if (this.watchFolders) {
+      logger.warn(
+        "--watchFolders has been deprecated, imports from your Tina config file will be watched automatically. If you still need it please open a ticket at https://github.com/tinacms/tinacms/issues"
+      );
+    }
+  }
+  async execute() {
     const configManager = new ConfigManager({
       rootPath: this.rootPath,
       legacyNoSDK: this.noSDK
     });
     logger.info("Starting Tina Dev Server");
+    this.logDeprecationWarnings();
     createDBServer(Number(this.datalayerPort));
     let database = null;
     const setup = async ({ firstTime }) => {
@@ -1741,6 +1875,7 @@ var DevCommand = class extends import_clipanion.Command {
       }
       const { tinaSchema, graphQLSchema, lookup, queryDoc, fragDoc } = await (0, import_graphql8.buildSchema)(configManager.config);
       const codegen2 = new Codegen({
+        isLocal: true,
         configManager,
         port: Number(this.port),
         queryDoc,
@@ -1769,24 +1904,11 @@ var DevCommand = class extends import_clipanion.Command {
       if (!this.noWatch) {
         this.watchQueries(configManager, async () => await codegen2.execute());
       }
-      const warnings = [];
-      await spin({
-        waitFor: async () => {
-          const res = await database.indexContent({
-            graphQLSchema,
-            tinaSchema,
-            lookup
-          });
-          warnings.push(...res.warnings);
-        },
-        text: "Indexing local files"
+      await this.indexContentWithSpinner({
+        database,
+        graphQLSchema,
+        tinaSchema
       });
-      if (warnings.length > 0) {
-        logger.warn(`Indexing completed with ${warnings.length} warning(s)`);
-        warnings.forEach((warning) => {
-          logger.warn(warnText(`${warning}`));
-        });
-      }
       return { apiURL: apiURL2, database };
     };
     const { apiURL } = await setup({ firstTime: true });
@@ -1872,22 +1994,7 @@ var DevCommand = class extends import_clipanion.Command {
         ...summaryItems
       ]
     });
-    let subProc;
-    if (this.subCommand) {
-      subProc = await startSubprocess2({ command: this.subCommand });
-      logger.info(`Starting subprocess: ${import_chalk4.default.cyan(this.subCommand)}`);
-    }
-    function exitHandler(options, exitCode) {
-      if (subProc) {
-        subProc.kill();
-      }
-      process.exit();
-    }
-    process.on("exit", exitHandler);
-    process.on("SIGINT", exitHandler);
-    process.on("SIGUSR1", exitHandler);
-    process.on("SIGUSR2", exitHandler);
-    process.on("uncaughtException", exitHandler);
+    await this.startSubCommand();
   }
   watchContentFiles(configManager, database) {
     const collectionContentFiles = [];
@@ -1929,7 +2036,7 @@ var DevCommand = class extends import_clipanion.Command {
   }
 };
 DevCommand.paths = [["dev"], ["server:start"]];
-DevCommand.usage = import_clipanion.Command.Usage({
+DevCommand.usage = import_clipanion2.Command.Usage({
   category: `Commands`,
   description: `Builds Tina and starts the dev server`,
   examples: [
@@ -1940,7 +2047,7 @@ DevCommand.usage = import_clipanion.Command.Usage({
 // src/next/commands/build-command/index.ts
 var import_node_fetch2 = __toESM(require("node-fetch"));
-var import_clipanion2 = require("clipanion");
+var import_clipanion3 = require("clipanion");
 var import_progress2 = __toESM(require("progress"));
 var import_fs_extra5 = __toESM(require("fs-extra"));
 var import_graphql9 = require("@tinacms/graphql");
@@ -2080,64 +2187,31 @@ var waitForDB = async (config3, apiUrl, verbose) => {
 };
 // src/next/commands/build-command/index.ts
-var BuildCommand = class extends import_clipanion2.Command {
+var BuildCommand = class extends BaseCommand {
   constructor() {
     super(...arguments);
-    this.rootPath = import_clipanion2.Option.String("--rootPath", {
-      description: "Specify the root directory to run the CLI from (defaults to current working directory)"
-    });
-    this.verbose = import_clipanion2.Option.Boolean("-v,--verbose", false, {
-      description: "increase verbosity of logged output"
-    });
-    this.noSDK = import_clipanion2.Option.Boolean("--noSDK", false, {
-      description: "DEPRECATED - This should now be set in the config at client.skip = true'. Don't generate the generated client SDK"
-    });
-    this.datalayerPort = import_clipanion2.Option.String("--datalayer-port", "9000", {
-      description: "Specify a port to run the datalayer server on. (default 9000)"
-    });
-    this.isomorphicGitBridge = import_clipanion2.Option.Boolean("--isomorphicGitBridge", {
-      description: "DEPRECATED - Enable Isomorphic Git Bridge Implementation"
-    });
-    this.localOption = import_clipanion2.Option.Boolean("--local", {
-      description: "DEPRECATED: Uses the local file system graphql server"
-    });
-    this.experimentalDataLayer = import_clipanion2.Option.Boolean("--experimentalData", {
-      description: "DEPRECATED - Build the server with additional data querying capabilities"
-    });
-    this.noTelemetry = import_clipanion2.Option.Boolean("--noTelemetry", false, {
-      description: "Disable anonymous telemetry that is collected"
+    this.localOption = import_clipanion3.Option.Boolean("--local", {
+      description: "Starts local Graphql server and builds the local client instead of production client"
     });
-    this.tinaGraphQLVersion = import_clipanion2.Option.String("--tina-graphql-version", {
+    this.tinaGraphQLVersion = import_clipanion3.Option.String("--tina-graphql-version", {
       description: "Specify the version of @tinacms/graphql to use (defaults to latest)"
     });
+    this.skipCloudChecks = import_clipanion3.Option.Boolean("--skip-cloud-checks", false, {
+      description: "Skips checking the provided cloud config."
+    });
   }
   async catch(error) {
     console.error(error);
     process.exit(1);
   }
   async execute() {
+    logger.info("Starting Tina build");
+    this.logDeprecationWarnings();
     const configManager = new ConfigManager({
       rootPath: this.rootPath,
       tinaGraphQLVersion: this.tinaGraphQLVersion,
       legacyNoSDK: this.noSDK
     });
-    logger.info("Starting Tina build");
-    if (this.isomorphicGitBridge) {
-      logger.warn("--isomorphicGitBridge has been deprecated");
-    }
-    if (this.experimentalDataLayer) {
-      logger.warn(
-        "--experimentalDataLayer has been deprecated, the data layer is now built-in automatically"
-      );
-    }
-    if (this.localOption) {
-      logger.warn("--local has been deprecated");
-    }
-    if (this.noSDK) {
-      logger.warn(
-        "--noSDK has been deprecated, and will be unsupported in a future release. This should be set in the config at client.skip = true"
-      );
-    }
     try {
       await configManager.processConfig();
     } catch (e) {
@@ -2145,6 +2219,7 @@ var BuildCommand = class extends import_clipanion2.Command {
       logger.error("Unable to build, please fix your Tina config and try again");
       process.exit(1);
     }
+    let server;
     createDBServer(Number(this.datalayerPort));
     const database = await createAndInitializeDatabase(
       configManager,
@@ -2153,6 +2228,8 @@ var BuildCommand = class extends import_clipanion2.Command {
     const { queryDoc, fragDoc, graphQLSchema, tinaSchema, lookup } = await (0, import_graphql9.buildSchema)(configManager.config);
     const codegen2 = new Codegen({
       configManager,
+      port: this.localOption ? Number(this.port) : void 0,
+      isLocal: this.localOption,
       queryDoc,
       fragDoc,
       graphqlSchemaDoc: graphQLSchema,
@@ -2160,12 +2237,27 @@ var BuildCommand = class extends import_clipanion2.Command {
       lookup
     });
     const apiURL = await codegen2.execute();
-    if (!configManager.hasSelfHostedConfig()) {
-      await this.checkClientInfo(configManager, apiURL);
-      await waitForDB(configManager.config, apiURL, false);
-      await this.checkGraphqlSchema(configManager, database, apiURL);
+    if (this.localOption) {
+      await this.indexContentWithSpinner({
+        database,
+        graphQLSchema,
+        tinaSchema
+      });
+      server = await createDevServer(configManager, database, apiURL, true);
+      await server.listen(Number(this.port));
+      console.log("server listening on port", this.port);
+    }
+    const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
+    if (!skipCloudChecks) {
+      await this.checkClientInfo(configManager, codegen2.productionUrl);
+      await waitForDB(configManager.config, codegen2.productionUrl, false);
+      await this.checkGraphqlSchema(
+        configManager,
+        database,
+        codegen2.productionUrl
+      );
     }
-    await buildProductionSpa(configManager, database, apiURL);
+    await buildProductionSpa(configManager, database, codegen2.productionUrl);
     await import_fs_extra5.default.outputFile(
       configManager.outputGitignorePath,
       "index.html\nassets/"
@@ -2203,7 +2295,11 @@ var BuildCommand = class extends import_clipanion2.Command {
         ...summaryItems
       ]
     });
-    process.exit();
+    if (this.subCommand) {
+      await this.startSubCommand();
+    } else {
+      process.exit();
+    }
   }
   async checkClientInfo(configManager, apiURL) {
     const { config: config3 } = configManager;
@@ -2332,7 +2428,7 @@ Additional info: Branch: ${config3.branch}, Client ID: ${config3.clientId} `;
   }
 };
 BuildCommand.paths = [["build"]];
-BuildCommand.usage = import_clipanion2.Command.Usage({
+BuildCommand.usage = import_clipanion3.Command.Usage({
   category: `Commands`,
   description: `Build the CMS and autogenerated modules for usage with Tina Cloud`
 });
@@ -2396,7 +2492,7 @@ var fetchRemoteGraphqlSchema = async ({
 };
 // src/next/commands/audit-command/index.ts
-var import_clipanion3 = require("clipanion");
+var import_clipanion4 = require("clipanion");
 var import_graphql12 = require("@tinacms/graphql");
 // src/next/commands/audit-command/audit.ts
@@ -2561,25 +2657,25 @@ function filterObject(obj) {
 // src/next/commands/audit-command/index.ts
 var import_graphql13 = require("@tinacms/graphql");
-var AuditCommand = class extends import_clipanion3.Command {
+var AuditCommand = class extends import_clipanion4.Command {
   constructor() {
     super(...arguments);
-    this.rootPath = import_clipanion3.Option.String("--rootPath", {
+    this.rootPath = import_clipanion4.Option.String("--rootPath", {
       description: "Specify the root directory to run the CLI from"
     });
-    this.verbose = import_clipanion3.Option.Boolean("-v,--verbose", false, {
+    this.verbose = import_clipanion4.Option.Boolean("-v,--verbose", false, {
       description: "increase verbosity of logged output"
     });
-    this.clean = import_clipanion3.Option.Boolean("--clean", false, {
+    this.clean = import_clipanion4.Option.Boolean("--clean", false, {
       description: "Clean the output"
     });
-    this.useDefaultValues = import_clipanion3.Option.Boolean("--useDefaultValues", false, {
+    this.useDefaultValues = import_clipanion4.Option.Boolean("--useDefaultValues", false, {
       description: "When cleaning the output, use defaults on the config"
     });
-    this.noTelemetry = import_clipanion3.Option.Boolean("--noTelemetry", false, {
+    this.noTelemetry = import_clipanion4.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
     });
-    this.datalayerPort = import_clipanion3.Option.String("--datalayer-port", "9000", {
+    this.datalayerPort = import_clipanion4.Option.String("--datalayer-port", "9000", {
       description: "Specify a port to run the datalayer server on. (default 9000)"
     });
   }
@@ -2637,13 +2733,13 @@ var AuditCommand = class extends import_clipanion3.Command {
   }
 };
 AuditCommand.paths = [["audit"]];
-AuditCommand.usage = import_clipanion3.Command.Usage({
+AuditCommand.usage = import_clipanion4.Command.Usage({
   category: `Commands`,
   description: `Audit config and content files`
 });
 // src/next/commands/init-command/index.ts
-var import_clipanion5 = require("clipanion");
+var import_clipanion6 = require("clipanion");
 // src/cmds/init/index.ts
 var import_path11 = __toESM(require("path"));
@@ -3763,16 +3859,16 @@ var rewriteTemplateKeysInDocs = (args) => {
 };
 // src/next/commands/codemod-command/index.ts
-var import_clipanion4 = require("clipanion");
+var import_clipanion5 = require("clipanion");
 var import_fs_extra8 = __toESM(require("fs-extra"));
 var import_path10 = __toESM(require("path"));
-var CodemodCommand = class extends import_clipanion4.Command {
+var CodemodCommand = class extends import_clipanion5.Command {
   constructor() {
     super(...arguments);
-    this.rootPath = import_clipanion4.Option.String("--rootPath", {
+    this.rootPath = import_clipanion5.Option.String("--rootPath", {
       description: "Specify the root directory to run the CLI from"
     });
-    this.verbose = import_clipanion4.Option.Boolean("-v,--verbose", false, {
+    this.verbose = import_clipanion5.Option.Boolean("-v,--verbose", false, {
       description: "increase verbosity of logged output"
     });
   }
@@ -3797,7 +3893,7 @@ var CodemodCommand = class extends import_clipanion4.Command {
   }
 };
 CodemodCommand.paths = [["codemod"], ["codemod", "move-tina-folder"]];
-CodemodCommand.usage = import_clipanion4.Command.Usage({
+CodemodCommand.usage = import_clipanion5.Command.Usage({
   category: `Commands`,
   description: `Use codemods for various Tina tasks`
 });
@@ -4285,16 +4381,16 @@ function execShellCommand(cmd) {
 }
 // src/next/commands/init-command/index.ts
-var InitCommand = class extends import_clipanion5.Command {
+var InitCommand = class extends import_clipanion6.Command {
   constructor() {
     super(...arguments);
-    this.pathToForestryConfig = import_clipanion5.Option.String("--forestryPath", {
+    this.pathToForestryConfig = import_clipanion6.Option.String("--forestryPath", {
       description: "Specify the relative path to the .forestry directory, if importing an existing forestry site."
     });
-    this.rootPath = import_clipanion5.Option.String("--rootPath", {
+    this.rootPath = import_clipanion6.Option.String("--rootPath", {
       description: "Specify the root directory to run the CLI from (defaults to current working directory)"
     });
-    this.noTelemetry = import_clipanion5.Option.Boolean("--noTelemetry", false, {
+    this.noTelemetry = import_clipanion6.Option.Boolean("--noTelemetry", false, {
       description: "Disable anonymous telemetry that is collected"
     });
   }
@@ -4314,13 +4410,13 @@ var InitCommand = class extends import_clipanion5.Command {
   }
 };
 InitCommand.paths = [["init"]];
-InitCommand.usage = import_clipanion5.Command.Usage({
+InitCommand.usage = import_clipanion6.Command.Usage({
   category: `Commands`,
   description: `Add Tina to an existing project`
 });
 // src/index.ts
-var cli = new import_clipanion6.Cli({
+var cli = new import_clipanion7.Cli({
   binaryName: `tinacms`,
   binaryLabel: `TinaCMS`,
   binaryVersion: version
@@ -4330,9 +4426,9 @@ cli.register(BuildCommand);
 cli.register(AuditCommand);
 cli.register(InitCommand);
 cli.register(CodemodCommand);
-cli.register(import_clipanion6.Builtins.DefinitionsCommand);
-cli.register(import_clipanion6.Builtins.HelpCommand);
-cli.register(import_clipanion6.Builtins.VersionCommand);
+cli.register(import_clipanion7.Builtins.DefinitionsCommand);
+cli.register(import_clipanion7.Builtins.HelpCommand);
+cli.register(import_clipanion7.Builtins.VersionCommand);
 var src_default = cli;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/next/codegen/index.d.ts CHANGED Viewed

@@ -8,17 +8,22 @@ export declare class Codegen {
     schema: GraphQLSchema;
     queryDoc: string;
     fragDoc: string;
+    isLocal: boolean;
+    apiURL: string;
+    localUrl: string;
+    productionUrl: string;
     graphqlSchemaDoc: {
         kind: 'Document';
         definitions: TypeDefinitionNode[];
     };
     tinaSchema: TinaSchema;
     lookup: any;
-    constructor({ configManager, port, queryDoc, fragDoc, graphqlSchemaDoc, tinaSchema, lookup, }: {
+    constructor({ configManager, port, queryDoc, fragDoc, isLocal, graphqlSchemaDoc, tinaSchema, lookup, }: {
         configManager: ConfigManager;
         port?: number;
         queryDoc: string;
         fragDoc: string;
+        isLocal: boolean;
         graphqlSchemaDoc: {
             kind: 'Document';
             definitions: TypeDefinitionNode[];
@@ -29,6 +34,7 @@ export declare class Codegen {
     writeConfigFile(fileName: string, data: string): Promise<void>;
     removeGeneratedFilesIfExists(): Promise<void>;
     execute(): Promise<string>;
+    private _createApiUrl;
     getApiURL(): string;
     genClient(): Promise<{
         apiURL: string;

package/dist/next/commands/baseCommands.d.ts ADDED Viewed

@@ -0,0 +1,26 @@
+import { Command } from 'clipanion';
+import type { DocumentNode } from 'graphql';
+import type { Database } from '@tinacms/graphql';
+import type { TinaSchema } from '@tinacms/schema-tools';
+/**
+ * Base Command for Dev and build
+ */
+export declare abstract class BaseCommand extends Command {
+    experimentalDataLayer: boolean;
+    isomorphicGitBridge: boolean;
+    port: string;
+    datalayerPort: string;
+    subCommand: string;
+    rootPath: string;
+    verbose: boolean;
+    noSDK: boolean;
+    noTelemetry: boolean;
+    abstract execute(): Promise<number | void>;
+    startSubCommand(): Promise<void>;
+    logDeprecationWarnings(): void;
+    indexContentWithSpinner({ database, graphQLSchema, tinaSchema, }: {
+        database: Database;
+        graphQLSchema: DocumentNode;
+        tinaSchema: TinaSchema;
+    }): Promise<void>;
+}

package/dist/next/commands/build-command/index.d.ts CHANGED Viewed

@@ -1,17 +1,14 @@
-import { Command } from 'clipanion';
 import { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../config-manager';
-export declare class BuildCommand extends Command {
+import { BaseCommand } from '../baseCommands';
+export declare class BuildCommand extends BaseCommand {
     static paths: string[][];
-    rootPath: string;
-    verbose: boolean;
-    noSDK: boolean;
-    datalayerPort: string;
-    isomorphicGitBridge: boolean;
     localOption: boolean;
-    experimentalDataLayer: boolean;
-    noTelemetry: boolean;
     tinaGraphQLVersion: string;
+    /**
+     * This option allows the user to skip the tina cloud checks if they want to. This could be useful for mismatched GraphQL versions or if they want to build only using the local client and never connect to Tina Cloud
+     */
+    skipCloudChecks: boolean;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
     execute(): Promise<number | void>;

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

@@ -1,21 +1,13 @@
-import { Command } from 'clipanion';
 import { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../config-manager';
-export declare class DevCommand extends Command {
+import { BaseCommand } from '../baseCommands';
+export declare class DevCommand extends BaseCommand {
     static paths: string[][];
-    port: string;
-    datalayerPort: string;
-    subCommand: string;
-    rootPath: string;
     watchFolders: string;
-    isomorphicGitBridge: boolean;
-    experimentalDataLayer: boolean;
-    verbose: boolean;
     noWatch: boolean;
-    noSDK: boolean;
-    noTelemetry: boolean;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
+    logDeprecationWarnings(): void;
     execute(): Promise<number | void>;
     watchContentFiles(configManager: ConfigManager, database: Database): void;
     watchQueries(configManager: ConfigManager, callback: () => Promise<string>): void;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.11",
+  "version": "1.5.13",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,11 +58,11 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.11",
-    "@tinacms/datalayer": "1.2.11",
-    "@tinacms/graphql": "1.4.11",
+    "@tinacms/app": "1.2.13",
+    "@tinacms/datalayer": "1.2.13",
+    "@tinacms/graphql": "1.4.13",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.3",
+    "@tinacms/schema-tools": "1.4.4",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",
@@ -74,7 +74,6 @@
     "chokidar": "^3.5.1",
     "cli-spinner": "^0.2.10",
     "clipanion": "^3.2.0",
-    "commander": "^9.0.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.1",
     "esbuild": "^0.15.5",