create-react-router 0.0.0-experimental-abd9fc79b → 0.0.0-experimental-2a01b6fd8

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # `create-react-router`
 
+## v8.3.0
+
+### Patch Changes
+
+- _No changes_
+
+## v8.2.0
+
+### Minor Changes
+
+- Detect `nub` as a supported package manager when creating new projects ([#15276](https://github.com/remix-run/react-router/pull/15276))
+
+## v8.1.0
+
+### Minor Changes
+
+- Add a default-on CLI option to include the official React Router agent skill in generated projects ([#15213](https://github.com/remix-run/react-router/pull/15213))
+  - New projects include `.agents/skills/react-router` by default when running with `--yes` or in non-interactive shells
+  - Interactive runs prompt to include the skill, defaulting to yes
+  - Use `--no-agent-skills` to skip copying the skill
+
+### Patch Changes
+
+- Use Node's built-in utilities for CLI argument parsing, ANSI-stripping, and child process execution to remove the `arg`, `strip-ansi`, and `execa` dependencies ([#15231](https://github.com/remix-run/react-router/pull/15231))
+
 ## v8.0.1
 
 ### Patch Changes

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * create-react-router v0.0.0-experimental-abd9fc79b
+ * create-react-router v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,14 +10,13 @@
  * @license MIT
  */
 import process from "node:process";
+import { spawn } from "node:child_process";
 import fs, { existsSync } from "node:fs";
 import { cp, readFile, readdir, realpath, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import url, { fileURLToPath } from "node:url";
-import stripAnsi from "strip-ansi";
-import { execa } from "execa";
-import arg from "arg";
+import { parseArgs, promisify, stripVTControlCharacters } from "node:util";
 import * as semver from "semver";
 import sortPackageJSON from "sort-package-json";
 import { beep, cursor, erase } from "sisteransi";
@@ -25,7 +24,6 @@ import EventEmitter from "node:events";
 import readline from "node:readline";
 import pc from "picocolors";
 import stream from "node:stream";
-import { promisify } from "node:util";
 import gunzip from "gunzip-maybe";
 import tar from "tar-fs";
 //#region utils.ts
@@ -155,7 +153,7 @@ function isUrl(value) {
 	try {
 		new URL(value);
 		return true;
-	} catch (e) {
+	} catch {
 		return false;
 	}
 }
@@ -250,7 +248,7 @@ var Prompt = class extends EventEmitter {
 			let a = action(key, isSelect);
 			if (a === false) try {
 				this._(str, key);
-			} catch (e) {}
+			} catch {}
 			else if (typeof this[a] === "function") this[a](key);
 		};
 		this.close = () => {
@@ -887,7 +885,7 @@ async function prompt(questions, opts = {}) {
 			}, question));
 			answers[name] = answer;
 			quit = await onSubmit(question, answer, answers);
-		} catch (e) {
+		} catch {
 			quit = !await onCancel(question, answers);
 		}
 		if (quit) return answers;
@@ -1064,7 +1062,7 @@ async function copyTemplate(template, destPath, options) {
 function isLocalFilePath(input) {
 	try {
 		return input.startsWith("file://") || fs.existsSync(path.isAbsolute(input) ? input : path.resolve(process.cwd(), input));
-	} catch (e) {
+	} catch {
 		return false;
 	}
 }
@@ -1158,7 +1156,7 @@ async function downloadAndExtractTarball(downloadPath, tarballUrl, { token, file
 				return header.name === "__IGNORE__";
 			}
 		}));
-	} catch (e) {
+	} catch {
 		throw new CopyTemplateError(`There was a problem extracting the file from the provided template.  Template URL: \`${tarballUrl}\`  Destination directory: \`${downloadPath}\``);
 	}
 	if (filePath && !filePathHasFiles) throw new CopyTemplateError(`The path "${filePath}" was not found in this ${isGithubUrl ? "GitHub repo." : "tarball."}`);
@@ -1187,7 +1185,7 @@ function isValidGithubRepoUrl(input) {
 		let url = new URL(input);
 		let pathSegments = url.pathname.slice(1).split("/");
 		return url.protocol === "https:" && url.hostname === "github.com" && pathSegments.length >= 2 && (pathSegments.length > 2 ? pathSegments[2] === "tree" && pathSegments.length >= 4 : true);
-	} catch (e) {
+	} catch {
 		return false;
 	}
 }
@@ -1239,7 +1237,7 @@ var CopyTemplateError = class extends Error {
 };
 //#endregion
 //#region package.json
-var version = "0.0.0-experimental-abd9fc79b";
+var version = "0.0.0-experimental-2a01b6fd8";
 //#endregion
 //#region index.ts
 const currentFileDir = path.dirname(fileURLToPath(import.meta.url));
