create-tina-app 2.1.1 → 2.1.3

package/dist/index.js

@@ -113,6 +113,33 @@ async function updateThemeSettings(dir, selectedTheme) {
   config.selectedTheme = selectedTheme;
   await fs.writeFile(configPath, JSON.stringify(config, null, 2));
 }
+async function updateTelemetryConfig(dir, mode) {
+  const configPaths = [
+    path.join(dir, "tina", "config.ts"),
+    path.join(dir, "tina", "config.tsx"),
+    path.join(dir, "tina", "config.js"),
+    path.join(dir, "tina", "config.jsx")
+  ];
+  for (const configPath of configPaths) {
+    if (await fs.pathExists(configPath)) {
+      let content = await fs.readFile(configPath, "utf8");
+      if (/telemetry\s*:/.test(content)) {
+        content = content.replace(
+          /telemetry\s*:\s*['"][^'"]*['"]/,
+          `telemetry: '${mode}'`
+        );
+      } else {
+        content = content.replace(
+          /defineConfig\(\s*\{/,
+          `defineConfig({
+  telemetry: '${mode}',`
+        );
+      }
+      await fs.writeFile(configPath, content);
+      return;
+    }
+  }
+}
 
 // src/util/install.ts
 import spawn from "cross-spawn";
@@ -458,7 +485,7 @@ import { Command } from "commander";
 
 // package.json
 var name = "create-tina-app";
-var version = "2.1.1";
+var version = "2.1.3";
 
 // src/util/packageManagers.ts
 var PKG_MANAGERS = ["npm", "yarn", "pnpm", "bun"];
@@ -478,7 +505,10 @@ function extractOptions(args) {
   ).option(
     "-d, --dir <dir>",
     "Choose which directory to run this script from."
-  ).option("-v, --verbose", "Enable verbose output.").option("--noTelemetry", "Disable anonymous telemetry that is collected.").arguments("[project-directory]").usage(`${TextStyles.success("<project-directory>")} [options]`).action((name2) => {
+  ).option("-v, --verbose", "Enable verbose output.").option("--noTelemetry", "Disable anonymous telemetry that is collected.").option(
+    "--theme <theme>",
+    "Choose a theme for the tina-docs template (skips interactive prompt)."
+  ).arguments("[project-directory]").usage(`${TextStyles.success("<project-directory>")} [options]`).action((name2) => {
     projectName = name2;
   });
   program.parse(args);
@@ -929,9 +959,7 @@ async function run() {
     console.log(`
 ${TextStylesBold.bold("Telemetry Notice")}`);
     console.log(
-      `To help the TinaCMS team improve the developer experience, create-tina-app collects anonymous usage statistics. This data helps us understand which environments and features are most important to support. Usage analytics may include: Operating system and version, package manager name and version (local only), Node.js version (local only), and the selected TinaCMS starter template.
-No personal or project-specific code is ever collected. You can opt out at any time by passing the --noTelemetry flag.
-`
+      "To help the TinaCMS team improve the developer experience, create-tina-app collects anonymous usage statistics. This data helps us understand which environments and features are most important to support. Usage analytics may include: Operating system and version, package manager name and version (local only), Node.js version (local only), and the selected TinaCMS starter template.\nNo personal or project-specific code is ever collected. You can opt out at any time by passing the --noTelemetry flag.\n"
     );
     posthogClient = await initializePostHog(
       "https://identity-v2.tinajs.io/v2/posthog-token",
@@ -945,6 +973,12 @@ No personal or project-specific code is ever collected. You can opt out at any t
     for (const pkgManager2 of PKG_MANAGERS) {
       telemetryData[`${pkgManager2}-installed`] = installedPkgManagers.includes(pkgManager2);
     }
+    if (opts.template) {
+      telemetryData["template"] = opts.template;
+    }
+    if (opts.pkgManager) {
+      telemetryData["package-manager"] = opts.pkgManager;
+    }
   }
   const spinner = ora();
   preRunChecks(spinner);
@@ -974,10 +1008,7 @@ No personal or project-specific code is ever collected. You can opt out at any t
           errorCategory: "validation",
           step: TRACKING_STEPS.TEMPLATE_SELECT,
           fatal: true,
-          additionalProperties: {
-            ...telemetryData,
-            provided_template: opts.template
-          }
+          additionalProperties: { ...telemetryData }
         }
       );
       if (posthogClient) await posthogClient.shutdown();
@@ -987,9 +1018,6 @@ No personal or project-specific code is ever collected. You can opt out at any t
   let pkgManager = opts.pkgManager;
   if (pkgManager) {
     if (!PKG_MANAGERS.find((_pkgManager) => _pkgManager === pkgManager)) {
-      spinner.fail(
-        `The provided package manager '${opts.pkgManager}' is not supported. Please provide one of the following: ${PKG_MANAGERS}`
-      );
       postHogCaptureError(
         posthogClient,
         userId,
@@ -1000,13 +1028,13 @@ No personal or project-specific code is ever collected. You can opt out at any t
           errorCategory: "validation",
           step: TRACKING_STEPS.PKG_MANAGER_SELECT,
           fatal: true,
-          additionalProperties: {
-            ...telemetryData,
-            provided_pkg_manager: opts.pkgManager
-          }
+          additionalProperties: { ...telemetryData }
         }
       );
       if (posthogClient) await posthogClient.shutdown();
+      spinner.fail(
+        `The provided package manager '${opts.pkgManager}' is not supported. Please provide one of the following: ${PKG_MANAGERS}`
+      );
       exit(1);
     }
   }
@@ -1057,8 +1085,8 @@ No personal or project-specific code is ever collected. You can opt out at any t
       exit(1);
     }
     pkgManager = res.packageManager;
