@tinacms/cli 2.2.3 → 2.2.4

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.2.3";
+var version = "2.2.4";
 
 // src/next/commands/dev-command/index.ts
 import path8 from "path";
@@ -472,22 +472,28 @@ var Codegen = class {
   localUrl;
   // production url
   productionUrl;
+  // URL for the local GraphQL server used during --content=local builds
+  localBuildUrl;
   graphqlSchemaDoc;
   tinaSchema;
   lookup;
   noClientBuildCache;
+  // When true, queries run locally but the generated client points to TinaCloud
+  localContentBuild;
   constructor({
     configManager,
     port,
     queryDoc,
     fragDoc,
     isLocal,
+    localContentBuild,
     graphqlSchemaDoc,
     tinaSchema,
     lookup,
     noClientBuildCache
   }) {
     this.isLocal = isLocal;
+    this.localContentBuild = localContentBuild || false;
     this.graphqlSchemaDoc = graphqlSchemaDoc;
     this.configManager = configManager;
     this.port = port;
@@ -536,10 +542,11 @@ var Codegen = class {
       JSON.stringify(this.tinaSchema.schema)
     );
     await this.writeConfigFile("_lookup.json", JSON.stringify(this.lookup));
-    const { apiURL, localUrl, tinaCloudUrl } = this._createApiUrl();
+    const { apiURL, localUrl, tinaCloudUrl, localBuildUrl } = this._createApiUrl();
     this.apiURL = apiURL;
     this.localUrl = localUrl;
     this.productionUrl = tinaCloudUrl;
+    this.localBuildUrl = localBuildUrl;
     if (this.configManager.shouldSkipSDK()) {
       await this.removeGeneratedFilesIfExists();
       return apiURL;
@@ -638,13 +645,19 @@ var Codegen = class {
     }
     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}`;
+    let apiURL;
+    if (this.isLocal && !this.localContentBuild) {
+      apiURL = `http://localhost:${this.port}/graphql`;
+    } else {
+      apiURL = `${baseUrl}/${version2}/content/${clientId}/github/${branch}`;
+    }
     if (this.configManager.config.contentApiUrlOverride) {
       apiURL = this.configManager.config.contentApiUrlOverride;
       localUrl = apiURL;
       tinaCloudUrl = apiURL;
     }
-    return { apiURL, localUrl, tinaCloudUrl };
+    const localBuildUrl = this.port ? `http://localhost:${this.port}/graphql` : void 0;
+    return { apiURL, localUrl, tinaCloudUrl, localBuildUrl };
   }
   getApiURL() {
     if (!this.apiURL)
@@ -747,7 +760,7 @@ export default databaseClient;
 import { queries } from "./types";
 export const client = createClient({ ${this.noClientBuildCache === false ? `cacheDir: '${normalizePath(
       this.configManager.generatedCachePath
-    )}', ` : ""}url: '${apiURL}', token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
+    )}', ` : ""}url: ${this.localContentBuild ? `process.env.TINA_LOCAL_URL || '${apiURL}'` : `'${apiURL}'`}, token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
 export default client;
   `;
     return { apiURL, clientString };
@@ -3137,6 +3150,9 @@ var BuildCommand = class extends BaseCommand {
   localOption = Option3.Boolean("--local", {
     description: "Starts local Graphql server and builds the local client instead of production client"
   });
+  contentOption = Option3.String("--content", {
+    description: "Source for content during the build. Use `--content=local` to build from local content for fast builds while still generating a production client that connects to TinaCloud when deployed."
+  });
   skipIndexing = Option3.Boolean("--skip-indexing", false, {
     description: "Skips indexing the content. This can be used for building the site without indexing the content  (defaults to false)"
   });
@@ -3199,6 +3215,15 @@ var BuildCommand = class extends BaseCommand {
       );
       process.exit(1);
     }
+    if (this.contentOption !== void 0 && this.contentOption !== "local") {
+      logger.error(
+        `${dangerText(
+          `ERROR: --content only accepts 'local'. Received '${this.contentOption}'.`
+        )}`
+      );
+      process.exit(1);
+    }
+    const localContentOnly = this.contentOption === "local";
     try {
       await configManager.processConfig();
     } catch (e) {
@@ -3209,6 +3234,21 @@ ${dangerText(e.message)}`);
       );
       process.exit(1);
     }
