rajt 0.0.104 → 0.0.105

package/bin/rajt.js

@@ -51,20 +51,23 @@ Consider using a Node.js version manager such as https://volta.sh or https://git
 }
 
 function findTsx() {
-  const relativePaths = [
-    join(__dirname, '../node_modules/tsx/dist/cli.mjs'),
-    join(process.cwd(), 'node_modules/tsx/dist/cli.mjs'),
-    join(__dirname, '../node_modules/.bin/tsx'),
-    join(process.cwd(), 'node_modules/.bin/tsx'),
+  const exts = ['', '.exe', '.cmd'];
+  const paths = [
+    [_root, '../node_modules/tsx/dist/cli.mjs'],
+    [process.cwd(), 'node_modules/tsx/dist/cli.mjs'],
+    [_root, '../node_modules/.bin/tsx'],
+    [process.cwd(), 'node_modules/.bin/tsx'],
   ];
 
-  for (const p of relativePaths) {
-    if (existsSync(p)) return p;
-    if (existsSync(`${p}.exe`)) return `${p}.exe`;
-    if (existsSync(`${p}.cmd`)) return `${p}.cmd`;
+  for (const _path of paths) {
+    const path = join(..._path);
+    for (const ext of exts) {
+      const entry = path + ext;
+      if (existsSync(entry)) return entry;
+    }
   }
 
-  return null
+  return ''
 }
 
 function execute(command, args) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "type": "module",
   "main": "./src/index.ts",
   "files": ["bin", "src"],

package/src/cli/commands/dev.ts

@@ -7,7 +7,8 @@ import type { WranglerConfig } from 'localflare-core'
 import {
 	build, wait, watch, normalizePlatform, platformError, getRuntime,
 	wranglerConfig, createMiniflare, localflareManifest,
-	getDockerHost
+	getDockerHost,
+  findTsx
 } from '../utils'
 import { error, event, log, rn, warn } from '../../utils/log'
 import { _root } from '../../utils/paths'
@@ -201,12 +202,23 @@ export default defineCommand({
 			default:
 			case 'node':
 				return withPort(desiredPort, async (port) => {
-					started(port)
 					const isBun = getRuntime() === 'bun'
-					const isWin32 = process.platform === 'win32'
+          const isWin32 = process.platform === 'win32'
+
+          const _arg = isBun ? 'run' : findTsx()
+
+					if (!_arg) {
+						console.error('Error: "tsx" is not available. Please install tsx:')
+						console.error('  npm i -D tsx')
+						console.error('  or')
+						console.error('  bun i -D tsx')
+						process.exit(1)
+					}
+
+					started(port)
 					const params = isBun
-						? ['run', '--port=' + port, '--hot', '--silent', '--no-clear-screen', '--no-summary', join(_root, 'node_modules/rajt/src/dev.ts')]
-						: [join(_root, 'node_modules/.bin/tsx' + (isWin32 ? '.exe' : '')), 'watch', join(_root, 'node_modules/rajt/src/dev-node.ts')]
+						? ['--port=' + port, '--hot', '--silent', '--no-clear-screen', '--no-summary']
+						: ['watch']
 
 					let nodeApp: ChildProcess | null = null
 					const stopNode = async () => {
@@ -218,7 +230,7 @@ export default defineCommand({
 
 						nodeApp = spawn(
 							isBun && isWin32 ? 'bun' : process.execPath,
-							params,
+							[_arg, ...params, join(_root, `node_modules/rajt/src/dev${isBun ? '' : '-node'}.ts`)],
 							{
 								stdio: ['inherit', isBun ? 'pipe' : 'inherit', 'inherit', 'ipc'],
 								env: {...process.env, PORT: port},

package/src/cli/utils.ts

@@ -142,7 +142,7 @@ export const build = async (platform: Platform, env: string = 'prd') => {
   const opts = {
     entryPoints: [join(_rajt, `prod${platform}.ts`)],
     bundle: true,
-    minify: false,
+    minify: true,
     outfile: join(_root, dist +'/index.js'),
     format: 'esm',
     target: isCF ? 'es2022' : 'node20',
@@ -548,3 +548,23 @@ export const highlightedURI = (uri: string, method: string) => uri.replace(
   /(?::([a-zA-Z_][a-zA-Z0-9_]*)(\{[^}]+\})?|\*)/g,
   _ => highlightedMethod(method, _)
 )
+
+export function findTsx() {
+  const exts = ['', '.exe', '.cmd']
+  const paths = [
+    [_root, '../node_modules/tsx/dist/cli.mjs'],
+    [process.cwd(), 'node_modules/tsx/dist/cli.mjs'],
+    [_root, '../node_modules/.bin/tsx'],
+    [process.cwd(), 'node_modules/.bin/tsx'],
+  ] as const
+
+  for (const _path of paths) {
+    const path = join(..._path)
+    for (const ext of exts) {
+      const entry = path + ext
+      if (existsSync(entry)) return entry
+    }
+  }
+
+  return ''
+}