@tinacms/cli 1.5.30 → 1.5.32

package/dist/index.js

@@ -31,7 +31,7 @@ module.exports = __toCommonJS(src_exports);
 var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.5.30";
+var version = "1.5.32";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -890,7 +890,7 @@ var createConfig = async ({
   noWatch,
   rollupOptions
 }) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {
     if (key.startsWith("TINA_PUBLIC_") || key.startsWith("NEXT_PUBLIC_") || key === "NODE_ENV" || key === "HEAD") {
@@ -954,7 +954,7 @@ var createConfig = async ({
       "process.env": `new Object(${JSON.stringify(publicEnv)})`,
       "process.platform": `"${process.platform}"`,
       __API_URL__: `"${apiURL}"`,
-      __TOKEN__: `"${configManager.config.token}"`,
+      __BASE_PATH__: `"${((_e = (_d = configManager.config) == null ? void 0 : _d.build) == null ? void 0 : _e.basePath) || ""}"`,
       __TINA_GRAPHQL_VERSION__: `"${configManager.getTinaGraphQLVersion()}"`
     },
     logLevel: "error",
@@ -963,7 +963,7 @@ var createConfig = async ({
       include: ["react/jsx-runtime", "react/jsx-dev-runtime"]
     },
     server: {
-      host: (_f = (_e = (_d = configManager.config) == null ? void 0 : _d.build) == null ? void 0 : _e.host) != null ? _f : false,
+      host: (_h = (_g = (_f = configManager.config) == null ? void 0 : _f.build) == null ? void 0 : _g.host) != null ? _h : false,
       watch: noWatch ? {
         ignored: ["**/*"]
       } : {
@@ -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 };
@@ -1877,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;
@@ -2133,7 +2129,7 @@ var DevCommand = class extends BaseCommand {
             lookup: lookupObject,
             graphql: graphqlSchemaObject
           });
-          await import_fs_extra6.default.writeFileSync(
+          import_fs_extra6.default.writeFileSync(
             import_path7.default.join(configManager.tinaFolderPath, tinaLockFilename),
             tinaLockContent
           );
@@ -2160,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);
@@ -2521,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;
@@ -2545,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(
@@ -2641,22 +2654,26 @@ var BuildCommand = class extends BaseCommand {
       }
     }
     const summaryItems = [];
+    const autogeneratedFiles = [];
     if (!configManager.shouldSkipSDK()) {
-      summaryItems.push({
-        emoji: "\u{1F916}",
-        heading: "Auto-generated files",
-        subItems: [
-          {
-            key: "GraphQL Client",
-            value: configManager.printGeneratedClientFilePath()
-          },
-          {
-            key: "Typescript Types",
-            value: configManager.printGeneratedTypesFilePath()
-          }
-        ]
+      autogeneratedFiles.push({
+        key: "GraphQL Client",
+        value: configManager.printGeneratedClientFilePath()
+      });
+      autogeneratedFiles.push({
+        key: "Typescript Types",
+        value: configManager.printGeneratedTypesFilePath()
       });
     }
+    autogeneratedFiles.push({
+      key: "Static HTML file",
+      value: configManager.printRelativePath(configManager.outputHTMLFilePath)
+    });
+    summaryItems.push({
+      emoji: "\u{1F916}",
+      heading: "Auto-generated files",
+      subItems: autogeneratedFiles
+    });
     summary({
       heading: "Tina build complete",
       items: [
@@ -2796,7 +2813,7 @@ Additional info: Branch: ${config3.branch}, Client ID: ${config3.clientId} `;
         bar2.tick({
           prog: "\u274C"
         });
-        let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to Github to update your remote GraphQL schema.`;
+        let errorMessage = `The local GraphQL schema doesn't match the remote GraphQL schema. Please push up your changes to GitHub to update your remote GraphQL schema.`;
         if (config3 == null ? void 0 : config3.branch) {
           errorMessage += `
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.30",
+  "version": "1.5.32",
   "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.28",
-    "tinacms": "1.5.21",
-    "@tinacms/datalayer": "1.2.26",
-    "@tinacms/graphql": "1.4.26",
+    "@tinacms/app": "1.2.30",
+    "tinacms": "1.5.23",
+    "@tinacms/datalayer": "1.2.28",
+    "@tinacms/graphql": "1.4.28",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.12",
-    "@tinacms/search": "1.0.11",
+    "@tinacms/schema-tools": "1.4.13",
+    "@tinacms/search": "1.0.13",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",