@tinacms/cli 0.61.6 → 0.61.9

package/dist/buildTina/index.d.ts

@@ -17,6 +17,8 @@ interface BuildOptions {
     database: Database;
     store: Store;
     bridge: Bridge;
+    /** In some cases (like audit) there's no need to build the SPA */
+    buildFrontend?: boolean;
     noWatch?: boolean;
     isomorphicGitBridge?: boolean;
     verbose?: boolean;
@@ -38,5 +40,5 @@ export declare const buildSetupCmdAudit: (ctx: any, next: () => void, options: {
 }) => Promise<void>;
 export declare const buildCmdBuild: (ctx: any, next: () => void, options: Omit<BuildOptions & BuildSetupOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
 export declare const auditCmdBuild: (ctx: any, next: () => void, options: Omit<BuildOptions & BuildSetupOptions, 'bridge' | 'database' | 'store'>) => Promise<void>;
-export declare const build: ({ noWatch, ctx, bridge, database, store, beforeBuild, afterBuild, dev, local, verbose, noSDK, skipIndex, }: BuildOptions) => Promise<void>;
+export declare const build: ({ noWatch, ctx, bridge, database, store, beforeBuild, afterBuild, dev, local, verbose, buildFrontend, noSDK, skipIndex, }: BuildOptions) => Promise<void>;
 export {};

package/dist/cmds/audit/audit.d.ts

@@ -15,7 +15,13 @@ declare type AuditArgs = {
     collection: TinaCloudCollection;
     database: Database;
     rootPath: string;
+    documents: {
+        node: {
+            path: string;
+        };
+    }[];
     useDefaultValues: boolean;
+    verbose?: boolean;
 };
 export declare const auditCollection: (args: AuditArgs) => Promise<boolean>;
 export declare const auditDocuments: (args: AuditArgs) => Promise<boolean>;

package/dist/index.js

@@ -293,7 +293,7 @@ var commander = __toModule(require("commander"));
 
 // package.json
 var name = "@tinacms/cli";
-var version = "0.61.6";
+var version = "0.61.9";
 
 // src/cmds/audit/audit.ts
 var import_graphql = __toModule(require("@tinacms/graphql"));
@@ -313,81 +313,14 @@ logger.level = "info";
 // src/cmds/audit/audit.ts
 var import_graphql2 = __toModule(require("@tinacms/graphql"));
 var import_chalk = __toModule(require("chalk"));
-var auditCollection = async (args) => {
-  let warning = false;
-  const { collection, database, rootPath: rootPath2 } = args;
-  logger.info(`Checking collection ${collection.name}`);
-  const query = `query {
-        collection(collection: "${collection.name}") {
-          format
-          documents {
-            edges {
-              node {
-                ...on Document {
-                  _sys {
-                    extension
-                    path
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      `;
-  const result = await (0, import_graphql.resolve)({
-    database,
-    query,
-    variables: {}
-  });
-  const format = result.data.collection.format;
-  const docs = result.data.collection.documents.edges;
-  docs.forEach((x) => {
-    const node = x.node;
-    if (node._sys.extension.replace(".", "") !== format) {
-      warning = true;
-      logger.warn(import_chalk.default.yellowBright(`WARNING: there is a file with extension \`${node._sys.extension}\` but in your schema it is defined to be \`.${format}\`
-
-location: ${import_path.default.join(rootPath2, node._sys.path)}`));
-    }
-  });
-  return warning;
-};
 var auditDocuments = async (args) => {
-  const { collection, database, rootPath: rootPath2, useDefaultValues } = args;
-  const query = `query {
-        collection(collection: "${collection.name}") {
-          format
-          slug
-          documents {
-            edges {
-              node {
-                ...on Document {
-                  _sys {
-                    extension
-                    path
-                    relativePath
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      `;
-  const result = await (0, import_graphql.resolve)({
-    database,
-    query,
-    variables: {}
-  });
+  const { collection, database, useDefaultValues, documents } = args;
   let error = false;
-  const documents = result.data.collection.documents.edges;
   for (let i = 0; i < documents.length; i++) {
     const node = documents[i].node;
-    const fullPath = import_path.default.join(rootPath2, node._sys.path);
-    logger.info(`Checking document: ${fullPath}`);
+    const relativePath = node.path.replace(`${collection.path}/`, "");
     const documentQuery = `query {
-        document(collection: "${collection.name}", relativePath: "${node._sys.relativePath}") {
+        document(collection: "${collection.name}", relativePath: "${relativePath}") {
           __typename
           ...on Document {
             _values
@@ -397,44 +330,58 @@ var auditDocuments = async (args) => {
     const docResult = await (0, import_graphql.resolve)({
       database,
       query: documentQuery,
-      variables: {}
+      variables: {},
+      silenceErrors: true,
+      verbose: args.verbose || false,
+      isAudit: true
     });
-    const topLevelDefaults = {};
-    if (useDefaultValues && typeof collection.fields !== "string") {
-      collection.fields.filter((x) => !x.list).forEach((x) => {
-        const value = x.ui;
-        if (typeof value !== "undefined") {
-          topLevelDefaults[x.name] = value.defaultValue;
+    if (docResult.errors) {
+      error = true;
+      docResult.errors.forEach((err) => {
+        logger.error(import_chalk.default.red(err.message));
+        if (err.originalError.originalError) {
+          logger.error(import_chalk.default.red(`    ${err.originalError.originalError.message}`));
         }
       });
-    }
-    const params = transformDocumentIntoMutationRequestPayload(docResult.data.document._values, {
-      includeCollection: true,
-      includeTemplate: typeof collection.templates !== "undefined"
-    }, topLevelDefaults);
-    const mutation = `mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
+    } else {
+      const topLevelDefaults = {};
+      if (useDefaultValues && typeof collection.fields !== "string") {
+        collection.fields.filter((x) => !x.list).forEach((x) => {
+          const value = x.ui;
+          if (typeof value !== "undefined") {
+            topLevelDefaults[x.name] = value.defaultValue;
+          }
+        });
+      }
+      const params = transformDocumentIntoMutationRequestPayload(docResult.data.document._values, {
+        includeCollection: true,
+        includeTemplate: typeof collection.templates !== "undefined"
+      }, topLevelDefaults);
+      const mutation = `mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
         updateDocument(
           collection: $collection,
           relativePath: $relativePath,
           params: $params
         ){__typename}
       }`;
-    const mutationRes = await (0, import_graphql.resolve)({
-      database,
-      query: mutation,
-      variables: {
-        params,
-        collection: collection.name,
-        relativePath: node._sys.relativePath
-      },
-      silenceErrors: true,
-      verbose: true
-    });
-    if (mutationRes.errors) {
-      mutationRes.errors.forEach((err) => {
-        error = true;
-        logger.error(import_chalk.default.red(err.message));
+      const mutationRes = await (0, import_graphql.resolve)({
+        database,
+        query: mutation,
+        variables: {
+          params,
+          collection: collection.name,
+          relativePath
+        },
+        isAudit: true,
+        silenceErrors: true,
+        verbose: args.verbose || false
       });
+      if (mutationRes.errors) {
+        mutationRes.errors.forEach((err) => {
+          error = true;
+          logger.error(import_chalk.default.red(err.message));
+        });
+      }
     }
   }
   return error;
@@ -484,9 +431,22 @@ function filterObject(obj) {
 }
 
 // src/cmds/audit/index.ts
-var import_chalk2 = __toModule(require("chalk"));
+var import_chalk3 = __toModule(require("chalk"));
 var import_prompts = __toModule(require("prompts"));
 var import_metrics = __toModule(require("@tinacms/metrics"));
+
+// src/utils/theme.ts
+var import_chalk2 = __toModule(require("chalk"));
+var successText = import_chalk2.default.bold.green;
+var dangerText = import_chalk2.default.bold.red;
+var neutralText = import_chalk2.default.bold.cyan;
+var labelText = import_chalk2.default.bold;
+var cmdText = import_chalk2.default.inverse;
+var logText = import_chalk2.default.italic.gray;
+var warnText = import_chalk2.default.yellowBright.bgBlack;
+var CONFIRMATION_TEXT = import_chalk2.default.dim("enter to confirm");
+
+// src/cmds/audit/index.ts
 var rootPath = process.cwd();
 var audit = async (ctx, next, options) => {
   const telemetry = new import_metrics.Telemetry({ disabled: options.noTelemetry });
@@ -498,7 +458,7 @@ var audit = async (ctx, next, options) => {
     }
   });
   if (options.clean) {
-    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk2.default.bold("clean git tree")} so unwanted changes can be undone.
+    logger.info(`You are using the \`--clean\` option. This will modify your content as if a user is submitting a form. Before running this you should have a ${import_chalk3.default.bold("clean git tree")} so unwanted changes can be undone.
 
 `);
     const res = await (0, import_prompts.default)({
@@ -507,52 +467,47 @@ var audit = async (ctx, next, options) => {
       message: `Do you want to continue?`
     });
     if (!res.useClean) {
-      logger.warn(import_chalk2.default.yellowBright("\u26A0\uFE0F Audit not complete"));
+      logger.warn(import_chalk3.default.yellowBright("\u26A0\uFE0F Audit not complete"));
       process.exit(0);
     }
   }
   if (options.useDefaultValues && !options.clean) {
-    logger.warn(import_chalk2.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
+    logger.warn(import_chalk3.default.yellowBright("WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"));
   }
   const database = ctx.database;
   const schema = await database.getSchema();
   const collections = schema.getCollections();
-  let warning = false;
   let error = false;
   for (let i = 0; i < collections.length; i++) {
     const collection = collections[i];
-    const returnWarning = await auditCollection({
-      collection,
-      database,
-      rootPath,
-      useDefaultValues: options.useDefaultValues
-    });
+    const docs = await database.query({ collection: collection.name, first: -1, filterChain: [] }, (item) => ({ path: item }));
+    logger.info(`Checking ${neutralText(collection.name)} collection`);
     const returnError = await auditDocuments({
       collection,
       database,
       rootPath,
-      useDefaultValues: options.useDefaultValues
+      useDefaultValues: options.useDefaultValues,
+      documents: docs.edges,
+      verbose: ctx.verbose
     });
-    warning = warning || returnWarning;
     error = error || returnError;
   }
-  ctx.warning = warning;
   ctx.error = error;
   next();
 };
 var printFinalMessage = async (ctx, next, _options) => {
   if (ctx.error) {
-    logger.error(import_chalk2.default.redBright(`\u203C\uFE0F Audit ${import_chalk2.default.bold("failed")} with errors`));
+    logger.error(import_chalk3.default.redBright(`\u203C\uFE0F Audit ${import_chalk3.default.bold("failed")} with errors`));
   } else if (ctx.warning) {
-    logger.warn(import_chalk2.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
+    logger.warn(import_chalk3.default.yellowBright("\u26A0\uFE0F Audit passed with warnings"));
   } else {
-    logger.info(import_chalk2.default.greenBright("\u2705 Audit passed"));
+    logger.info(import_chalk3.default.greenBright("\u2705 Audit passed"));
   }
   next();
 };
 
 // src/cmds/init/setup-files/index.ts
-var import_chalk3 = __toModule(require("chalk"));
+var import_chalk4 = __toModule(require("chalk"));
 var adminPage = `import { TinaAdmin } from 'tinacms';
 export default TinaAdmin;
 `;
@@ -856,15 +811,15 @@ export default App
 `;
 };
 var AppJsContentPrintout = (usingSrc, extraImports) => {
-  const importLine = import_chalk3.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
+  const importLine = import_chalk4.default.green(`+ import Tina from '${usingSrc ? "../" : ""}../.tina/components/TinaDynamicProvider.js'`);
   return `${importLine}
   ${extraImports || ""}
 
   const App = ({ Component, pageProps }) => {
   return (
-    ${import_chalk3.default.green("+ <Tina>")}
+    ${import_chalk4.default.green("+ <Tina>")}
         <Component {...pageProps} />
-    ${import_chalk3.default.green("+ </Tina>")}
+    ${import_chalk4.default.green("+ </Tina>")}
   )
 }
 
@@ -905,17 +860,6 @@ const DynamicTina = ({ children }) => {
 export default DynamicTina
 `;
 
-// src/utils/theme.ts
-var import_chalk4 = __toModule(require("chalk"));
-var successText = import_chalk4.default.bold.green;
-var dangerText = import_chalk4.default.bold.red;
-var neutralText = import_chalk4.default.bold.cyan;
-var labelText = import_chalk4.default.bold;
-var cmdText = import_chalk4.default.inverse;
-var logText = import_chalk4.default.italic.gray;
-var warnText = import_chalk4.default.yellowBright.bgBlack;
-var CONFIRMATION_TEXT = import_chalk4.default.dim("enter to confirm");
-
 // src/utils/script-helpers.ts
 function generateGqlScript(scriptValue) {
   return `tinacms dev -c "${scriptValue}"`;
@@ -1304,9 +1248,9 @@ var getPath = ({
   }
   const filePaths = allowedTypes.map((ext) => import_path3.default.join(projectDir, `${filename}.${ext}`));
   let inputFile = void 0;
-  filePaths.every((path7) => {
-    if (import_fs_extra2.default.existsSync(path7)) {
-      inputFile = path7;
+  filePaths.every((path8) => {
+    if (import_fs_extra2.default.existsSync(path8)) {
+      inputFile = path8;
       return false;
     }
     return true;
@@ -1533,14 +1477,29 @@ var transpile = async (inputFile, outputFile, tempDir, verbose, define, packageJ
   const peerDeps = (packageJSON == null ? void 0 : packageJSON.peerDependencies) || [];
   const devDeps = (packageJSON == null ? void 0 : packageJSON.devDependencies) || [];
   const external = Object.keys(__spreadValues(__spreadValues(__spreadValues({}, deps), peerDeps), devDeps));
+  const prebuiltInputPath = import_path4.default.join(tempDir, "temp-output.jsx");
+  await (0, import_esbuild.build)({
+    bundle: true,
+    platform: "neutral",
+    target: ["es2020"],
+    entryPoints: [inputFile],
+    treeShaking: true,
+    external: [...external, "./node_modules/*"],
+    loader: loaders,
+    outfile: prebuiltInputPath,
+    define
+  });
+  const tempTsConfigPath = import_path4.default.join(tempDir, "temp-tsconfig.json");
+  await import_fs_extra3.default.outputFileSync(tempTsConfigPath, "{}");
   const outputPath = import_path4.default.join(tempDir, outputFile);
   await (0, import_esbuild.build)({
     bundle: true,
     platform: "neutral",
     target: ["node10.4"],
-    entryPoints: [inputFile],
+    entryPoints: [prebuiltInputPath],
     treeShaking: true,
     external: [...external, "./node_modules/*"],
+    tsconfig: tempTsConfigPath,
     loader: loaders,
     outfile: outputPath,
     define
@@ -2029,6 +1988,7 @@ var auditCmdBuild = async (ctx, next, options) => {
     bridge,
     database,
     store,
+    buildFrontend: false,
     ctx
   }));
   next();
@@ -2044,6 +2004,7 @@ var build2 = async ({
   dev,
   local,
   verbose,
+  buildFrontend = true,
   noSDK,
   skipIndex
 }) => {
@@ -2080,7 +2041,7 @@ var build2 = async ({
     }, {
       local
     });
-    if ((_b = (_a = ctx.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.build) {
+    if (buildFrontend && ((_b = (_a = ctx.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.build)) {
       await spin({
         text: "Building static site",
         waitFor: async () => {
@@ -2581,7 +2542,12 @@ var baseCmds = [
     ], options)
   },
   {
-    options: [cleanOption, useDefaultValuesOption, noTelemetryOption],
+    options: [
+      cleanOption,
+      useDefaultValuesOption,
+      noTelemetryOption,
+      verboseOption
+    ],
     command: AUDIT,
     description: "Audit your schema and the files to check for errors",
     action: (options) => chain([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "0.61.6",
+  "version": "0.61.9",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -52,9 +52,9 @@
     "@graphql-codegen/visitor-plugin-common": "^2.4.0",
     "@graphql-tools/graphql-file-loader": "^7.2.0",
     "@graphql-tools/load": "^7.3.2",
-    "@tinacms/app": "0.0.7",
-    "@tinacms/datalayer": "0.2.2",
-    "@tinacms/graphql": "0.63.3",
+    "@tinacms/app": "0.0.9",
+    "@tinacms/datalayer": "0.2.3",
+    "@tinacms/graphql": "0.63.5",
     "@tinacms/metrics": "0.0.3",
     "@tinacms/schema-tools": "0.1.0",
     "add": "^2.0.6",
@@ -70,7 +70,7 @@
     "commander": "^9.0.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.1",
-    "esbuild": "^0.14.20",
+    "esbuild": "^0.15.5",
     "esm": "3.2.25",
     "express": "^4.17.1",
     "fast-glob": "^3.2.4",