@aws/create-nx-workspace 0.119.0 → 0.121.0

package/bin/index.cjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 let child_process = require("child_process");
+let fs = require("fs");
+let path = require("path");
 //#endregion
 //#region src/create-nx-workspace.ts
 /**
@@ -127,7 +129,7 @@ const NX_VERSION = {
 	zod: "4.4.3",
 	ws: "8.21.0"
 }["create-nx-workspace"];
-const PRESET = "@aws/nx-plugin";
+const PRESET = `@aws/nx-plugin@${JSON.parse((0, fs.readFileSync)((0, path.resolve)(__dirname, "..", "package.json"), "utf-8")).version}`;
 const DEFAULT_FLAGS = ["--ci=skip", "--analytics=false"];
 /**
 * Detect the package manager from the npm_config_user_agent environment variable.
@@ -141,37 +143,60 @@ const detectPackageManager = () => {
 	if (userAgent.startsWith("bun/")) return "bun";
 	if (userAgent.startsWith("npm/")) return "npm";
 };
-const isNonInteractive = (flagArgs) => flagArgs.some((a) => a === "--no-interactive" || a === "--interactive=false");
-const hasSkipGitFlag = (flagArgs) => flagArgs.some((a) => a === "--skipGit" || a.startsWith("--skipGit="));
-const hasCiOverride = (flagArgs) => flagArgs.some((a) => a.startsWith("--ci") || a.startsWith("--nxCloud"));
+const shouldSkipGit = (flagArgs) => flagArgs.some((a) => a === "--skipGit" || a === "--skipGit=true");
 const buildArgs = (args) => {
 	const positionalArgs = args.filter((a) => !a.startsWith("-"));
 	const flagArgs = args.filter((a) => a.startsWith("-"));
-	const defaultFlags = [...DEFAULT_FLAGS];
+	const defaultFlags = [...DEFAULT_FLAGS, "--skipGit"];
 	if (!flagArgs.some((a) => a.startsWith("--pm"))) {
 		const pm = detectPackageManager();
 		if (pm) defaultFlags.push(`--pm=${pm}`);
 	}
-	if (isNonInteractive(flagArgs) && !hasCiOverride(flagArgs) && !hasSkipGitFlag(flagArgs)) defaultFlags.push("--skipGit");
-	const flagsToAdd = defaultFlags.filter((flag) => !flagArgs.some((a) => a.startsWith(flag.split("=")[0])));
+	const userFlagsWithoutSkipGit = flagArgs.filter((a) => !a.startsWith("--skipGit"));
+	const flagsToAdd = defaultFlags.filter((flag) => !userFlagsWithoutSkipGit.some((a) => a.startsWith(flag.split("=")[0])));
 	return [
 		...positionalArgs,
 		`--preset=${PRESET}`,
 		...flagsToAdd,
-		...flagArgs
+		...userFlagsWithoutSkipGit
 	];
 };
+const initGitRepo = (dir) => {
+	const shell = process.platform === "win32";
+	(0, child_process.spawnSync)("git", ["init"], {
+		cwd: dir,
+		stdio: "pipe"
+	});
+	(0, child_process.spawnSync)(detectPackageManager() ?? "npm", ["run", "prepare"], {
+		cwd: dir,
+		stdio: "pipe",
+		shell
+	});
+	(0, child_process.spawnSync)("git", ["add", "."], {
+		cwd: dir,
+		stdio: "pipe"
+	});
+	(0, child_process.spawnSync)("git", [
+		"commit",
+		"-m",
+		"Initial commit"
+	], {
+		cwd: dir,
+		stdio: "pipe"
+	});
+};
 /**
 * Create a new Nx workspace with the @aws/nx-plugin preset.
 * All arguments are forwarded to create-nx-workspace.
 */
 const createNxWorkspace = (args) => {
 	if (args.some((a) => a.startsWith("--preset"))) {
-		console.error(`Error: --preset cannot be used with @aws/create-nx-workspace.\nThis package always creates a workspace with the ${PRESET} preset.\nTo use a different preset, run create-nx-workspace directly:\n\n  npx create-nx-workspace <name> --preset=<your-preset>\n`);
+		console.error("Error: --preset cannot be used with @aws/create-nx-workspace.\nThis package always creates a workspace with the @aws/nx-plugin preset.\nTo use a different preset, run create-nx-workspace directly:\n\n  npx create-nx-workspace <name> --preset=<your-preset>\n");
 		return 1;
 	}
+	const skipGit = shouldSkipGit(args.filter((a) => a.startsWith("-")));
 	const allArgs = buildArgs(args);
-	return (0, child_process.spawnSync)("npx", [
+	const result = (0, child_process.spawnSync)("npx", [
 		"-y",
 		`create-nx-workspace@${NX_VERSION}`,
 		...allArgs
@@ -182,7 +207,13 @@ const createNxWorkspace = (args) => {
 			pnpm_config_strict_dep_builds: "false"
 		},
 		shell: process.platform === "win32"
-	}).status ?? 1;
+	});
+	if (result.status !== 0) return result.status ?? 1;
+	if (!skipGit) {
+		const workspaceName = args.filter((a) => !a.startsWith("-"))[0];
+		if (workspaceName) initGitRepo((0, path.resolve)(workspaceName));
+	}
+	return 0;
 };
 //#endregion
 //#region bin/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/create-nx-workspace",
-  "version": "0.119.0",
+  "version": "0.121.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",