@@ -1276,36 +1274,48 @@ async function createReactRouter(argv) {
 	}
 }
 async function getContext(argv) {
-	let flags = arg({
-		"--debug": Boolean,
-		"--react-router-version": String,
-		"-v": "--react-router-version",
-		"--template": String,
-		"--token": String,
-		"--yes": Boolean,
-		"-y": "--yes",
-		"--install": Boolean,
-		"--no-install": Boolean,
-		"--package-manager": String,
-		"--show-install-output": Boolean,
-		"--agent-skills": Boolean,
-		"--with-agent-skills": "--agent-skills",
-		"--no-agent-skills": Boolean,
-		"--git-init": Boolean,
-		"--no-git-init": Boolean,
-		"--help": Boolean,
-		"-h": "--help",
-		"--version": Boolean,
-		"--V": "--version",
-		"--no-color": Boolean,
-		"--no-motion": Boolean,
-		"--overwrite": Boolean
-	}, {
-		argv,
-		permissive: true
+	let { values, positionals } = parseArgs({
+		args: argv,
+		allowPositionals: true,
+		strict: false,
+		options: {
+			"agent-skills": { type: "boolean" },
+			debug: { type: "boolean" },
+			"git-init": { type: "boolean" },
+			help: {
+				type: "boolean",
+				short: "h"
+			},
+			install: { type: "boolean" },
+			"no-agent-skills": { type: "boolean" },
+			"no-color": { type: "boolean" },
+			"no-git-init": { type: "boolean" },
+			"no-install": { type: "boolean" },
+			"no-motion": { type: "boolean" },
+			overwrite: { type: "boolean" },
+			"package-manager": { type: "string" },
+			"react-router-version": {
+				type: "string",
+				short: "v"
+			},
+			"show-install-output": { type: "boolean" },
+			template: { type: "string" },
+			token: { type: "string" },
+			version: {
+				type: "boolean",
+				short: "V"
+			},
+			yes: {
+				type: "boolean",
+				short: "y"
+			}
+		}
 	});
-	let { "--debug": debug = false, "--help": help = false, "--react-router-version": selectedReactRouterVersion, "--template": template, "--token": token, "--install": install, "--no-install": noInstall, "--package-manager": pkgManager, "--show-install-output": showInstallOutput = false, "--agent-skills": agentSkills, "--no-agent-skills": noAgentSkills, "--git-init": git, "--no-git-init": noGit, "--no-motion": noMotion, "--yes": yes, "--version": versionRequested, "--overwrite": overwrite } = flags;
-	let cwd = flags["_"][0];
+	let getBooleanArg = (value) => typeof value === "boolean" ? value : void 0;
+	let getStringArg = (value) => typeof value === "string" ? value : void 0;
+	let selectedReactRouterVersion = getStringArg(values["react-router-version"]);
+	let yes = getBooleanArg(values.yes);
+	let cwd = positionals[0];
 	let interactive = isInteractive();
 	let projectName = cwd;
 	if (!interactive) yes = true;
@@ -1317,22 +1327,22 @@ async function getContext(argv) {
 	return {
 		tempDir: path.join(await realpath(os.tmpdir()), `create-react-router--${Math.random().toString(36).substr(2, 8)}`),
 		cwd,
-		overwrite,
+		overwrite: getBooleanArg(values.overwrite),
 		interactive,
-		debug,
-		agentSkills: agentSkills ?? (noAgentSkills ? false : yes),
-		git: git ?? (noGit ? false : yes),
-		help,
-		install: install ?? (noInstall ? false : yes),
-		showInstallOutput,
-		noMotion,
-		pkgManager: validatePackageManager(pkgManager ?? (process.env.npm_config_user_agent ?? "npm").split("/")[0]),
+		debug: getBooleanArg(values.debug) ?? false,
+		agentSkills: getBooleanArg(values["agent-skills"]) ?? (getBooleanArg(values["no-agent-skills"]) ? false : yes),
+		git: getBooleanArg(values["git-init"]) ?? (getBooleanArg(values["no-git-init"]) ? false : yes),
+		help: getBooleanArg(values.help) ?? false,
+		install: getBooleanArg(values.install) ?? (getBooleanArg(values["no-install"]) ? false : yes),
+		showInstallOutput: getBooleanArg(values["show-install-output"]) ?? false,
+		noMotion: getBooleanArg(values["no-motion"]),
+		pkgManager: validatePackageManager(getStringArg(values["package-manager"]) ?? detectPackageManager() ?? "npm"),
 		projectName,
 		prompt,
 		reactRouterVersion: selectedReactRouterVersion || version,
-		template,
-		token,
-		versionRequested
+		template: getStringArg(values.template),
+		token: getStringArg(values.token),
+		versionRequested: getBooleanArg(values.version)
 	};
 }
 async function introStep(ctx) {
@@ -1424,7 +1434,7 @@ async function agentSkillsQuestionStep(ctx) {
 		let { agentSkills = true } = await ctx.prompt({
 			name: "agentSkills",
 			type: "confirm",
-			label: title("agents"),
+			label: title("skill"),
 			message: "Include the React Router agent skill?",
 			hint: "recommended",
 			initial: true
@@ -1584,9 +1594,9 @@ async function gitInitStep(ctx) {
 			};
 			let commitMsg = "Initial commit from create-react-router";
 			try {
-				await execa("git", ["init"], options);
-				await execa("git", ["add", "."], options);
-				await execa("git", [
+				await runCommand("git", ["init"], options);
+				await runCommand("git", ["add", "."], options);
+				await runCommand("git", [
 					"commit",
 					"-m",
 					commitMsg
@@ -1608,12 +1618,12 @@ async function doneStep(ctx) {
 	await sleep(100);
 	if (projectDir !== "") {
 		let enter = [`\n${prefix}Enter your project directory using`, color.cyan(`cd .${path.sep}${projectDir}`)];
-		let len = enter[0].length + stripAnsi(enter[1]).length;
+		let len = enter[0].length + stripVTControlCharacters(enter[1]).length;
 		log(enter.join(len > max ? "\n" + prefix : " "));
 	}
 	log(`${prefix}Check out ${color.bold("README.md")} for development and deploy instructions.`);
 	await sleep(100);
-	log(`\n${prefix}Join the community at ${color.cyan(`https://rmx.as/discord`)}\n`);
+	log(`\n${prefix}Join the community at ${color.cyan(`https://remix.run/discord`)}\n`);
 	await sleep(200);
 }
 const validPackageManagers = [
@@ -1621,14 +1631,37 @@ const validPackageManagers = [
 	"yarn",
 	"pnpm",
 	"bun",
-	"deno"
+	"deno",
+	"nub"
 ];
 function validatePackageManager(pkgManager) {
 	return validPackageManagers.find((name) => pkgManager === name) ?? "npm";
 }
+/**
+* Determine which package manager the user prefers.
+*
+* npm, pnpm, Yarn, Bun, Deno, and nub set the user agent environment variable
+* that can be used to determine which package manager ran the command.
+*/
+function detectPackageManager() {
+	let { npm_config_user_agent } = process.env;
+	if (!npm_config_user_agent) return void 0;
+	try {
+		let pkgManager = npm_config_user_agent.split("/")[0];
+		if (pkgManager === "npm") return "npm";
+		if (pkgManager === "pnpm") return "pnpm";
+		if (pkgManager === "yarn") return "yarn";
+		if (pkgManager === "bun") return "bun";
+		if (pkgManager === "deno") return "deno";
+		if (pkgManager === "nub") return "nub";
+		return;
+	} catch {
+		return;
+	}
+}
 async function installDependencies({ pkgManager, cwd, showInstallOutput }) {
 	try {
-		await execa(pkgManager, ["install"], {
+		await runCommand(pkgManager, ["install"], {
 			cwd,
 			stdio: showInstallOutput ? "inherit" : "ignore"
 		});
@@ -1637,6 +1670,16 @@ async function installDependencies({ pkgManager, cwd, showInstallOutput }) {
 		throw err;
 	}
 }
+function runCommand(command, args, options) {
+	return new Promise((resolve, reject) => {
+		let child = spawn(command, args, options);
+		child.on("error", reject);
+		child.on("exit", (code, signal) => {
+			if (code === 0) resolve();
+			else reject(/* @__PURE__ */ new Error(signal ? `${command} exited with signal ${signal}` : `${command} exited with code ${code}`));
+		});
+	});
+}
 async function updatePackageJSON(ctx) {
 	let packageJSONPath = path.join(ctx.cwd, "package.json");
 	if (!existsSync(packageJSONPath)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-react-router",
   "type": "module",
-  "version": "0.0.0-experimental-abd9fc79b",
+  "version": "0.0.0-experimental-2a01b6fd8",
   "description": "Create a new React Router app",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -34,15 +34,12 @@
     }
   },
   "dependencies": {
-    "arg": "^5.0.1",
-    "execa": "9.6.1",
     "gunzip-maybe": "^1.4.2",
     "log-update": "^8.0.0",
     "picocolors": "^1.1.1",
     "semver": "^7.8.1",
     "sisteransi": "^1.0.5",
     "sort-package-json": "^3.6.1",
-    "strip-ansi": "^7.2.0",
     "tar-fs": "^3.1.2"
   },
   "devDependencies": {