create-tina-app 1.6.0 → 1.6.2

package/dist/index.js

@@ -7,10 +7,6 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __export = (target, all) => {
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -27,14 +23,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // package.json
 var require_package = __commonJS({
-  "package.json"(exports2, module2) {
-    module2.exports = {
+  "package.json"(exports, module) {
+    module.exports = {
       name: "create-tina-app",
-      version: "1.6.0",
+      version: "1.6.2",
       main: "dist/index.js",
       files: [
         "dist",
@@ -82,7 +77,7 @@ var require_package = __commonJS({
         commander: "^12.1.0",
         "cross-spawn": "catalog:",
         "fs-extra": "catalog:",
-        ora: "^8.2.0",
+        ora: "catalog:",
         prompts: "catalog:",
         tar: "catalog:",
         "validate-npm-package-name": "catalog:"
@@ -92,36 +87,31 @@ var require_package = __commonJS({
 });
 
 // src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  run: () => run
-});
-module.exports = __toCommonJS(index_exports);
-var import_metrics = require("@tinacms/metrics");
-var import_prompts = __toESM(require("prompts"));
-var import_node_path = __toESM(require("node:path"));
+import { Telemetry } from "@tinacms/metrics";
+import prompts from "prompts";
+import path4 from "node:path";
 
 // src/util/fileUtil.ts
-var import_fs_extra = __toESM(require("fs-extra"));
-var import_path = __toESM(require("path"));
+import fs from "fs-extra";
+import path from "path";
 
 // src/util/textstyles.ts
-var import_chalk = __toESM(require("chalk"));
+import chalk from "chalk";
 var TextStyles = {
-  tinaOrange: import_chalk.default.hex("#EC4816"),
-  link: (url) => `\x1B]8;;${url}\x07${import_chalk.default.cyan.underline(url)}\x1B]8;;\x07`,
-  cmd: import_chalk.default.bgBlackBright.bold.white,
-  info: import_chalk.default.blue,
-  success: import_chalk.default.green,
-  warn: import_chalk.default.yellow,
-  err: import_chalk.default.red,
-  bold: import_chalk.default.bold
+  tinaOrange: chalk.hex("#EC4816"),
+  link: (url) => `\x1B]8;;${url}\x07${chalk.cyan.underline(url)}\x1B]8;;\x07`,
+  cmd: chalk.bgBlackBright.bold.white,
+  info: chalk.blue,
+  success: chalk.green,
+  warn: chalk.yellow,
+  err: chalk.red,
+  bold: chalk.bold
 };
 
 // src/util/fileUtil.ts
 async function isWriteable(directory) {
   try {
-    await import_fs_extra.default.promises.access(directory, (import_fs_extra.default.constants || import_fs_extra.default).W_OK);
+    await fs.promises.access(directory, (fs.constants || fs).W_OK);
     return true;
   } catch (err) {
     return false;
@@ -148,12 +138,12 @@ function folderContainsInstallConflicts(root) {
     "yarn-debug.log",
     "yarn-error.log"
   ];
-  const conflicts = import_fs_extra.default.readdirSync(root).filter((file) => !validFiles.includes(file)).filter((file) => !/\.iml$/.test(file));
+  const conflicts = fs.readdirSync(root).filter((file) => !validFiles.includes(file)).filter((file) => !/\.iml$/.test(file));
   return conflicts;
 }
 async function setupProjectDirectory(dir) {
-  const appName = import_path.default.basename(dir);
-  await import_fs_extra.default.mkdirp(dir);
+  const appName = path.basename(dir);
+  await fs.mkdirp(dir);
   process.chdir(dir);
   const conflicts = folderContainsInstallConflicts(dir);
   if (conflicts.length > 0) {
@@ -162,7 +152,7 @@ async function setupProjectDirectory(dir) {
     ];
     for (const file of conflicts) {
       try {
-        const stats = import_fs_extra.default.lstatSync(import_path.default.join(dir, file));
+        const stats = fs.lstatSync(path.join(dir, file));
         if (stats.isDirectory()) {
           errorMessageLines.push(`  -  ${TextStyles.info(file)}/`);
         } else {
@@ -177,36 +167,36 @@ async function setupProjectDirectory(dir) {
   return appName;
 }
 function updateProjectPackageName(dir, name2) {
-  const packageJsonPath = import_path.default.join(dir, "package.json");
-  const packageJson = JSON.parse(import_fs_extra.default.readFileSync(packageJsonPath, "utf8"));
+  const packageJsonPath = path.join(dir, "package.json");
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
   packageJson.name = name2;
-  import_fs_extra.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
 function updateProjectPackageVersion(dir, version2) {
-  const packageJsonPath = import_path.default.join(dir, "package.json");
-  const packageJson = JSON.parse(import_fs_extra.default.readFileSync(packageJsonPath, "utf8"));
+  const packageJsonPath = path.join(dir, "package.json");
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
   packageJson.version = version2;
-  import_fs_extra.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
 async function updateThemeSettings(dir, selectedTheme) {
-  const settingsDir = import_path.default.join(dir, "content", "settings");
-  const configPath = import_path.default.join(settingsDir, "config.json");
-  await import_fs_extra.default.mkdirp(settingsDir);
+  const settingsDir = path.join(dir, "content", "settings");
+  const configPath = path.join(settingsDir, "config.json");
+  await fs.mkdirp(settingsDir);
   let config = {};
   try {
-    const existingConfig = await import_fs_extra.default.readFile(configPath, "utf8");
+    const existingConfig = await fs.readFile(configPath, "utf8");
     config = JSON.parse(existingConfig);
   } catch (error) {
   }
   config.selectedTheme = selectedTheme;
-  await import_fs_extra.default.writeFile(configPath, JSON.stringify(config, null, 2));
+  await fs.writeFile(configPath, JSON.stringify(config, null, 2));
 }
 
 // src/util/install.ts
-var import_cross_spawn = __toESM(require("cross-spawn"));
+import spawn from "cross-spawn";
 function install(packageManager, verboseOutput) {
   return new Promise((resolve, reject) => {
-    const child = (0, import_cross_spawn.default)(packageManager, ["install"], {
+    const child = spawn(packageManager, ["install"], {
       stdio: verboseOutput ? "inherit" : "ignore",
       env: { ...process.env, ADBLOCK: "1", DISABLE_OPENCOLLECTIVE: "1" }
     });
@@ -221,12 +211,12 @@ function install(packageManager, verboseOutput) {
 }
 
 // src/util/git.ts
-var import_child_process = require("child_process");
-var import_path2 = __toESM(require("path"));
-var import_fs_extra2 = __toESM(require("fs-extra"));
+import { execSync } from "child_process";
+import path2 from "path";
+import fs2 from "fs-extra";
 function isInGitRepository() {
   try {
-    (0, import_child_process.execSync)("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
+    execSync("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
     return true;
   } catch (_) {
   }
@@ -234,7 +224,7 @@ function isInGitRepository() {
 }
 function isInMercurialRepository() {
   try {
-    (0, import_child_process.execSync)("hg --cwd . root", { stdio: "ignore" });
+    execSync("hg --cwd . root", { stdio: "ignore" });
     return true;
   } catch (_) {
   }
@@ -242,27 +232,27 @@ function isInMercurialRepository() {
 }
 function makeFirstCommit(root) {
   try {
-    (0, import_child_process.execSync)("git checkout -b main", { stdio: "ignore" });
-    (0, import_child_process.execSync)("git add -A", { stdio: "ignore" });
-    (0, import_child_process.execSync)('git commit -m "Initial commit from Create Tina App"', {
+    execSync("git checkout -b main", { stdio: "ignore" });
+    execSync("git add -A", { stdio: "ignore" });
+    execSync('git commit -m "Initial commit from Create Tina App"', {
       stdio: "ignore"
     });
   } catch (err) {
-    import_fs_extra2.default.removeSync(import_path2.default.join(root, ".git"));
+    fs2.removeSync(path2.join(root, ".git"));
     throw err;
   }
 }
 function initializeGit(spinner) {
-  (0, import_child_process.execSync)("git --version", { stdio: "ignore" });
+  execSync("git --version", { stdio: "ignore" });
   if (isInGitRepository() || isInMercurialRepository()) {
     spinner.warn("Already in a Git repository, skipping.");
     return false;
   }
-  if (!import_fs_extra2.default.existsSync(".gitignore")) {
+  if (!fs2.existsSync(".gitignore")) {
     spinner.warn(
       "There is no .gitignore file in this repository, creating one..."
     );
-    import_fs_extra2.default.writeFileSync(
+    fs2.writeFileSync(
       ".gitignore",
       `node_modules
 .yarn/*
@@ -272,14 +262,14 @@ function initializeGit(spinner) {
 `
     );
   }
-  (0, import_child_process.execSync)("git init", { stdio: "ignore" });
+  execSync("git init", { stdio: "ignore" });
   return true;
 }
 
 // src/util/examples.ts
-var import_node_stream = require("node:stream");
-var import_promises = require("node:stream/promises");
-var import_tar = require("tar");
+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("/");
@@ -314,14 +304,14 @@ async function downloadTarStream(url) {
   if (!res.body) {
     throw new Error(`Failed to download: ${url}`);
   }
-  return import_node_stream.Readable.fromWeb(res.body);
+  return Readable.fromWeb(res.body);
 }
 async function downloadAndExtractRepo(root, { username, name: name2, branch, filePath }) {
-  await (0, import_promises.pipeline)(
+  await pipeline(
     await downloadTarStream(
       `https://codeload.github.com/${username}/${name2}/tar.gz/${branch}`
     ),
-    (0, import_tar.x)({
+    x({
       cwd: root,
       strip: filePath ? filePath.split("/").length + 1 : 1,
       filter: (p) => p.startsWith(
@@ -332,8 +322,8 @@ async function downloadAndExtractRepo(root, { username, name: name2, branch, fil
 }
 
 // src/templates.ts
-var import_fs_extra3 = require("fs-extra");
-var import_path3 = __toESM(require("path"));
+import { copy } from "fs-extra";
+import path3 from "path";
 var TEMPLATES = [
   {
     title: "\u2B50 NextJS starter",
@@ -404,8 +394,8 @@ async function downloadTemplate(template, root, spinner) {
     )}`;
     await downloadAndExtractRepo(root, repoInfo);
   } else {
-    const templateFile = import_path3.default.join(__dirname, "..", "examples", template.value);
-    await (0, import_fs_extra3.copy)(`${templateFile}/`, "./");
+    const templateFile = path3.join(__dirname, "..", "examples", template.value);
+    await copy(`${templateFile}/`, "./");
   }
 }
 
@@ -429,11 +419,11 @@ function preRunChecks(spinner) {
 }
 
 // src/util/checkPkgManagers.ts
-var import_child_process2 = require("child_process");
+import { exec } from "child_process";
 async function checkPackageExists(name2) {
   try {
     await new Promise((resolve, reject) => {
-      (0, import_child_process2.exec)(`${name2} -v`, (error, stdout, stderr) => {
+      exec(`${name2} -v`, (error, stdout, stderr) => {
         if (error) {
           reject(stderr);
         }
@@ -447,11 +437,11 @@ async function checkPackageExists(name2) {
 }
 
 // src/index.ts
-var import_node_process = require("node:process");
+import { exit } from "node:process";
 
 // src/util/options.ts
-var import_commander = require("commander");
 var import_package = __toESM(require_package());
+import { Command } from "commander";
 
 // src/util/packageManagers.ts
 var PKG_MANAGERS = ["npm", "yarn", "pnpm", "bun"];
@@ -459,7 +449,7 @@ var PKG_MANAGERS = ["npm", "yarn", "pnpm", "bun"];
 // src/util/options.ts
 function extractOptions(args) {
   let projectName = "";
-  const program = new import_commander.Command(import_package.name);
+  const program = new Command(import_package.name);
   program.version(import_package.version).option(
     "-t, --template <template>",
     `Choose which template to start from. Valid templates are: ${TEMPLATES.map(
@@ -486,7 +476,7 @@ function extractOptions(args) {
 }
 
 // src/index.ts
-var import_validate_npm_package_name = __toESM(require("validate-npm-package-name"));
+import validate from "validate-npm-package-name";
 
 // src/util/asciiArt.ts
 var llama = "                                                  :--=:     \n                                                :-===-      \n                                               -=====-      \n                                              -=======.     \n                                             .=========-.   \n                                             :===========--:\n                                             -=============.\n                                            .==========-:.  \n                                            :=========-.    \n                                            -=========-     \n                                           .==========-     \n                                           -==========-     \n                                          :===========-     \n                                         -=============.    \n                                        :==============:    \n                                       :===============-    \n                                    .:-================-    \n                             ..::---====================    \n       ....::::::::::-------============================.   \n   .---=================================================:   \n .-=====================================================-   \n:=======================================================.   \n .-====================================================.    \n   .-=================================================.     \n     :=============================================-        \n     -============================================.         \n    .============-:.                 -==========-           \n    :=========-:  ..                 -==========.           \n    -========:  :-=-                 -=========-            \n   .========. .-====                 :=========:            \n   -=======:  :=====.                 -========:            \n   -======-    -====-                  -=======:            \n    -=====:     -====:                   :======.           \n    .=====.      -====.                   .-====-           \n     :====        -===-                     -====:          \n      -==-         :===-                     :====.         ";
@@ -541,7 +531,7 @@ async function run() {
   const spinner = ora();
   preRunChecks(spinner);
   const opts = extractOptions(process.argv);
-  const telemetry = new import_metrics.Telemetry({ disabled: opts?.noTelemetry });
+  const telemetry = new Telemetry({ disabled: opts?.noTelemetry });
   let template = null;
   if (opts.template) {
     template = TEMPLATES.find((_template) => _template.value === opts.template);
@@ -551,7 +541,7 @@ async function run() {
           (x2) => x2.value
         )}`
       );
-      (0, import_node_process.exit)(1);
+      exit(1);
     }
   }
   let pkgManager = opts.pkgManager;
@@ -560,7 +550,7 @@ async function run() {
       spinner.fail(
         `The provided package manager '${opts.pkgManager}' is not supported. Please provide one of the following: ${PKG_MANAGERS}`
       );
-      (0, import_node_process.exit)(1);
+      exit(1);
     }
   }
   if (!pkgManager) {
@@ -574,9 +564,9 @@ async function run() {
       spinner.fail(
         `You have no supported package managers installed. Please install one of the following: ${PKG_MANAGERS}`
       );
-      (0, import_node_process.exit)(1);
+      exit(1);
     }
-    const res = await (0, import_prompts.default)({
+    const res = await prompts({
       message: "Which package manager would you like to use?",
       name: "packageManager",
       type: "select",
@@ -584,46 +574,46 @@ async function run() {
         return { title: manager, value: manager };
       })
     });
-    if (!Object.hasOwn(res, "packageManager")) (0, import_node_process.exit)(1);
+    if (!Object.hasOwn(res, "packageManager")) exit(1);
     pkgManager = res.packageManager;
   }
   let projectName = opts.projectName;
   if (!projectName) {
-    const res = await (0, import_prompts.default)({
+    const res = await prompts({
       name: "name",
       type: "text",
       message: "What is your project named?",
       initial: "my-tina-app",
       validate: (name2) => {
-        const { validForNewPackages, errors } = (0, import_validate_npm_package_name.default)(
-          import_node_path.default.basename(import_node_path.default.resolve(name2))
+        const { validForNewPackages, errors } = validate(
+          path4.basename(path4.resolve(name2))
         );
         if (validForNewPackages) return true;
         return `Invalid project name: ${errors[0]}`;
       }
     });
-    if (!Object.hasOwn(res, "name")) (0, import_node_process.exit)(1);
+    if (!Object.hasOwn(res, "name")) exit(1);
     projectName = res.name;
   }
   if (!template) {
-    const res = await (0, import_prompts.default)({
+    const res = await prompts({
       name: "template",
       type: "select",
       message: "What starter code would you like to use?",
       choices: TEMPLATES
     });
-    if (!Object.hasOwn(res, "template")) (0, import_node_process.exit)(1);
+    if (!Object.hasOwn(res, "template")) exit(1);
     template = TEMPLATES.find((_template) => _template.value === res.template);
   }
   let themeChoice;
   if (template.value === "tina-docs") {
-    const res = await (0, import_prompts.default)({
+    const res = await prompts({
       name: "theme",
       type: "select",
       message: "What theme would you like to use?",
       choices: THEMES
     });
-    if (!Object.hasOwn(res, "theme")) (0, import_node_process.exit)(1);
+    if (!Object.hasOwn(res, "theme")) exit(1);
     themeChoice = res.theme;
   }
   await telemetry.submitRecord({
@@ -633,8 +623,8 @@ async function run() {
       pkgManager
     }
   });
-  const rootDir = import_node_path.default.join(process.cwd(), projectName);
-  if (!await isWriteable(import_node_path.default.dirname(rootDir))) {
+  const rootDir = path4.join(process.cwd(), projectName);
+  if (!await isWriteable(path4.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."
     );
@@ -645,7 +635,7 @@ async function run() {
     appName = await setupProjectDirectory(rootDir);
   } catch (err) {
     spinner.fail(err.message);
-    (0, import_node_process.exit)(1);
+    exit(1);
   }
   try {
     await downloadTemplate(template, rootDir, spinner);
@@ -661,7 +651,7 @@ async function run() {
     spinner.succeed();
   } catch (err) {
     spinner.fail(`Failed to download template: ${err.message}`);
-    (0, import_node_process.exit)(1);
+    exit(1);
   }
   spinner.start("Installing packages.");
   try {
@@ -714,7 +704,6 @@ run().catch((error) => {
   console.error("Error running create-tina-app:", error);
   process.exit(1);
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   run
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -35,7 +35,7 @@
     "@types/prompts": "^2.4.9",
     "@types/tar": "6.1.13",
     "typescript": "^5.7.3",
-    "@tinacms/scripts": "1.4.0"
+    "@tinacms/scripts": "1.4.1"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -46,7 +46,7 @@
     "prompts": "^2.4.2",
     "tar": "7.4.0",
     "validate-npm-package-name": "^5.0.1",
-    "@tinacms/metrics": "1.1.0"
+    "@tinacms/metrics": "2.0.0"
   },
   "scripts": {
     "types": "pnpm tsc",