@tinacms/cli 1.5.29 → 1.5.31

package/LICENSE

@@ -1,12 +1,4 @@
-Copyright (c) 2023-present Forestry.io Holdings Inc. 
-
-Portions of the TinaCMS software are licensed as follows:
-
-* All software that resides under the "packages/@tinacms/datalayer/" and the "packages/@tinacms/graphql/" directories (the "Tina Data Layer"), is licensed under the license defined in "packages/@tinacms/datalayer/LICENSE".
-
-* All software outside of the above-mentioned directories is available under the "Apache 2.0" license as set forth below.
-
-Apache License
+                                Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.5.29";
+var version = "1.5.31";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -1391,7 +1391,7 @@ const generateRequester = (
       url,
     })
 
-    return { data: data?.data, query: doc, variables: vars || {} }
+    return { data: data?.data, errors: data?.errors, query: doc, variables: vars || {} }
   }
 
   return requester
@@ -1464,7 +1464,7 @@ var GenericSdkVisitor = class extends import_visitor_plugin_common.ClientSideBas
         node,
         documentVariableName,
         operationType,
-        operationResultType: `{data: ${operationResultType}, variables: ${operationVariablesTypes}, query: string}`,
+        operationResultType: `{data: ${operationResultType}, errors?: { message: string, locations: { line: number, column: number }[], path: string[] }[], variables: ${operationVariablesTypes}, query: string}`,
         operationVariablesTypes
       });
     }
@@ -1718,12 +1718,13 @@ var Codegen = class {
     return this.apiURL;
   }
   async genClient() {
-    var _a;
+    var _a, _b, _c;
     const token = (_a = this.configManager.config) == null ? void 0 : _a.token;
+    const errorPolicy = (_c = (_b = this.configManager.config) == null ? void 0 : _b.client) == null ? void 0 : _c.errorPolicy;
     const apiURL = this.getApiURL();
     const clientString = `import { createClient } from "tinacms/dist/client";
 import { queries } from "./types";
-export const client = createClient({ url: '${apiURL}', token: '${token}', queries });
+export const client = createClient({ url: '${apiURL}', token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
 export default client;
   `;
     return { apiURL, clientString };
@@ -1763,11 +1764,9 @@ var maybeWarnFragmentSize = async (filepath) => {
     );
     console.log(
       `const schema = defineSchema({
-        config: {
-            client: {
-                referenceDepth: 1,
-            },
-        }
+          client: {
+              referenceDepth: 1,
+          },
         // ...
     })`
     );
@@ -1879,12 +1878,7 @@ async function localSpin({
   });
   spinner.setSpinnerString("\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F");
   spinner.start();
-  let res;
-  try {
-    res = await waitFor();
-  } catch (e) {
-    console.error(e);
-  }
+  const res = await waitFor();
   spinner.stop();
   console.log("");
   return res;
@@ -2000,8 +1994,9 @@ var BaseCommand = class extends import_clipanion.Command {
           }
         }
         const lastSha = await database.getMetadata("lastSha");
+        const exists = lastSha && await (0, import_graphql8.shaExists)({ fs: import_fs_extra5.default, dir: rootPath, sha: lastSha });
         let res;
-        if (partialReindex && lastSha && sha) {
+        if (partialReindex && lastSha && exists && sha) {
           const pathFilter = {};
           if (configManager.isUsingLegacyFolder) {
             pathFilter[".tina/__generated__/_schema.json"] = {};
@@ -2128,14 +2123,24 @@ var DevCommand = class extends BaseCommand {
           const schemaObject = require(configManager.generatedSchemaJSONPath);
           const lookupObject = require(configManager.generatedLookupJSONPath);
           const graphqlSchemaObject = require(configManager.generatedGraphQLJSONPath);
-          await import_fs_extra6.default.writeFileSync(
-            import_path7.default.join(configManager.tinaFolderPath, "tina-lock.json"),
-            JSON.stringify({
-              schema: schemaObject,
-              lookup: lookupObject,
-              graphql: graphqlSchemaObject
-            })
+          const tinaLockFilename = "tina-lock.json";
+          const tinaLockContent = JSON.stringify({
+            schema: schemaObject,
+            lookup: lookupObject,
+            graphql: graphqlSchemaObject
+          });
+          import_fs_extra6.default.writeFileSync(
+            import_path7.default.join(configManager.tinaFolderPath, tinaLockFilename),
+            tinaLockContent
           );
+          if (configManager.hasSeparateContentRoot()) {
+            const rootPath = await configManager.getTinaFolderPath(
+              configManager.contentRootPath
+            );
+            const filePath = import_path7.default.join(rootPath, tinaLockFilename);
+            await import_fs_extra6.default.ensureFile(filePath);
+            await import_fs_extra6.default.outputFile(filePath, tinaLockContent);
+          }
         }
         if (!this.noWatch) {
           this.watchQueries(configManager, async () => await codegen2.execute());
@@ -2151,14 +2156,17 @@ var DevCommand = class extends BaseCommand {
         }
         return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
       } catch (e) {
-        logger.error(dangerText(e.message));
+        logger.error(`
+
+${dangerText(e.message)}
+`);
         if (this.verbose) {
           console.error(e);
         }
         if (firstTime) {
           logger.error(
             warnText(
-              "Unable to start dev server, please fix your Tina config and try again"
+              "Unable to start dev server, please fix your Tina config / resolve any errors above and try again"
             )
           );
           process.exit(1);
@@ -2512,8 +2520,11 @@ var BuildCommand = class extends BaseCommand {
     try {
       await configManager.processConfig();
     } catch (e) {
-      logger.error(e.message);
-      logger.error("Unable to build, please fix your Tina config and try again");
+      logger.error(`
+${dangerText(e.message)}`);
+      logger.error(
+        dangerText("Unable to build, please fix your Tina config and try again")
+      );
       process.exit(1);
     }
     let server;
@@ -2536,14 +2547,25 @@ var BuildCommand = class extends BaseCommand {
     const apiURL = await codegen2.execute();
     if ((configManager.hasSelfHostedConfig() || this.localOption) && !this.skipIndexing) {
       const text = this.localOption ? void 0 : "Indexing to self-hosted data layer";
-      await this.indexContentWithSpinner({
-        text,
-        database,
-        graphQLSchema,
-        tinaSchema,
-        configManager,
-        partialReindex: this.partialReindex
-      });
+      try {
+        await this.indexContentWithSpinner({
+          text,
+          database,
+          graphQLSchema,
+          tinaSchema,
+          configManager,
+          partialReindex: this.partialReindex
+        });
+      } catch (e) {
+        logger.error(`
+
+${dangerText(e.message)}
+`);
+        if (this.verbose) {
+          console.error(e);
+        }
+        process.exit(1);
+      }
     }
     if (this.localOption) {
       server = await createDevServer(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.29",
+  "version": "1.5.31",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,13 +58,13 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.27",
-    "tinacms": "1.5.20",
-    "@tinacms/datalayer": "1.2.25",
-    "@tinacms/graphql": "1.4.25",
+    "@tinacms/app": "1.2.29",
+    "tinacms": "1.5.22",
+    "@tinacms/datalayer": "1.2.27",
+    "@tinacms/graphql": "1.4.27",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.12",
-    "@tinacms/search": "1.0.10",
+    "@tinacms/schema-tools": "1.4.13",
+    "@tinacms/search": "1.0.12",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",