-    telemetryData["package-manager"] = pkgManager;
   }
+  telemetryData["package-manager"] = pkgManager;
   let projectName = opts.projectName;
   if (!projectName) {
     const res = await prompts({
@@ -1122,33 +1150,44 @@ No personal or project-specific code is ever collected. You can opt out at any t
   telemetryData["template"] = template.value;
   let themeChoice;
   if (template.value === "tina-docs") {
-    const res = await prompts({
-      name: "theme",
-      type: "select",
-      message: "What theme would you like to use?",
-      choices: THEMES
-    });
-    if (!Object.hasOwn(res, "theme")) {
-      postHogCaptureError(
-        posthogClient,
-        userId,
-        sessionId,
-        new Error("User cancelled theme selection"),
-        {
-          errorCode: ERROR_CODES.ERR_CANCEL_THEME_PROMPT,
-          errorCategory: "user-cancellation",
-          step: TRACKING_STEPS.THEME_SELECT,
-          fatal: true,
-          additionalProperties: {
-            ...telemetryData,
-            template: template.value
+    if (opts.theme) {
+      const validThemes = THEMES.map((t) => t.value);
+      if (!validThemes.includes(opts.theme)) {
+        console.error(
+          `Invalid theme "${opts.theme}". Valid options are: ${validThemes.join(", ")}`
+        );
+        exit(1);
+      }
+      themeChoice = opts.theme;
+    } else {
+      const res = await prompts({
+        name: "theme",
+        type: "select",
+        message: "What theme would you like to use?",
+        choices: THEMES
+      });
+      if (!Object.hasOwn(res, "theme")) {
+        postHogCaptureError(
+          posthogClient,
+          userId,
+          sessionId,
+          new Error("User cancelled theme selection"),
+          {
+            errorCode: ERROR_CODES.ERR_CANCEL_THEME_PROMPT,
+            errorCategory: "user-cancellation",
+            step: TRACKING_STEPS.THEME_SELECT,
+            fatal: true,
+            additionalProperties: {
+              ...telemetryData,
+              template: template.value
+            }
           }
-        }
-      );
-      if (posthogClient) await posthogClient.shutdown();
-      exit(1);
+        );
+        if (posthogClient) await posthogClient.shutdown();
+        exit(1);
+      }
+      themeChoice = res.theme;
     }
-    themeChoice = res.theme;
   }
   const rootDir = path3.join(process.cwd(), projectName);
   if (!await isWriteable(path3.dirname(rootDir))) {
@@ -1165,10 +1204,7 @@ No personal or project-specific code is ever collected. You can opt out at any t
         errorCategory: "filesystem",
         step: TRACKING_STEPS.DIRECTORY_SETUP,
         fatal: true,
-        additionalProperties: {
-          ...telemetryData,
-          template: template.value
-        }
+        additionalProperties: { ...telemetryData }
       }
     );
     if (posthogClient) await posthogClient.shutdown();
@@ -1186,16 +1222,14 @@ No personal or project-specific code is ever collected. You can opt out at any t
       errorCategory: "filesystem",
       step: TRACKING_STEPS.DIRECTORY_SETUP,
       fatal: true,
-      additionalProperties: {
-        ...telemetryData,
-        template: template.value
-      }
+      additionalProperties: { ...telemetryData }
     });
     if (posthogClient) await posthogClient.shutdown();
     exit(1);
   }
   try {
     if (themeChoice) {
+      telemetryData["theme"] = themeChoice;
       await updateThemeSettings(rootDir, themeChoice);
     }
     spinner.start("Downloading template...");
@@ -1204,6 +1238,9 @@ No personal or project-specific code is ever collected. You can opt out at any t
     spinner.start("Updating project metadata...");
     updateProjectPackageName(rootDir, projectName);
     updateProjectPackageVersion(rootDir, "0.0.1");
+    if (opts.noTelemetry) {
+      await updateTelemetryConfig(rootDir, "disabled");
+    }
     spinner.succeed();
   } catch (err) {
     const error = err;
@@ -1213,11 +1250,7 @@ No personal or project-specific code is ever collected. You can opt out at any t
       errorCategory: "template",
       step: TRACKING_STEPS.DOWNLOADING_TEMPLATE,
       fatal: true,
-      additionalProperties: {
-        ...telemetryData,
-        template: template.value,
-        theme: themeChoice
-      }
+      additionalProperties: { ...telemetryData }
     });
     if (posthogClient) await posthogClient.shutdown();
     exit(1);