+    if (localContentOnly && !this.localOption) {
+      const config2 = configManager.config;
+      const missing = [];
+      if (!config2.branch) missing.push("branch");
+      if (!config2.clientId) missing.push("clientId");
+      if (!config2.token) missing.push("token");
+      if (missing.length > 0) {
+        logger.error(
+          `${dangerText(
+            `ERROR: --content=local requires ${missing.join(", ")} to be configured, since the generated client must point to TinaCloud.`
+          )}`
+        );
+        process.exit(1);
+      }
+    }
     let server;
     createDBServer(Number(this.datalayerPort));
     const database = await createAndInitializeDatabase(
@@ -3216,10 +3256,12 @@ ${dangerText(e.message)}`);
       Number(this.datalayerPort)
     );
     const { queryDoc, fragDoc, graphQLSchema, tinaSchema, lookup } = await buildSchema2(configManager.config);
+    const useLocalServer = this.localOption || localContentOnly;
     const codegen2 = new Codegen({
       configManager,
-      port: this.localOption ? Number(this.port) : void 0,
-      isLocal: this.localOption,
+      port: useLocalServer ? Number(this.port) : void 0,
+      isLocal: useLocalServer,
+      localContentBuild: localContentOnly && !this.localOption,
       queryDoc,
       fragDoc,
       graphqlSchemaDoc: graphQLSchema,
@@ -3228,8 +3270,8 @@ ${dangerText(e.message)}`);
       noClientBuildCache: this.noClientBuildCache
     });
     const apiURL = await codegen2.execute();
