@tinacms/cli 1.5.41 → 1.5.43

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.5.41";
+var version = "1.5.43";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -1398,12 +1398,18 @@ import { createClient, TinaClient } from "tinacms/dist/client";
 
 const generateRequester = (
   client: TinaClient,
-  options?: { branch?: string }
 ) => {
   const requester: (
     doc: any,
     vars?: any,
-    options?: { branch?: string },
+    options?: {
+      branch?: string,
+      /**
+       * Aside from \`method\` and \`body\`, all fetch options are passed
+       * through to underlying fetch request
+       */
+      fetchOptions?: Omit<Parameters<typeof fetch>[1], 'body' | 'method'>,
+    },
     client
   ) => Promise<any> = async (doc, vars, options) => {
     let url = client.apiUrl
@@ -1415,7 +1421,7 @@ const generateRequester = (
       query: doc,
       variables: vars,
       url,
-    })
+    }, options)
 
     return { data: data?.data, errors: data?.errors, query: doc, variables: vars || {} }
   }
@@ -1438,11 +1444,8 @@ export const ExperimentalGetTinaClient = () =>
 
 export const queries = (
   client: TinaClient,
-  options?: {
-    branch?: string
-  }
 ) => {
-  const requester = generateRequester(client, options)
+  const requester = generateRequester(client)
   return getSdk(requester)
 }
 `;
@@ -2554,7 +2557,7 @@ var IndexFailedError = class extends Error {
     this.name = "IndexFailedError";
   }
 };
-var waitForDB = async (config2, apiUrl, verbose) => {
+var waitForDB = async (config2, apiUrl, previewName, verbose) => {
   const token = config2.token;
   const { clientId, branch, isLocalClient, host } = (0, import_schema_tools.parseURL)(apiUrl);
   if (isLocalClient || !host || !clientId || !branch) {
@@ -2578,7 +2581,7 @@ var waitForDB = async (config2, apiUrl, verbose) => {
         headers.append("X-API-KEY", token);
       }
       const response = await (0, import_node_fetch.default)(
-        `https://${host}/db/${clientId}/status/${branch}`,
+        `https://${host}/db/${clientId}/status/${previewName || branch}`,
         {
           method: "GET",
           headers,
@@ -2598,11 +2601,11 @@ var waitForDB = async (config2, apiUrl, verbose) => {
         await sleepAndCallFunc({ fn: pollForStatus, ms: POLLING_INTERVAL });
       } else if (status === STATUS_FAILED) {
         throw new IndexFailedError(
-          `Attempting to index but responded with status 'failed'. To retry the indexing process, click the "Reindex" button for '${branch}' in the Tina Cloud configuration for this project.  ${error}`
+          `Attempting to index but responded with status 'failed'. To retry the indexing process, click the "Reindex" button for '${previewName || branch}' in the Tina Cloud configuration for this project.  ${error}`
         );
       } else {
         throw new IndexFailedError(
-          `Attempting to index but responded with status 'unknown'. To retry the indexing process, click the "Reindex" button for '${branch}' in the Tina Cloud configuration for this project.  ${error}`
+          `Attempting to index but responded with status 'unknown'. To retry the indexing process, click the "Reindex" button for '${previewName || branch}' in the Tina Cloud configuration for this project.  ${error}`
         );
       }
     } catch (e) {
@@ -2647,6 +2650,15 @@ var BuildCommand = class extends BaseCommand {
     this.skipSearchIndex = import_clipanion3.Option.Boolean("--skip-search-index", false, {
       description: "Skip indexing the site for search"
     });
+    this.upstreamBranch = import_clipanion3.Option.String("--upstream-branch", {
+      description: "Optional upstream branch with the schema. If not specified, default will be used."
+    });
+    this.previewBaseBranch = import_clipanion3.Option.String("--preview-base-branch", {
+      description: "The base branch for the preview"
+    });
+    this.previewName = import_clipanion3.Option.String("--preview-name", {
+      description: "The name of the preview branch"
+    });
   }
   async catch(error) {
     console.error(error);
@@ -2661,6 +2673,22 @@ var BuildCommand = class extends BaseCommand {
       tinaGraphQLVersion: this.tinaGraphQLVersion,
       legacyNoSDK: this.noSDK
     });
+    if (this.previewName && !this.previewBaseBranch) {
+      logger.error(
+        `${dangerText(
+          `ERROR: preview name provided without a preview base branch.`
+        )}`
+      );
+      process.exit(1);
+    }
+    if (this.previewBaseBranch && !this.previewName) {
+      logger.error(
+        `${dangerText(
+          `ERROR: preview base branch provided without a preview name.`
+        )}`
+      );
+      process.exit(1);
+    }
     try {
       await configManager.processConfig();
     } catch (e) {
@@ -2724,8 +2752,31 @@ ${dangerText(e.message)}
     }
     const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
     if (!skipCloudChecks) {
-      await this.checkClientInfo(configManager, codegen2.productionUrl);
-      await waitForDB(configManager.config, codegen2.productionUrl, false);
+      const { hasUpstream } = await this.checkClientInfo(
+        configManager,
+        codegen2.productionUrl,
+        this.previewBaseBranch
+      );
+      if (!hasUpstream && this.upstreamBranch) {
+        logger.warn(
+          `${dangerText(
+            `WARN: Upstream branch '${this.upstreamBranch}' specified but no upstream project was found.`
+          )}`
+        );
+      }
+      if (hasUpstream || this.previewBaseBranch && this.previewName) {
+        await this.syncProject(configManager, codegen2.productionUrl, {
+          upstreamBranch: this.upstreamBranch,
+          previewBaseBranch: this.previewBaseBranch,
+          previewName: this.previewName
+        });
+      }
+      await waitForDB(
+        configManager.config,
+        codegen2.productionUrl,
+        this.previewName,
+        false
+      );
       await this.checkGraphqlSchema(
         configManager,
         database,
@@ -2840,13 +2891,14 @@ ${dangerText(e.message)}
       process.exit();
     }
   }
-  async checkClientInfo(configManager, apiURL) {
+  async checkClientInfo(configManager, apiURL, previewBaseBranch) {
     const { config: config2 } = configManager;
     const token = config2.token;
     const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
-    const url = `https://${host}/db/${clientId}/status/${branch}`;
+    const url = `https://${host}/db/${clientId}/status/${previewBaseBranch || branch}`;
     const bar2 = new import_progress2.default("Checking clientId and token. :prog", 1);
     let branchKnown = false;
+    let hasUpstream = false;
     try {
       const res = await request({
         token,
@@ -2858,6 +2910,9 @@ ${dangerText(e.message)}
       if (!(res.status === "unknown")) {
         branchKnown = true;
       }
+      if (res.hasUpstream) {
+        hasUpstream = true;
+      }
     } catch (e) {
       summary({
         heading: "Error when checking client information",
@@ -2870,6 +2925,10 @@ ${dangerText(e.message)}
                 key: "clientId",
                 value: config2.clientId
               },
+              {
+                key: "branch",
+                value: config2.branch
+              },
               {
                 key: "token",
                 value: config2.token
@@ -2885,7 +2944,9 @@ ${dangerText(e.message)}
       branchBar.tick({
         prog: "\u2705"
       });
-      return;
+      return {
+        hasUpstream
+      };
     }
     for (let i = 0; i <= 5; i++) {
       await sleepAndCallFunc({
@@ -2921,6 +2982,59 @@ ${dangerText(e.message)}
     );
     throw new Error("Branch is not on Tina Cloud");
   }
+  async syncProject(configManager, apiURL, options) {
+    const { config: config2 } = configManager;
+    const token = config2.token;
+    const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
+    const { previewName, previewBaseBranch, upstreamBranch } = options || {};
+    let url = `https://${host}/db/${clientId}/reset/${branch}?refreshSchema=true&skipIfSchemaCurrent=true`;
+    if (upstreamBranch && previewBaseBranch && previewName) {
+      url = `https://${host}/db/${clientId}/reset/${previewBaseBranch}?refreshSchema=true&skipIfSchemaCurrent=true&upstreamBranch=${upstreamBranch}&previewName=${previewName}`;
+    } else if (!upstreamBranch && previewBaseBranch && previewName) {
+      url = `https://${host}/db/${clientId}/reset/${previewBaseBranch}?refreshSchema=true&skipIfSchemaCurrent=true&previewName=${branch}`;
+    } else if (upstreamBranch && !previewBaseBranch && !previewName) {
+      url = `https://${host}/db/${clientId}/reset/${branch}?refreshSchema=true&skipIfSchemaCurrent=true&upstreamBranch=${upstreamBranch}`;
+    }
+    const bar2 = new import_progress2.default("Syncing Project. :prog", 1);
+    try {
+      const res = await request({
+        token,
+        url,
+        method: "POST"
+      });
+      bar2.tick({
+        prog: "\u2705"
+      });
+      if (res.status === "success") {
+        return;
+      }
+    } catch (e) {
+      summary({
+        heading: `Error when requesting project sync`,
+        items: [
+          {
+            emoji: "\u274C",
+            heading: "You provided",
+            subItems: [
+              {
+                key: "clientId",
+                value: config2.clientId
+              },
+              {
+                key: "branch",
+                value: config2.branch
+              },
+              {
+                key: "token",
+                value: config2.token
+              }
+            ]
+          }
+        ]
+      });
+      throw e;
+    }
+  }
   async checkGraphqlSchema(configManager, database, apiURL) {
     const bar2 = new import_progress2.default(
       "Checking local GraphQL Schema matches server. :prog",
@@ -2991,7 +3105,7 @@ async function request(args) {
   headers.append("Content-Type", "application/json");
   const url = args == null ? void 0 : args.url;
   const res = await (0, import_node_fetch2.default)(url, {
-    method: "GET",
+    method: args.method || "GET",
     headers,
     redirect: "follow"
   });
@@ -3020,7 +3134,8 @@ Message from server: ${json.message}`;
   }
   return {
     status: json == null ? void 0 : json.status,
-    timestamp: json == null ? void 0 : json.timestamp
+    timestamp: json == null ? void 0 : json.timestamp,
+    hasUpstream: (json == null ? void 0 : json.hasUpstream) || false
   };
 }
 var fetchRemoteGraphqlSchema = async ({

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

@@ -12,10 +12,20 @@ export declare class BuildCommand extends BaseCommand {
      */
     skipCloudChecks: boolean;
     skipSearchIndex: boolean;
+    upstreamBranch: string;
+    previewBaseBranch: string;
+    previewName: string;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
     execute(): Promise<number | void>;
-    checkClientInfo(configManager: ConfigManager, apiURL: string): Promise<void>;
+    checkClientInfo(configManager: ConfigManager, apiURL: string, previewBaseBranch?: string): Promise<{
+        hasUpstream: boolean;
+    }>;
+    syncProject(configManager: ConfigManager, apiURL: string, options?: {
+        upstreamBranch?: string;
+        previewBaseBranch?: string;
+        previewName?: string;
+    }): Promise<void>;
     checkGraphqlSchema(configManager: ConfigManager, database: Database, apiURL: string): Promise<void>;
 }
 export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {

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

@@ -4,4 +4,4 @@ export interface IndexStatusResponse {
     timestamp: number;
     error?: string;
 }
-export declare const waitForDB: (config: Config<true>, apiUrl: string, verbose?: boolean) => Promise<void>;
+export declare const waitForDB: (config: Config<true>, apiUrl: string, previewName?: string, verbose?: boolean) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.41",
+  "version": "1.5.43",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -57,8 +57,8 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.37",
-    "tinacms": "1.5.30",
+    "@tinacms/app": "1.2.39",
+    "tinacms": "1.6.1",
     "@tinacms/datalayer": "1.2.33",
     "@tinacms/graphql": "1.4.33",
     "@tinacms/metrics": "1.0.2",