create-tina-app 1.1.3 → 1.1.5

package/dist/index.d.ts

@@ -1,4 +1 @@
-/**
-
-*/
 export declare const run: () => Promise<void>;

package/dist/index.js

@@ -31,11 +31,11 @@ module.exports = __toCommonJS(src_exports);
 var import_metrics = require("@tinacms/metrics");
 var import_commander = require("commander");
 var import_prompts = __toESM(require("prompts"));
-var import_path4 = __toESM(require("path"));
+var import_node_path = __toESM(require("path"));
 
 // package.json
 var name = "create-tina-app";
-var version = "1.1.3";
+var version = "1.1.5";
 
 // src/util/fileUtil.ts
 var import_fs_extra = __toESM(require("fs-extra"));
@@ -104,46 +104,61 @@ function isFolderEmpty(root, name2) {
 // src/util/install.ts
 var import_chalk2 = __toESM(require("chalk"));
 var import_cross_spawn = __toESM(require("cross-spawn"));
-function install(root, dependencies, { useYarn, isOnline, devDependencies }) {
+function install(root, dependencies, { packageManager, isOnline, devDependencies }) {
   const npmFlags = [];
   const yarnFlags = [];
+  const pnpmFlags = [];
   return new Promise((resolve, reject) => {
     let args;
-    const command = useYarn ? "yarnpkg" : "npm";
-    if (dependencies && dependencies.length) {
-      if (useYarn) {
-        args = ["add", "--exact"];
-        if (!isOnline)
-          args.push("--offline");
-        args.push("--cwd", root);
-        if (devDependencies)
-          args.push("--dev");
-        args.push(...dependencies);
-      } else {
-        args = ["install", "--save-exact"];
-        args.push(devDependencies ? "--save-dev" : "--save");
-        args.push(...dependencies);
+    const command = packageManager;
+    if (dependencies == null ? void 0 : dependencies.length) {
+      switch (packageManager) {
+        case "yarn":
+          args = ["add", "--exact"];
+          if (!isOnline)
+            args.push("--offline");
+          args.push("--cwd", root);
+          if (devDependencies)
+            args.push("--dev");
+          args.push(...dependencies);
+          break;
+        case "npm":
+          args = ["install", "--save-exact"];
+          args.push(devDependencies ? "--save-dev" : "--save");
+          args.push(...dependencies);
+          break;
+        case "pnpm":
+          args = ["add"];
+          if (!isOnline)
+            args.push("--offline");
+          args.push("--save-exact");
+          if (devDependencies)
+            args.push("-D");
+          args.push(...dependencies);
+          break;
       }
     } else {
       args = ["install"];
-      if (useYarn) {
-        if (!isOnline) {
-          console.log(import_chalk2.default.yellow("You appear to be offline."));
+      if (!isOnline) {
+        console.log(import_chalk2.default.yellow("You appear to be offline."));
+        if (packageManager === "yarn") {
           console.log(import_chalk2.default.yellow("Falling back to the local Yarn cache."));
-          console.log();
           args.push("--offline");
-        }
-      } else {
-        if (!isOnline) {
-          console.log(import_chalk2.default.yellow("You appear to be offline."));
+        } else {
           console.log();
         }
       }
     }
-    if (useYarn) {
-      args.push(...yarnFlags);
-    } else {
-      args.push(...npmFlags);
+    switch (packageManager) {
+      case "yarn":
+        args.push(...yarnFlags);
+        break;
+      case "npm":
+        args.push(...npmFlags);
+        break;
+      case "pnpm":
+        args.push(...pnpmFlags);
+        break;
     }
     const child = (0, import_cross_spawn.default)(command, args, {
       stdio: "inherit",
@@ -226,7 +241,7 @@ function tryGitInit(root) {
 }
 
 // src/index.ts
-var import_process = require("process");
+var import_node_process = require("process");
 
 // src/util/examples.ts
 var import_got = __toESM(require("got"));
@@ -319,9 +334,12 @@ var downloadExample = async (example, root) => {
     const repoInfo2 = repoInfo;
     console.log(
       `Downloading files from repo ${import_chalk4.default.cyan(
-        repoInfo.username + "/" + repoInfo.name
+        `${repoInfo == null ? void 0 : repoInfo.username}/${repoInfo == null ? void 0 : repoInfo.name}`
       )}. This might take a moment.`
     );
+    if (!repoInfo2) {
+      throw new Error("downloadExample Failed. Repo info not found");
+    }
     await downloadAndExtractRepo(root, repoInfo2);
   } else {
     const exampleFile = import_path3.default.join(__dirname, "..", "examples", example.value);
@@ -359,15 +377,16 @@ var run = async () => {
   let example = opts.example;
   const res = await (0, import_prompts.default)({
     message: "Which package manager would you like to use?",
-    name: "useYarn",
+    name: "packageManager",
     type: "select",
     choices: [
       { title: "Yarn", value: "yarn" },
-      { title: "NPM", value: "npm" }
+      { title: "NPM", value: "npm" },
+      { title: "pnpm", value: "pnpm" }
     ]
   });
-  const useYarn = res.useYarn === "yarn";
-  const displayedCommand = useYarn ? "yarn" : "npm";
+  const packageManager = res.packageManager;
+  const displayedCommand = packageManager;
   if (!projectName) {
     const res2 = await (0, import_prompts.default)({
       name: "name",
@@ -387,7 +406,7 @@ var run = async () => {
     });
     if (typeof res2.example !== "string") {
       console.error(import_chalk5.default.red("Input must be a string"));
-      (0, import_process.exit)(1);
+      (0, import_node_process.exit)(1);
     }
     example = res2.example;
   }
@@ -403,11 +422,11 @@ var run = async () => {
     event: {
       name: "create-tina-app:invoke",
       example,
-      useYarn: Boolean(useYarn)
+      useYarn: Boolean(res.packageManager === "yarn")
     }
   });
-  const root = import_path4.default.join(process.cwd(), dirName);
-  if (!await isWriteable(import_path4.default.dirname(root))) {
+  const root = import_node_path.default.join(process.cwd(), dirName);
+  if (!await isWriteable(import_node_path.default.dirname(root))) {
     console.error(
       "The application path is not writable, please check folder permissions and try again."
     );
@@ -416,27 +435,37 @@ var run = async () => {
     );
     process.exit(1);
   }
-  const appName = import_path4.default.basename(root);
+  const appName = import_node_path.default.basename(root);
   await makeDir(root);
   process.chdir(root);
   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(
+        (x) => x.value
+      )}`
+    );
+    throw new Error("Invalid example");
+  }
   await downloadExample(chosenExample, root);
   console.log(
     logText("Installing packages. This might take a couple of minutes.")
   );
   console.log();
-  await install(root, null, { useYarn, isOnline: true });
+  await install(root, null, { packageManager, isOnline: true });
   if (tryGitInit(root)) {
     console.log(logText("Initializing git repository."));
     console.log();
   }
   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} ${useYarn ? "" : "run "}dev`)}`
+    `  ${cmdText(
+      `${displayedCommand} ${packageManager === "npm" ? "run " : ""}dev`
+    )}`
   );
   console.log();
   console.log("Next steps:");

package/dist/util/install.d.ts

@@ -1,11 +1,8 @@
-/**
-
-*/
 interface InstallArgs {
     /**
-     * Indicate whether to install packages using Yarn.
+     * The package manager to use (yarn, npm, pnpm).
      */
-    useYarn: boolean;
+    packageManager: 'yarn' | 'npm' | 'pnpm';
     /**
      * Indicate whether there is an active Internet connection.
      */
@@ -16,9 +13,9 @@ interface InstallArgs {
     devDependencies?: boolean;
 }
 /**
- * Spawn a package manager installation with either Yarn or NPM.
+ * Spawn a package manager installation with Yarn, NPM, or PNPM.
  *
  * @returns A Promise that resolves once the installation is finished.
  */
-export declare function install(root: string, dependencies: string[] | null, { useYarn, isOnline, devDependencies }: InstallArgs): Promise<void>;
+export declare function install(root: string, dependencies: string[] | null, { packageManager, isOnline, devDependencies }: InstallArgs): Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -30,8 +30,9 @@
     "@types/node": "^16.11.7",
     "@types/prompts": "^2.0.14",
     "@types/tar": "4.0.3",
+    "@types/cross-spawn": "^6.0.6",
     "typescript": "4.6.4",
-    "@tinacms/scripts": "1.1.5"
+    "@tinacms/scripts": "1.1.6"
   },
   "dependencies": {
     "chalk": "^4.1.2",
@@ -40,8 +41,8 @@
     "fs-extra": "^10.0.0",
     "got": "^11.8.5",
     "prompts": "^2.4.2",
-    "tar": "4.4.18",
-    "@tinacms/metrics": "1.0.3"
+    "tar": "7.4.0",
+    "@tinacms/metrics": "1.0.5"
   },
   "scripts": {
     "types": "pnpm tsc",