-    if ((configManager.hasSelfHostedConfig() || this.localOption) && !this.skipIndexing) {
-      const text = this.localOption ? void 0 : "Indexing to self-hosted data layer";
+    if ((configManager.hasSelfHostedConfig() || this.localOption || localContentOnly) && !this.skipIndexing) {
+      const text = this.localOption || localContentOnly ? void 0 : "Indexing to self-hosted data layer";
       try {
         await this.indexContentWithSpinner({
           text,
@@ -3250,12 +3292,13 @@ ${dangerText(e.message)}
         process.exit(1);
       }
     }
-    if (this.localOption) {
+    if (this.localOption || localContentOnly) {
+      const serverUrl = codegen2.localBuildUrl || apiURL;
       server = await createDevServer(
         configManager,
         database,
         null,
-        apiURL,
+        serverUrl,
         true,
         (lockedFn) => lockedFn()
       );
@@ -3327,7 +3370,12 @@ ${dangerText(e.message)}
       configManager.outputGitignorePath,
       "index.html\nassets/"
     );
-    if (configManager.config.search && !this.skipSearchIndex && !this.localOption) {
+    if (localContentOnly && configManager.config.search && !this.skipSearchIndex) {
+      logger.warn(
+        `${warnText("WARN: Search indexing skipped when building with --content=local. The search index on TinaCloud was not updated.")}`
+      );
+    }
+    if (configManager.config.search && !this.skipSearchIndex && !this.localOption && !localContentOnly) {
       let client;
       const hasTinaSearch = Boolean(configManager.config?.search?.tina);
       if (hasTinaSearch) {
@@ -3426,6 +3474,12 @@ ${dangerText(e.message)}
         ...summaryItems
       ]
     });
+    if (localContentOnly && codegen2.localBuildUrl) {
+      process.env.TINA_LOCAL_URL = codegen2.localBuildUrl;
+      if (!process.env.NODE_ENV || process.env.NODE_ENV !== "production") {
+        process.env.NODE_ENV = "production";
+      }
+    }
     if (this.subCommand) {
       await this.startSubCommand();
     } else {
@@ -4845,7 +4899,7 @@ var ErrorSingleton = class _ErrorSingleton {
       });
       logger.error(
         `If you wish to edit any of the following templates, you will have to update your content and code to use the new name. See ${linkText(
-          "https://tina.io/docs/forestry/common-errors/#migrating-fields-with-non-alphanumeric-characters"
+          "https://tina.io/docs/r/forestry-common-errors#migrating-fields-with-non-alphanumeric-characters"
         )} for more information.`
       );
     }
@@ -5289,7 +5343,7 @@ var transformForestryMatchToTinaMatch = (match) => {
   if (match !== newMatch) {
     logger.info(
       `Info: Match ${match} was transformed to ${newMatch}. See ${linkText(
-        "https://tina.io/docs/forestry/common-errors/#info-match-match-was-transformed-to-newmatch"
+        "https://tina.io/docs/r/forestry-common-errors#info-match-match-was-transformed-to-newmatch"
       )}`
     );
   }
@@ -5433,7 +5487,7 @@ var generateCollectionFromForestrySection = (args) => {
       logger.warn(
         warnText(
           `No templates found for section ${section.label}. Please see ${linkText(
-            "https://tina.io/docs/forestry/content-modelling/"
+            "https://tina.io/docs/r/forestry-content-modelling"
           )} for more information`
         )
       );
@@ -6381,7 +6435,7 @@ async function apply({
   if (config2.framework.name === "other" && config2.hosting === "self-host") {
     logger.error(
       logText(
-        "Self-hosted Tina requires init setup only works with next.js right now. Please check out the docs for info on how to setup Tina on another framework: https://tina.io/docs/self-hosted/existing-site/"
+        "Self-hosted Tina requires init setup only works with next.js right now. Please check out the docs for info on how to setup Tina on another framework: https://tina.io/docs/r/self-hosting-nextjs"
       )
     );
     return;
@@ -6766,7 +6820,7 @@ TINA_PUBLIC_IS_LOCAL=true`;
       logger.info(indentText(envFileText));
     }
     logger.info(
-      "Before you can run your site you will need to update it to use the backend client.\nSee docs for more info: https://tina.io/docs/self-hosted/querying-data/"
+      "Before you can run your site you will need to update it to use the backend client.\nSee docs for more info: https://tina.io/docs/r/self-hosted-querying-data"
     );
     logger.info(
       "If you are deploying to vercel make sure to add the environment variables to your project."

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

@@ -12,16 +12,19 @@ export declare class Codegen {
     apiURL: string;
     localUrl: string;
     productionUrl: string;
+    localBuildUrl?: string;
     graphqlSchemaDoc: DocumentNode;
     tinaSchema: TinaSchema;
     lookup: any;
     noClientBuildCache: boolean;
-    constructor({ configManager, port, queryDoc, fragDoc, isLocal, graphqlSchemaDoc, tinaSchema, lookup, noClientBuildCache, }: {
+    localContentBuild: boolean;
+    constructor({ configManager, port, queryDoc, fragDoc, isLocal, localContentBuild, graphqlSchemaDoc, tinaSchema, lookup, noClientBuildCache, }: {
         configManager: ConfigManager;
         port?: number;
         queryDoc: string;
         fragDoc: string;
         isLocal: boolean;
+        localContentBuild?: boolean;
         graphqlSchemaDoc: DocumentNode;
         tinaSchema: TinaSchema;
         lookup: any;

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

@@ -4,6 +4,7 @@ import { BaseCommand } from '../baseCommands';
 export declare class BuildCommand extends BaseCommand {
     static paths: string[][];
     localOption: boolean;
+    contentOption: string;
     skipIndexing: boolean;
     partialReindex: boolean;
     tinaGraphQLVersion: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -88,12 +88,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.4.3",
-    "@tinacms/metrics": "2.0.1",
-    "@tinacms/graphql": "2.2.4",
-    "@tinacms/search": "1.2.10",
+    "@tinacms/graphql": "2.2.5",
+    "@tinacms/app": "2.4.4",
     "@tinacms/schema-tools": "2.7.2",
-    "tinacms": "3.7.3"
+    "@tinacms/metrics": "2.0.1",
+    "@tinacms/search": "1.2.11",
+    "tinacms": "3.7.4"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"