@tinacms/cli 1.5.40 → 1.5.42

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.5.40";
+var version = "1.5.42";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -2724,7 +2724,13 @@ ${dangerText(e.message)}
     }
     const skipCloudChecks = this.skipCloudChecks || configManager.hasSelfHostedConfig();
     if (!skipCloudChecks) {
-      await this.checkClientInfo(configManager, codegen2.productionUrl);
+      const { hasUpstream } = await this.checkClientInfo(
+        configManager,
+        codegen2.productionUrl
+      );
+      if (hasUpstream) {
+        await this.syncUpstreamProject(configManager, codegen2.productionUrl);
+      }
       await waitForDB(configManager.config, codegen2.productionUrl, false);
       await this.checkGraphqlSchema(
         configManager,
@@ -2847,6 +2853,7 @@ ${dangerText(e.message)}
     const url = `https://${host}/db/${clientId}/status/${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 +2865,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 +2880,10 @@ ${dangerText(e.message)}
                 key: "clientId",
                 value: config2.clientId
               },
+              {
+                key: "branch",
+                value: config2.branch
+              },
               {
                 key: "token",
                 value: config2.token
@@ -2885,7 +2899,9 @@ ${dangerText(e.message)}
       branchBar.tick({
         prog: "\u2705"
       });
-      return;
+      return {
+        hasUpstream
+      };
     }
     for (let i = 0; i <= 5; i++) {
       await sleepAndCallFunc({
@@ -2921,6 +2937,51 @@ ${dangerText(e.message)}
     );
     throw new Error("Branch is not on Tina Cloud");
   }
+  async syncUpstreamProject(configManager, apiURL) {
+    const { config: config2 } = configManager;
+    const token = config2.token;
+    const { clientId, branch, host } = (0, import_schema_tools2.parseURL)(apiURL);
+    const url = `https://${host}/db/${clientId}/reset/${branch}?refreshSchema=true&skipIfSchemaCurrent=true`;
+    const bar2 = new import_progress2.default("Syncing Upstream 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 upstream 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 +3052,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 +3081,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

@@ -15,7 +15,10 @@ export declare class BuildCommand extends BaseCommand {
     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): Promise<{
+        hasUpstream: boolean;
+    }>;
+    syncUpstreamProject(configManager: ConfigManager, apiURL: string): Promise<void>;
     checkGraphqlSchema(configManager: ConfigManager, database: Database, apiURL: string): Promise<void>;
 }
 export declare const fetchRemoteGraphqlSchema: ({ url, token, }: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.40",
+  "version": "1.5.42",
   "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.36",
-    "tinacms": "1.5.29",
+    "@tinacms/app": "1.2.38",
+    "tinacms": "1.6.0",
     "@tinacms/datalayer": "1.2.33",
     "@tinacms/graphql": "1.4.33",
     "@tinacms/metrics": "1.0.2",