@geekmidas/cli 1.10.22 → 1.10.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @geekmidas/cli
 
+## 1.10.24
+
+### Patch Changes
+
+- 🐛 [`b3565b8`](https://github.com/geekmidas/toolbox/commit/b3565b89e57f100157faf82d89077c3d24df78fd) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix exec script to load mjs instead of ts
+
+## 1.10.23
+
+### Patch Changes
+
+- 🐛 [`61ae404`](https://github.com/geekmidas/toolbox/commit/61ae404061a1061c4a724d0f187764475903b625) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix tsx import
+
 ## 1.10.22
 
 ### Patch Changes

package/bin/gkm.mjs

@@ -9,15 +9,24 @@ import { pathToFileURL } from 'node:url';
 const nodeOptions = process.env.NODE_OPTIONS || '';
 if (
 	!nodeOptions.includes('--import tsx') &&
-	!nodeOptions.includes('--import=tsx')
+	!nodeOptions.includes('--import=tsx') &&
+	!nodeOptions.includes('--import file:') &&
+	!nodeOptions.includes('--import=file:')
 ) {
+	// Resolve tsx from the CLI package's own node_modules, not the cwd.
+	// This ensures it works when the CLI is run via `pnpm dlx` in a
+	// directory that doesn't have tsx installed.
+	const { createRequire } = await import('node:module');
+	const require = createRequire(import.meta.url);
+	const tsxPath = pathToFileURL(require.resolve('tsx')).href;
+
 	const { execFileSync } = await import('node:child_process');
 	try {
 		execFileSync(process.execPath, process.argv.slice(1), {
 			stdio: 'inherit',
 			env: {
 				...process.env,
-				NODE_OPTIONS: `${nodeOptions} --import tsx`.trim(),
+				NODE_OPTIONS: `${nodeOptions} --import ${tsxPath}`.trim(),
 			},
 		});
 	} catch (e) {

package/dist/index.cjs

@@ -35,7 +35,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.21";
+var version = "1.10.23";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1113,20 +1113,14 @@ async function execCommand(commandArgs, options = {}) {
 	if (secretCount > 0) logger$12.log(`🔐 Loaded ${secretCount} secret(s)`);
 	const preloadDir = (0, node_path.join)(cwd, ".gkm");
 	await (0, node_fs_promises.mkdir)(preloadDir, { recursive: true });
-	const preloadPath = (0, node_path.join)(preloadDir, "credentials-preload.ts");
+	const preloadPath = (0, node_path.join)(preloadDir, "credentials-preload.mjs");
 	await createCredentialsPreload(preloadPath, secretsJsonPath);
-	const [cmd, ...rawArgs] = commandArgs;
+	const [cmd, ...args] = commandArgs;
 	if (!cmd) throw new Error("No command specified");
-	const args = rawArgs.map((arg) => arg.replace(/\$PORT\b/g, credentials.PORT ?? "3000"));
 	logger$12.log(`🚀 Running: ${[cmd, ...args].join(" ")}`);
 	const existingNodeOptions = process.env.NODE_OPTIONS ?? "";
-	const tsxImport = "--import=tsx";
 	const preloadImport = `--import=${preloadPath}`;
-	const nodeOptions = [
-		existingNodeOptions,
-		tsxImport,
-		preloadImport
-	].filter(Boolean).join(" ");
+	const nodeOptions = [existingNodeOptions, preloadImport].filter(Boolean).join(" ");
 	const child = (0, node_child_process.spawn)(cmd, args, {
 		cwd,
 		stdio: "inherit",
@@ -6845,9 +6839,9 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/audit": "~2.0.0",
 	"@geekmidas/auth": "~2.0.0",
 	"@geekmidas/cache": "~1.1.0",
-	"@geekmidas/client": "~4.0.1",
+	"@geekmidas/client": "~4.0.4",
 	"@geekmidas/cloud": "~1.0.0",
-	"@geekmidas/constructs": "~3.0.3",
+	"@geekmidas/constructs": "~3.0.5",
 	"@geekmidas/db": "~1.0.1",
 	"@geekmidas/emailkit": "~1.0.0",
 	"@geekmidas/envkit": "~1.0.4",
@@ -10740,7 +10734,7 @@ function generateWebAppFiles(options) {
 		private: true,
 		type: "module",
 		scripts: {
-			dev: "gkm exec -- next dev --turbopack -p $PORT",
+			dev: "gkm exec -- next dev --turbopack",
 			build: "gkm exec -- next build",
 			start: "next start",
 			typecheck: "tsc --noEmit"