create-tina-app 2.1.4 → 2.1.6

package/dist/index.js

@@ -213,35 +213,6 @@ function initializeGit(spinner) {
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { x } from "tar";
-async function getRepoInfo(url, examplePath) {
-  const [, username, name2, t, _branch, ...file] = url.pathname.split("/");
-  const filePath = examplePath ? examplePath.replace(/^\//, "") : file.join("/");
-  if (
-    // Support repos whose entire purpose is to be a Next.js example, e.g.
-    // https://github.com/:username/:my-cool-nextjs-example-repo-name.
-    t === void 0 || // Support GitHub URL that ends with a trailing slash, e.g.
-    // https://github.com/:username/:my-cool-nextjs-example-repo-name/
-    // In this case "t" will be an empty string while the next part "_branch" will be undefined
-    t === "" && _branch === void 0
-  ) {
-    try {
-      const infoResponse = await fetch(
-        `https://api.github.com/repos/${username}/${name2}`
-      );
-      if (infoResponse.status !== 200) {
-        return;
-      }
-      const info = await infoResponse.json();
-      return { username, name: name2, branch: info.default_branch, filePath };
-    } catch {
-      return;
-    }
-  }
-  const branch = examplePath ? `${_branch}/${file.join("/")}`.replace(new RegExp(`/${filePath}|/$`), "") : _branch;
-  if (username && name2 && branch && t === "tree") {
-    return { username, name: name2, branch, filePath };
-  }
-}
 async function downloadTarStream(url) {
   const res = await fetch(url);
   if (!res.body) {
@@ -288,6 +259,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-nextjs-starter",
+    branch: "main",
     devUrl: "http://localhost:3000"
   },
   {
@@ -310,6 +282,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-docs",
+    branch: "main",
     devUrl: "http://localhost:3000"
   },
   {
@@ -332,6 +305,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-astro-starter",
+    branch: "main",
     devUrl: "http://localhost:4321"
   },
   {
@@ -354,6 +328,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-hugo-starter",
+    branch: "main",
     devUrl: "http://localhost:1313"
   },
   {
@@ -376,6 +351,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-remix-starter",
+    branch: "main",
     devUrl: "http://localhost:3000"
   },
   {
@@ -398,6 +374,7 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tinasaurus",
+    branch: "main",
     devUrl: "http://localhost:3000"
   },
   {
@@ -420,18 +397,22 @@ var TEMPLATES = [
       }
     ],
     gitURL: "https://github.com/tinacms/tina-barebones-starter",
+    branch: "main",
     devUrl: "http://localhost:3000"
   }
 ];
 async function downloadTemplate(template, root, spinner) {
   if (template.isInternal === false) {
     const repoURL = new URL(template.gitURL);
-    const repoInfo = await getRepoInfo(repoURL);
-    if (!repoInfo) {
-      throw new Error("Repository information not found.");
-    }
+    const [, username, name2] = repoURL.pathname.split("/");
+    const repoInfo = {
+      username,
+      name: name2,
+      branch: template.branch,
+      filePath: ""
+    };
     spinner.text = `Downloading files from repo ${TextStyles.tinaOrange(
-      `${repoInfo?.username}/${repoInfo?.name}`
+      `${repoInfo.username}/${repoInfo.name}`
     )}`;
     await downloadAndExtractRepo(root, repoInfo);
   } else {
@@ -485,7 +466,7 @@ import { Command } from "commander";
 
 // package.json
 var name = "create-tina-app";
-var version = "2.1.4";
+var version = "2.1.6";
 
 // src/util/packageManagers.ts
 var PKG_MANAGERS = ["npm", "yarn", "pnpm", "bun"];
@@ -708,6 +689,7 @@ var ERROR_CODES = {
   ERR_VAL_INVALID_TEMPLATE: "ERR_VAL_INVALID_TEMPLATE",
   ERR_VAL_INVALID_PKG_MANAGER: "ERR_VAL_INVALID_PKG_MANAGER",
   ERR_VAL_INVALID_PROJECT_NAME: "ERR_VAL_INVALID_PROJECT_NAME",
+  ERR_VAL_INVALID_THEME: "ERR_VAL_INVALID_THEME",
   ERR_VAL_UNSUPPORTED_NODE: "ERR_VAL_UNSUPPORTED_NODE",
   ERR_VAL_NO_PKG_MANAGERS: "ERR_VAL_NO_PKG_MANAGERS",
   // File System Errors (FS_*)
@@ -898,6 +880,7 @@ async function fetchPostHogConfig(endpointUrl) {
 
 // src/index.ts
 import { osInfo as getOsSystemInfo } from "systeminformation";
+var DISCORD_SUPPORT_URL = "https://discord.com/invite/zumN63Ybpf";
 var posthogClient = null;
 async function initializePostHog(configEndpoint, disableGeoip) {
   let apiKey;
@@ -982,6 +965,18 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
   }
   const spinner = ora();
   preRunChecks(spinner);
+  const fatalExit = async (message, error, context) => {
+    spinner.fail(
+      `${message}
+
+Need more help? Reach out to the TinaCMS community at ${TextStyles.link(
+        DISCORD_SUPPORT_URL
+      )}`
+    );
+    postHogCaptureError(posthogClient, userId, sessionId, error, context);
+    if (posthogClient) await posthogClient.shutdown();
+    exit(1);
+  };
   postHogCapture(
     posthogClient,
     userId,
@@ -993,15 +988,10 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
   if (opts.template) {
     template = TEMPLATES.find((_template) => _template.value === opts.template);
     if (!template) {
-      spinner.fail(
+      await fatalExit(
         `The provided template '${opts.template}' is invalid. Please provide one of the following: ${TEMPLATES.map(
           (x2) => x2.value
-        )}`
-      );
-      postHogCaptureError(
-        posthogClient,
-        userId,
-        sessionId,
+        )}`,
         new Error(`Invalid template: ${opts.template}`),
         {
           errorCode: ERROR_CODES.ERR_VAL_INVALID_TEMPLATE,
@@ -1011,17 +1001,13 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
           additionalProperties: { ...telemetryData }
         }
       );
-      if (posthogClient) await posthogClient.shutdown();
-      exit(1);
     }
   }
   let pkgManager = opts.pkgManager;
   if (pkgManager) {
     if (!PKG_MANAGERS.find((_pkgManager) => _pkgManager === pkgManager)) {
-      postHogCaptureError(
-        posthogClient,
-        userId,
-        sessionId,
+      await fatalExit(
+        `The provided package manager '${opts.pkgManager}' is not supported. Please provide one of the following: ${PKG_MANAGERS}`,
         new Error(`Invalid package manager: ${opts.pkgManager}`),
         {
           errorCode: ERROR_CODES.ERR_VAL_INVALID_PKG_MANAGER,
@@ -1031,22 +1017,12 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
           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);
     }
   }
   if (!pkgManager) {
     if (installedPkgManagers.length === 0) {
-      spinner.fail(
-        `You have no supported package managers installed. Please install one of the following: ${PKG_MANAGERS}`
-      );
-      postHogCaptureError(
-        posthogClient,
-        userId,
-        sessionId,
+      await fatalExit(
+        `You have no supported package managers installed. Please install one of the following: ${PKG_MANAGERS}`,
         new Error("No supported package managers installed"),
         {
           errorCode: ERROR_CODES.ERR_VAL_NO_PKG_MANAGERS,
@@ -1056,8 +1032,6 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
           additionalProperties: telemetryData
         }
       );
-      if (posthogClient) await posthogClient.shutdown();
-      exit(1);
     }
     const res = await prompts({
       message: "Which package manager would you like to use?",
@@ -1153,10 +1127,20 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
     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(", ")}`
+        await fatalExit(
+          `Invalid theme "${opts.theme}". Valid options are: ${validThemes.join(", ")}`,
+          new Error(`Invalid theme: ${opts.theme}`),
+          {
+            errorCode: ERROR_CODES.ERR_VAL_INVALID_THEME,
+            errorCategory: "validation",
+            step: TRACKING_STEPS.THEME_SELECT,
+            fatal: true,
+            additionalProperties: {
+              ...telemetryData,
+              template: template.value
+            }
+          }
         );
-        exit(1);
       }
       themeChoice = opts.theme;
     } else {
@@ -1191,13 +1175,8 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
   }
   const rootDir = path3.join(process.cwd(), projectName);
   if (!await isWriteable(path3.dirname(rootDir))) {
-    spinner.fail(
-      "The application path is not writable, please check folder permissions and try again. It is likely you do not have write permissions for this folder."
-    );
-    postHogCaptureError(
-      posthogClient,
-      userId,
-      sessionId,
+    await fatalExit(
+      "The application path is not writable, please check folder permissions and try again. It is likely you do not have write permissions for this folder.",
       new Error("Directory not writable"),
       {
         errorCode: ERROR_CODES.ERR_FS_NOT_WRITABLE,
@@ -1207,8 +1186,6 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
         additionalProperties: { ...telemetryData }
       }
     );
-    if (posthogClient) await posthogClient.shutdown();
-    process.exit(1);
   }
   let appName;
   try {
@@ -1216,16 +1193,13 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
     telemetryData["app-name"] = appName;
   } catch (err) {
     const error = err;
-    spinner.fail(error.message);
-    postHogCaptureError(posthogClient, userId, sessionId, error, {
+    await fatalExit(error.message, error, {
       errorCode: ERROR_CODES.ERR_FS_MKDIR_FAILED,
       errorCategory: "filesystem",
       step: TRACKING_STEPS.DIRECTORY_SETUP,
       fatal: true,
       additionalProperties: { ...telemetryData }
     });
-    if (posthogClient) await posthogClient.shutdown();
-    exit(1);
   }
   try {
     if (themeChoice) {
@@ -1244,16 +1218,13 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
     spinner.succeed();
   } catch (err) {
     const error = err;
-    spinner.fail(`Failed to download template: ${error.message}`);
-    postHogCaptureError(posthogClient, userId, sessionId, error, {
+    await fatalExit(`Failed to download template: ${error.message}`, error, {
       errorCode: ERROR_CODES.ERR_TPL_DOWNLOAD_FAILED,
       errorCategory: "template",
       step: TRACKING_STEPS.DOWNLOADING_TEMPLATE,
       fatal: true,
       additionalProperties: { ...telemetryData }
     });
-    if (posthogClient) await posthogClient.shutdown();
-    exit(1);
   }
   spinner.start("Installing packages.");
   try {
@@ -1336,12 +1307,21 @@ ${TextStylesBold.bold("Telemetry Notice")}`);
       "https://tina.io/docs/r/what-is-tinacloud"
     )}`
   );
+  console.log(
+    `  \u2022 \u{1F4AC} Reach out for support: ${TextStyles.link(DISCORD_SUPPORT_URL)}`
+  );
 }
 run().catch(async (error) => {
   if (process.stdout.columns >= 60) {
     console.log(TextStyles.tinaOrange(`${errorArt}`));
   }
   console.error("Error running create-tina-app:", error);
+  console.error(
+    `
+\u{1F4AC} Need more help? Reach out to the TinaCMS community at ${TextStyles.link(
+      DISCORD_SUPPORT_URL
+    )}`
+  );
   const sessionId = generateSessionId();
   const userId = await getAnonymousUserId();
   postHogCaptureError(posthogClient, userId, sessionId, error, {

package/dist/templates.d.ts

@@ -16,6 +16,7 @@ export type InternalTemplate = BaseExample & {
 export type ExternalTemplate = BaseExample & {
     isInternal: false;
     gitURL: string;
+    branch: string;
 };
 export type Template = InternalTemplate | ExternalTemplate;
 export declare const TEMPLATES: Template[];

package/dist/util/examples.d.ts

@@ -4,9 +4,5 @@ export type RepoInfo = {
     branch: string;
     filePath: string;
 };
-export declare function isUrlOk(url: string): Promise<boolean>;
-export declare function getRepoInfo(url: URL, examplePath?: string): Promise<RepoInfo | undefined>;
-export declare function hasRepo({ username, name, branch, filePath, }: RepoInfo): Promise<boolean>;
-export declare function existsInRepo(nameOrUrl: string): Promise<boolean>;
 export declare function downloadAndExtractRepo(root: string, { username, name, branch, filePath }: RepoInfo): Promise<void>;
 export declare function downloadAndExtractExample(root: string, name: string): Promise<void>;

package/dist/util/posthog.d.ts

@@ -35,6 +35,7 @@ export declare const ERROR_CODES: {
     readonly ERR_VAL_INVALID_TEMPLATE: "ERR_VAL_INVALID_TEMPLATE";
     readonly ERR_VAL_INVALID_PKG_MANAGER: "ERR_VAL_INVALID_PKG_MANAGER";
     readonly ERR_VAL_INVALID_PROJECT_NAME: "ERR_VAL_INVALID_PROJECT_NAME";
+    readonly ERR_VAL_INVALID_THEME: "ERR_VAL_INVALID_THEME";
     readonly ERR_VAL_UNSUPPORTED_NODE: "ERR_VAL_UNSUPPORTED_NODE";
     readonly ERR_VAL_NO_PKG_MANAGERS: "ERR_VAL_NO_PKG_MANAGERS";
     readonly ERR_FS_NOT_WRITABLE: "ERR_FS_NOT_WRITABLE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "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.6.0"
+    "@tinacms/scripts": "1.6.1"
   },
   "dependencies": {
     "chalk": "^5.4.1",