create-tina-app 1.1.6 → 1.3.0

package/dist/index.d.ts

@@ -1 +1,2 @@
+export declare const PKG_MANAGERS: string[];
 export declare const run: () => Promise<void>;

package/dist/index.js

@@ -25,6 +25,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  PKG_MANAGERS: () => PKG_MANAGERS,
   run: () => run
 });
 module.exports = __toCommonJS(src_exports);
@@ -35,7 +36,7 @@ var import_node_path = __toESM(require("path"));
 
 // package.json
 var name = "create-tina-app";
-var version = "1.1.6";
+var version = "1.3.0";
 
 // src/util/fileUtil.ts
 var import_fs_extra = __toESM(require("fs-extra"));
@@ -240,9 +241,6 @@ function tryGitInit(root) {
   }
 }
 
-// src/index.ts
-var import_node_process = require("process");
-
 // src/util/examples.ts
 var import_node_stream = require("stream");
 var import_promises = require("stream/promises");
@@ -291,11 +289,11 @@ async function downloadAndExtractRepo(root, { username, name: name2, branch, fil
   );
 }
 
-// src/examples.ts
+// src/templates.ts
 var import_chalk4 = __toESM(require("chalk"));
 var import_fs_extra3 = require("fs-extra");
 var import_path3 = __toESM(require("path"));