@@ -1235,11 +1268,7 @@ No personal or project-specific code is ever collected. You can opt out at any t
       errorCategory: "installation",
       step: TRACKING_STEPS.INSTALLING_PACKAGES,
       fatal: false,
-      additionalProperties: {
-        ...telemetryData,
-        template: template.value,
-        package_manager: pkgManager
-      }
+      additionalProperties: { ...telemetryData }
     });
   }
   spinner.start("Initializing git repository.");
@@ -1256,10 +1285,7 @@ No personal or project-specific code is ever collected. You can opt out at any t
       errorCategory: "git",
       step: TRACKING_STEPS.GIT_INIT,
       fatal: false,
-      additionalProperties: {
-        ...telemetryData,
-        template: template.value
-      }
+      additionalProperties: { ...telemetryData }
     });
   }
   postHogCapture(

package/dist/util/fileUtil.d.ts

@@ -4,3 +4,8 @@ export declare function setupProjectDirectory(dir: string): Promise<string>;
 export declare function updateProjectPackageName(dir: string, name: string): void;
 export declare function updateProjectPackageVersion(dir: string, version: string): void;
 export declare function updateThemeSettings(dir: string, selectedTheme: string): Promise<void>;
+/**
+ * Updates the tina config file to set the telemetry mode.
+ * This modifies the TypeScript/JavaScript config file by inserting the telemetry setting.
+ */
+export declare function updateTelemetryConfig(dir: string, mode: 'anonymous' | 'disabled'): Promise<void>;

package/dist/util/options.d.ts

@@ -5,5 +5,6 @@ export interface CreateOptions {
     noTelemetry: boolean;
     projectName: string;
     verbose: boolean;
+    theme?: string;
 }
 export declare function extractOptions(args: string[]): CreateOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "type": "module",
   "main": "dist/index.js",
   "files": [
@@ -36,7 +36,7 @@
     "@types/prompts": "^2.4.9",
     "@types/tar": "6.1.13",
     "typescript": "^5.7.3",
-    "@tinacms/scripts": "1.4.2"
+    "@tinacms/scripts": "1.6.0"
   },
   "dependencies": {
     "chalk": "^5.4.1",