@tinacms/cli 2.2.6 → 2.3.1

package/dist/index.js

@@ -2,11 +2,12 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.2.6";
+var version = "2.3.1";
 
 // src/next/commands/dev-command/index.ts
 import path9 from "path";
 import { FilesystemBridge as FilesystemBridge2, buildSchema } from "@tinacms/graphql";
+import { Telemetry } from "@tinacms/metrics";
 import { LocalSearchIndexClient, SearchIndexer } from "@tinacms/search";
 import AsyncLock from "async-lock";
 import chokidar from "chokidar";
@@ -511,14 +512,6 @@ var Codegen = class {
     );
     await fs.ensureFile(filePath);
     await fs.outputFile(filePath, data);
-    if (this.configManager.hasSeparateContentRoot()) {
-      const filePath2 = path.join(
-        this.configManager.generatedFolderPathContentRepo,
-        fileName
-      );
-      await fs.ensureFile(filePath2);
-      await fs.outputFile(filePath2, data);
-    }
   }
   async removeGeneratedFilesIfExists() {
     await unlinkIfExists(this.configManager.generatedClientJSFilePath);
@@ -572,6 +565,11 @@ var Codegen = class {
         this.configManager.generatedTypesTSFilePath,
         codeString
       );
+      const jsTypes = await transform(codeString, { loader: "ts" });
+      await fs.outputFile(
+        this.configManager.generatedTypesJSFilePath,
+        jsTypes.code
+      );
       await fs.outputFile(
         this.configManager.generatedClientTSFilePath,
         clientString
@@ -584,7 +582,6 @@ var Codegen = class {
       }
       await unlinkIfExists(this.configManager.generatedClientJSFilePath);
       await unlinkIfExists(this.configManager.generatedTypesDFilePath);
-      await unlinkIfExists(this.configManager.generatedTypesJSFilePath);
     } else {
       await fs.outputFile(
         this.configManager.generatedTypesDFilePath,
@@ -691,7 +688,7 @@ var Codegen = class {
 import { resolve } from "@tinacms/datalayer";
 import type { TinaClient } from "tinacms/dist/client";
 
-import { queries } from "${this.configManager.isUsingTs() ? "./types.ts" : "./types.js"}";
+import { queries } from "./types.js";
 import database from "../database";
 
 export async function databaseRequest({ query, variables, user }) {
@@ -757,7 +754,7 @@ export default databaseClient;
     const errorPolicy = this.configManager.config?.client?.errorPolicy;
     const apiURL = this.getApiURL();
     const clientString = `import { createClient } from "tinacms/dist/client";
-import { queries } from "${this.configManager.isUsingTs() ? "./types.ts" : "./types.js"}";
+import { queries } from "./types.js";
 export const client = createClient({ ${this.noClientBuildCache === false ? `cacheDir: '${normalizePath(
       this.configManager.generatedCachePath
     )}', ` : ""}url: ${this.localContentBuild ? `process.env.TINA_LOCAL_URL || '${apiURL}'` : `'${apiURL}'`}, token: '${token}', queries, ${errorPolicy ? `errorPolicy: '${errorPolicy}'` : ""} });
@@ -826,7 +823,6 @@ import { pathToFileURL } from "url";
 import * as esbuild from "esbuild";
 import * as dotenv from "dotenv";
 import normalizePath2 from "normalize-path";
-import chalk4 from "chalk";
 import { createRequire } from "module";
 
 // src/next/resolve-content-root.ts
@@ -901,7 +897,6 @@ var ConfigManager = class {
   envFilePath;
   generatedCachePath;
   generatedFolderPath;
-  generatedFolderPathContentRepo;
   generatedGraphQLGQLPath;
   generatedGraphQLJSONPath;
   generatedSchemaJSONPath;
@@ -1087,16 +1082,10 @@ var ConfigManager = class {
       tinaConfigFilePath: this.tinaConfigFilePath,
       localContentPath: this.config.localContentPath
     });
-    this.generatedFolderPathContentRepo = path4.join(
-      await this.getTinaFolderPath(this.contentRootPath, {
-        isContentRoot: this.hasSeparateContentRoot()
-      }),
-      GENERATED_FOLDER
-    );
     this.spaMainPath = require2.resolve("@tinacms/app");
     this.spaRootPath = path4.join(this.spaMainPath, "..", "..");
   }
-  async getTinaFolderPath(rootPath, { isContentRoot } = {}) {
+  async getTinaFolderPath(rootPath) {
     const tinaFolderPath = path4.join(rootPath, TINA_FOLDER);
     const tinaFolderExists = await fs3.pathExists(tinaFolderPath);
     if (tinaFolderExists) {
@@ -1109,11 +1098,6 @@ var ConfigManager = class {
       this.isUsingLegacyFolder = true;
       return legacyFolderPath;
     }
-    if (isContentRoot) {
-      throw new Error(
-        `Unable to find a ${chalk4.cyan("tina/")} folder in your content root at ${chalk4.cyan(rootPath)}. When using localContentPath, the content directory must contain a ${chalk4.cyan("tina/")} folder for generated files. Create one with: mkdir ${path4.join(rootPath, TINA_FOLDER)}`
-      );
-    }
     throw new Error(
       `Unable to find Tina folder, if you're working in folder outside of the Tina config be sure to specify --rootPath`
     );
@@ -1373,7 +1357,7 @@ async function createAndInitializeDatabase(configManager, datalayerPort, bridgeO
 
 // src/next/commands/baseCommands.ts
 import { Command, Option } from "clipanion";
-import chalk5 from "chalk";
+import chalk4 from "chalk";
 
 // src/utils/start-subprocess.ts
 import childProcess from "child_process";
@@ -1441,7 +1425,7 @@ var BaseCommand = class extends Command {
     if (this.subCommand) {
       subProc = await startSubprocess2({ command: this.subCommand });
       logger.info(
-        `Running web application with command: ${chalk5.cyan(this.subCommand)}`
+        `Running web application with command: ${chalk4.cyan(this.subCommand)}`
       );
     }
     function exitHandler(options, exitCode) {
@@ -2752,6 +2736,15 @@ var DevCommand = class extends BaseCommand {
       try {
         await configManager.processConfig();
         if (firstTime) {
+          const telemetry = new Telemetry({ disabled: this.noTelemetry });
+          await telemetry.submitRecord({
+            event: {
+              name: "tinacms:cli:dev:invoke",
+              hasLocalContentPath: Boolean(
+                configManager.config.localContentPath
+              )
+            }
+          });
           database = await createAndInitializeDatabase(
             configManager,
             Number(this.datalayerPort)
@@ -2792,15 +2785,6 @@ var DevCommand = class extends BaseCommand {
             path9.join(configManager.tinaFolderPath, tinaLockFilename),
             tinaLockContent
           );
-          if (configManager.hasSeparateContentRoot()) {
-            const rootPath = await configManager.getTinaFolderPath(
-              configManager.contentRootPath,
-              { isContentRoot: true }
-            );
-            const filePath = path9.join(rootPath, tinaLockFilename);
-            await fs8.ensureFile(filePath);
-            await fs8.outputFile(filePath, tinaLockContent);
-          }
         }
         await this.indexContentWithSpinner({
           database,
@@ -3041,6 +3025,7 @@ import crypto from "crypto";
 import path10 from "path";
 import { diff } from "@graphql-inspector/core";
 import { FilesystemBridge as FilesystemBridge3, buildSchema as buildSchema2 } from "@tinacms/graphql";
+import { Telemetry as Telemetry2 } from "@tinacms/metrics";
 import { parseURL as parseURL2 } from "@tinacms/schema-tools";
 import {
   SearchIndexer as SearchIndexer2,
@@ -3274,6 +3259,13 @@ ${dangerText(e.message)}`);
       );
       process.exit(1);
     }
+    const telemetry = new Telemetry2({ disabled: this.noTelemetry });
+    await telemetry.submitRecord({
+      event: {
+        name: "tinacms:cli:build:invoke",
+        hasLocalContentPath: Boolean(configManager.config.localContentPath)
+      }
+    });
     if (localContentOnly && !this.localOption) {
       const config2 = configManager.config;
       const missing = [];
@@ -3904,9 +3896,9 @@ import { buildSchema as buildSchema3 } from "@tinacms/graphql";
 
 // src/next/commands/audit-command/audit.ts
 import prompts from "prompts";
-import { Telemetry } from "@tinacms/metrics";
+import { Telemetry as Telemetry3 } from "@tinacms/metrics";
 import { resolve } from "@tinacms/graphql";
-import chalk6 from "chalk";
+import chalk5 from "chalk";
 var audit = async ({
   database,
   clean,
@@ -3914,7 +3906,7 @@ var audit = async ({
   noTelemetry,
   verbose
 }) => {
-  const telemetry = new Telemetry({ disabled: noTelemetry });
+  const telemetry = new Telemetry3({ disabled: noTelemetry });
   await telemetry.submitRecord({
     event: {
       name: "tinacms:cli:audit:invoke",
@@ -3924,7 +3916,7 @@ var audit = async ({
   });
   if (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 ${chalk6.bold(
+      `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 ${chalk5.bold(
         "clean git tree"
       )} so unwanted changes can be undone.
 
@@ -3936,13 +3928,13 @@ var audit = async ({
       message: `Do you want to continue?`
     });
     if (!res.useClean) {
-      logger.warn(chalk6.yellowBright("\u26A0\uFE0F Audit not complete"));
+      logger.warn(chalk5.yellowBright("\u26A0\uFE0F Audit not complete"));
       process.exit(0);
     }
   }
   if (useDefaultValues && !clean) {
     logger.warn(
-      chalk6.yellowBright(
+      chalk5.yellowBright(
         "WARNING: using the `--useDefaultValues` without the `--clean` flag has no effect. Please re-run audit and add the `--clean` flag"
       )
     );
@@ -3970,10 +3962,10 @@ var audit = async ({
   }
   if (error) {
     logger.error(
-      chalk6.redBright(`\u203C\uFE0F Audit ${chalk6.bold("failed")} with errors`)
+      chalk5.redBright(`\u203C\uFE0F Audit ${chalk5.bold("failed")} with errors`)
     );
   } else {
-    logger.info(chalk6.greenBright("\u2705 Audit passed"));
+    logger.info(chalk5.greenBright("\u2705 Audit passed"));
   }
 };
 var auditDocuments = async (args) => {
@@ -4001,11 +3993,11 @@ var auditDocuments = async (args) => {
     if (docResult.errors) {
       error = true;
       docResult.errors.forEach((err) => {
-        logger.error(chalk6.red(err.message));
+        logger.error(chalk5.red(err.message));
         if (err.originalError.originalError) {
           logger.error(
             // @ts-ignore FIXME: this doesn't seem right
-            chalk6.red(`    ${err.originalError.originalError.message}`)
+            chalk5.red(`    ${err.originalError.originalError.message}`)
           );
         }
       });
@@ -4047,7 +4039,7 @@ var auditDocuments = async (args) => {
       if (mutationRes.errors) {
         mutationRes.errors.forEach((err) => {
           error = true;
-          logger.error(chalk6.red(err.message));
+          logger.error(chalk5.red(err.message));
         });
       }
     }
@@ -5672,7 +5664,7 @@ var rewriteTemplateKeysInDocs = (args) => {
 };
 
 // src/cmds/init/apply.ts
-import { Telemetry as Telemetry2 } from "@tinacms/metrics";
+import { Telemetry as Telemetry4 } from "@tinacms/metrics";
 import fs15 from "fs-extra";
 
 // src/next/commands/codemod-command/index.ts
@@ -6635,7 +6627,7 @@ var reportTelemetry = async ({
   if (noTelemetry) {
     logger.info(logText("Telemetry disabled"));
   }
-  const telemetry = new Telemetry2({ disabled: noTelemetry });
+  const telemetry = new Telemetry4({ disabled: noTelemetry });
   const schemaFileType = usingTypescript ? "ts" : "js";
   await telemetry.submitRecord({
     event: {

package/dist/next/config-manager.d.ts

@@ -15,7 +15,6 @@ export declare class ConfigManager {
     envFilePath: string;
     generatedCachePath: string;
     generatedFolderPath: string;
-    generatedFolderPathContentRepo: string;
     generatedGraphQLGQLPath: string;
     generatedGraphQLJSONPath: string;
     generatedSchemaJSONPath: string;
@@ -55,9 +54,7 @@ export declare class ConfigManager {
     hasSeparateContentRoot(): boolean;
     shouldSkipSDK(): boolean;
     processConfig(): Promise<void>;
-    getTinaFolderPath(rootPath: string, { isContentRoot }?: {
-        isContentRoot?: boolean;
-    }): Promise<string>;
+    getTinaFolderPath(rootPath: string): Promise<string>;
     getTinaGraphQLVersion(): {
         fullVersion: string;
         major: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "2.2.6",
+  "version": "2.3.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -88,12 +88,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.4.6",
-    "@tinacms/graphql": "2.3.1",
-    "@tinacms/metrics": "2.0.1",
-    "@tinacms/search": "1.2.13",
-    "tinacms": "3.7.6",
-    "@tinacms/schema-tools": "2.7.4"
+    "@tinacms/app": "2.4.8",
+    "@tinacms/metrics": "2.1.0",
+    "@tinacms/graphql": "2.4.1",
+    "@tinacms/search": "1.2.15",
+    "@tinacms/schema-tools": "2.7.4",
+    "tinacms": "3.8.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"