create-tina-app 1.1.4 → 1.1.6

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.4";
+var version = "1.1.6";
 
 // src/util/fileUtil.ts
 var import_fs_extra = __toESM(require("fs-extra"));
@@ -111,7 +111,7 @@ function install(root, dependencies, { packageManager, isOnline, devDependencies
   return new Promise((resolve, reject) => {
     let args;
     const command = packageManager;
-    if (dependencies && dependencies.length) {
+    if (dependencies == null ? void 0 : dependencies.length) {
       switch (packageManager) {
         case "yarn":
           args = ["add", "--exact"];
@@ -241,41 +241,53 @@ 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"));
-var import_stream = require("stream");
-var import_util = require("util");
-var import_tar = __toESM(require("tar"));
-var pipeline = (0, import_util.promisify)(import_stream.Stream.pipeline);
+var import_node_stream = require("stream");
+var import_promises = require("stream/promises");
+var import_tar = require("tar");
 async function getRepoInfo(url, examplePath) {
   const [, username, name2, t, _branch, ...file] = url.pathname.split("/");
   const filePath = examplePath ? examplePath.replace(/^\//, "") : file.join("/");
-  if (t === void 0) {
-    const infoResponse = await (0, import_got.default)(
-      `https://api.github.com/repos/${username}/${name2}`
-    ).catch((e) => e);
-    if (infoResponse.statusCode !== 200) {
+  if (t === void 0 || 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 info = JSON.parse(infoResponse.body);
-    return { username, name: name2, branch: info["default_branch"], filePath };
   }
   const branch = examplePath ? `${_branch}/${file.join("/")}`.replace(new RegExp(`/${filePath}|/$`), "") : _branch;
   if (username && name2 && branch && t === "tree") {
     return { username, name: name2, branch, filePath };
   }
 }
-function downloadAndExtractRepo(root, { username, name: name2, branch, filePath }) {
-  return pipeline(
-    import_got.default.stream(
+async function downloadTarStream(url) {
+  const res = await fetch(url);
+  if (!res.body) {
+    throw new Error(`Failed to download: ${url}`);
+  }
+  return import_node_stream.Readable.fromWeb(res.body);
+}
+async function downloadAndExtractRepo(root, { username, name: name2, branch, filePath }) {
+  await (0, import_promises.pipeline)(
+    await downloadTarStream(
       `https://codeload.github.com/${username}/${name2}/tar.gz/${branch}`
     ),
-    import_tar.default.extract(
-      { cwd: root, strip: filePath ? filePath.split("/").length + 1 : 1 },
-      [`${name2}-${branch}${filePath ? `/${filePath}` : ""}`]
-    )
+    (0, import_tar.x)({
+      cwd: root,
+      strip: filePath ? filePath.split("/").length + 1 : 1,
+      filter: (p) => p.startsWith(
+        `${name2}-${branch.replace(/\//g, "-")}${filePath ? `/${filePath}/` : "/"}`
+      )
+    })
   );
 }
 
@@ -334,9 +346,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);
@@ -377,8 +392,8 @@ var run = async () => {
     name: "packageManager",
     type: "select",
     choices: [
-      { title: "Yarn", value: "yarn" },
-      { title: "NPM", value: "npm" },
+      { title: "yarn", value: "yarn" },
+      { title: "npm", value: "npm" },
       { title: "pnpm", value: "pnpm" }
     ]
   });
@@ -403,15 +418,15 @@ 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;
   }
-  const chosenExample = EXAMPLES.find((x) => x.value === 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(
-        (x) => x.value
+        (x2) => x2.value
       )}`
     );
   }
@@ -422,8 +437,8 @@ var run = async () => {
       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."
     );
@@ -432,12 +447,20 @@ 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(
+        (x2) => x2.value
+      )}`
+    );
+    throw new Error("Invalid example");
+  }
   await downloadExample(chosenExample, root);
   console.log(
     logText("Installing packages. This might take a couple of minutes.")
@@ -450,7 +473,7 @@ var run = async () => {
   }
   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`

package/dist/util/examples.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 export declare type RepoInfo = {
     username: string;
     name: string;
@@ -10,6 +7,6 @@ export declare type RepoInfo = {
 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 hasExample(name: string): 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tina-app",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -18,6 +18,9 @@
       }
     ]
   },
+  "engines": {
+    "node": ">=18.18.0"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
@@ -26,22 +29,23 @@
     "directory": "packages/create-tina-app"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/node": "^16.11.7",
-    "@types/prompts": "^2.0.14",
-    "@types/tar": "4.0.3",
-    "typescript": "4.6.4",
-    "@tinacms/scripts": "1.1.5"
+    "@types/cross-spawn": "^6.0.6",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^20.14.12",
+    "@types/prompts": "^2.4.9",
+    "@types/tar": "6.1.13",
+    "typescript": "^4.6.4",
+    "@tinacms/scripts": "1.1.6"
   },
   "dependencies": {
-    "chalk": "^4.1.2",
-    "commander": "^8.3.0",
+    "chalk": "4.1.2",
+    "commander": "^12.1.0",
     "cross-spawn": "^7.0.3",
-    "fs-extra": "^10.0.0",
-    "got": "^11.8.5",
+    "fs-extra": "^11.2.0",
+    "got": "^14.4.2",
     "prompts": "^2.4.2",
-    "tar": "4.4.18",
-    "@tinacms/metrics": "1.0.4"
+    "tar": "7.4.0",
+    "@tinacms/metrics": "1.0.5"
   },
   "scripts": {
     "types": "pnpm tsc",