-var EXAMPLES = [
+var TEMPLATES = [
   {
     title: "\u2B50 NextJS starter",
     description: "Kickstart your project with NextJS \u2013 our top recommendation for a seamless, performant, and versatile web experience.",
@@ -339,9 +337,9 @@ var EXAMPLES = [
     gitURL: "https://github.com/tinacms/tina-barebones-starter"
   }
 ];
-var downloadExample = async (example, root) => {
-  if (example.isInternal === false) {
-    const repoURL = new URL(example.gitURL);
+var downloadTemplate = async (template, root) => {
+  if (template.isInternal === false) {
+    const repoURL = new URL(template.gitURL);
     const repoInfo = await getRepoInfo(repoURL);
     const repoInfo2 = repoInfo;
     console.log(
@@ -354,8 +352,8 @@ var downloadExample = async (example, root) => {
     }
     await downloadAndExtractRepo(root, repoInfo2);
   } else {
-    const exampleFile = import_path3.default.join(__dirname, "..", "examples", example.value);
-    await (0, import_fs_extra3.copy)(`${exampleFile}/`, "./");
+    const templateFile = import_path3.default.join(__dirname, "..", "examples", template.value);
+    await (0, import_fs_extra3.copy)(`${templateFile}/`, "./");
   }
 };
 
@@ -368,14 +366,36 @@ var preRunChecks = () => {
   }
 };
 
+// src/util/checkPkgManagers.ts
+var import_child_process2 = require("child_process");
+function checkPackageExists(name2) {
+  return new Promise((resolve, reject) => {
+    (0, import_child_process2.exec)(`${name2} -v`, (error, stdout, stderr) => {
+      if (error) {
+        reject(stderr);
+      }
+      resolve(stdout);
+    });
+  });
+}
+
 // src/index.ts
+var PKG_MANAGERS = ["npm", "yarn", "pnpm"];
 var successText = import_chalk5.default.bold.green;
 var linkText = import_chalk5.default.bold.cyan;
 var cmdText = import_chalk5.default.inverse;
 var logText = import_chalk5.default.italic.gray;
-var program = new import_commander.Command(name);
 var projectName = "";
-program.version(version).option("-e, --example <example>", "Choose which example to start from").option("-d, --dir <dir>", "Choose which directory to run this script from").option("--noTelemetry", "Disable anonymous telemetry that is collected").arguments("[project-directory]").usage(`${import_chalk5.default.green("<project-directory>")} [options]`).action((name2) => {
+var program = new import_commander.Command(name);
+program.version(version).option(
+  "-t, --template <template>",
+  `Choose which template to start from. Valid templates are: ${TEMPLATES.map(
+    (x2) => x2.value
+  )}`
+).option(
+  "-p, --pkg-manager <pkg-manager>",
+  `Choose which package manager to use. Valid package managers are: ${PKG_MANAGERS}`
+).option("-d, --dir <dir>", "Choose which directory to run this script from").option("--noTelemetry", "Disable anonymous telemetry that is collected").arguments("[project-directory]").usage(`${import_chalk5.default.green("<project-directory>")} [options]`).action((name2) => {
   projectName = name2;
 });
 var run = async () => {
@@ -386,55 +406,74 @@ var run = async () => {
     process.chdir(opts.dir);
   }
   const telemetry = new import_metrics.Telemetry({ disabled: opts == null ? void 0 : opts.noTelemetry });
-  let example = opts.example;
-  const res = await (0, import_prompts.default)({
-    message: "Which package manager would you like to use?",
-    name: "packageManager",
-    type: "select",
-    choices: [
-      { title: "yarn", value: "yarn" },
-      { title: "npm", value: "npm" },
-      { title: "pnpm", value: "pnpm" }
-    ]
-  });
-  const packageManager = res.packageManager;
-  const displayedCommand = packageManager;
+  let template = opts.template;
+  if (template) {
+    template = TEMPLATES.find((_template) => _template.value === template);
+    if (!template) {
+      console.error(
+        `The provided template is invalid. Please provide one of the following: ${TEMPLATES.map(
+          (x2) => x2.value
+        )}`
+      );
+      throw new Error("Invalid template.");
+    }
+  }
+  let pkgManager = opts.pkgManager;
+  if (pkgManager) {
+    if (!PKG_MANAGERS.find((_pkgManager) => _pkgManager === pkgManager)) {
+      console.error(
+        `The provided package manager is not supported. Please provide one of the following: ${PKG_MANAGERS}`
+      );
+      throw new Error("Invalid package manager.");
+    }
+  }
+  if (!pkgManager) {
+    const installedPkgManagers = [];
+    for (const pkg_manager of PKG_MANAGERS) {
+      try {
+        await checkPackageExists(pkg_manager);
+        installedPkgManagers.push(pkg_manager);
+      } catch {
+      }
+    }
+    if (installedPkgManagers.length === 0) {
+      console.error(`You have no supported package managers installed. Please install one of the following: ${PKG_MANAGERS}`);
+      throw new Error("No supported package managers installed.");
+    }
+    const pkgManagerRes = await (0, import_prompts.default)({
+      message: "Which package manager would you like to use?",
+      name: "packageManager",
+      type: "select",
+      choices: installedPkgManagers.map((manager) => {
+        return { title: manager, value: manager };
+      })
+    });
+    pkgManager = pkgManagerRes.packageManager;
+  }
   if (!projectName) {
-    const res2 = await (0, import_prompts.default)({
+    const res = await (0, import_prompts.default)({
       name: "name",
       type: "text",
       message: "What is your project named?",
       initial: "my-tina-app"
     });
-    projectName = res2.name;
+    projectName = res.name;
   }
   const dirName = projectName;
-  if (!example) {
-    const res2 = await (0, import_prompts.default)({
-      name: "example",
+  if (!template) {
+    const templateRes = await (0, import_prompts.default)({
+      name: "template",
       type: "select",
       message: "What starter code would you like to use?",
-      choices: EXAMPLES
+      choices: TEMPLATES
     });
-    if (typeof res2.example !== "string") {
-      console.error(import_chalk5.default.red("Input must be a string"));
-      (0, import_node_process.exit)(1);
-    }
-    example = res2.example;
-  }
-  const chosenExample = EXAMPLES.find((x2) => x2.value === example);
-  if (!chosenExample) {
-    console.error(
-      `The example provided is not a valid example. Please provide one of the following; ${EXAMPLES.map(
-        (x2) => x2.value
-      )}`
-    );
+    template = TEMPLATES.find((_template) => _template.value === templateRes.template);
   }
   await telemetry.submitRecord({
     event: {
       name: "create-tina-app:invoke",
-      example,
-      useYarn: Boolean(res.packageManager === "yarn")
+      template,
+      pkgManager
     }
   });
   const root = import_node_path.default.join(process.cwd(), dirName);
@@ -453,35 +492,21 @@ var run = async () => {
   if (!isFolderEmpty(root, appName)) {
     process.exit(1);
   }
-  if (!chosenExample) {
-    console.error(
-      `The example provided is not a valid example. Please provide one of the following; ${EXAMPLES.map(
-        (x2) => x2.value
-      )}`
-    );
-    throw new Error("Invalid example");
-  }
-  await downloadExample(chosenExample, root);
+  await downloadTemplate(template, root);
   console.log(
-    logText("Installing packages. This might take a couple of minutes.")
+    logText("Installing packages. This might take a couple of minutes.\n")
   );
-  console.log();
-  await install(root, null, { packageManager, isOnline: true });
+  await install(root, null, { packageManager: pkgManager, isOnline: true });
   if (tryGitInit(root)) {
-    console.log(logText("Initializing git repository."));
-    console.log();
+    console.log(logText("Initializing git repository.\n"));
   }
   console.log(`${successText("Starter successfully created!")}`);
   console.log(import_chalk5.default.bold("\nTo launch your app, run:\n"));
-  console.log(`  ${cmdText(`cd ${appName}`)}`);
+  console.log(`	${cmdText(`cd ${appName}`)}`);
   console.log(
-    `  ${cmdText(
-      `${displayedCommand} ${packageManager === "npm" ? "run " : ""}dev`
-    )}`
+    `  ${cmdText(`${pkgManager} ${pkgManager === "npm" ? "run " : ""}dev`)}`
   );
-  console.log();
-  console.log("Next steps:");
-  console.log();
+  console.log("\nNext steps:\n");
   console.log(
     `\u2022 \u{1F4DD} Edit some content on ${linkText(
       "http://localhost:3000"
@@ -502,5 +527,6 @@ var run = async () => {
 run();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PKG_MANAGERS,
   run
 });

package/dist/templates.d.ts

@@ -0,0 +1,16 @@
+type BaseExample = {
+    title: string;
+    description?: string;
+    value: string;
+};
+export type InternalTemplate = BaseExample & {
+    isInternal: true;
+};
+export type ExternalTemplate = BaseExample & {
+    isInternal: false;
+    gitURL: string;
+};
+export type Template = InternalTemplate | ExternalTemplate;
+export declare const TEMPLATES: Template[];
+export declare const downloadTemplate: (template: Template, root: string) => Promise<void>;
+export {};

package/dist/util/checkPkgManagers.d.ts

@@ -0,0 +1,2 @@
+import { PKG_MANAGERS } from '..';
+export declare function checkPackageExists(name: (typeof PKG_MANAGERS)[number]): Promise<unknown>;

package/dist/util/examples.d.ts

@@ -1,4 +1,4 @@
-export declare type RepoInfo = {
+export type RepoInfo = {
     username: string;
     name: string;
     branch: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "1.1.6",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -34,8 +34,8 @@
     "@types/node": "^20.14.12",
     "@types/prompts": "^2.4.9",
     "@types/tar": "6.1.13",
-    "typescript": "^4.6.4",
-    "@tinacms/scripts": "1.1.6"
+    "typescript": "^5.5.4",
+    "@tinacms/scripts": "1.2.1"
   },
   "dependencies": {
     "chalk": "4.1.2",

package/dist/examples.d.ts

@@ -1,19 +0,0 @@
-/**
-
-*/
-declare type BaseExample = {
-    title: string;
-    description?: string;
-    value: string;
-};
-export declare type InternalExample = BaseExample & {
-    isInternal: true;
-};
-export declare type ExternalExample = BaseExample & {
-    isInternal: false;
-    gitURL: string;
-};
-export declare type Example = InternalExample | ExternalExample;
-export declare const EXAMPLES: Example[];
-export declare const downloadExample: (example: Example, root: string) => Promise<void>;
-export {};