@solidrt/cli 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidrt/cli",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "MIT",
   "author": "Antoine van Wel",
   "type": "module",
@@ -19,12 +19,12 @@
     "qrcode-generator": "^2.0.4"
   },
   "optionalDependencies": {
-    "@solidrt/darwin-arm64": "0.0.7",
-    "@solidrt/linux-x64-gnu": "0.0.7",
-    "@solidrt/win32-x64-msvc": "0.0.7"
+    "@solidrt/darwin-arm64": "0.0.8",
+    "@solidrt/linux-x64-gnu": "0.0.8",
+    "@solidrt/win32-x64-msvc": "0.0.8"
   },
   "peerDependencies": {
-    "@solidrt/core": "0.0.7",
+    "@solidrt/core": "0.0.8",
     "typescript": "^5"
   },
   "devDependencies": {

package/src/args.ts

@@ -20,16 +20,17 @@ export let command = positionals[0]
 export let source = positionals[1]
 export let isTsx = source?.endsWith(".tsx") || source?.endsWith(".jsx")
 export let isTs = source?.endsWith(".ts") || source?.endsWith(".js")
+export let isSource = isTsx || isTs
 export let isPrebuilt = source?.endsWith(".srt.js") || source?.endsWith(".srt.bin")
 
 export function printUsage() {
   console.error(`Usage: srt <command> [options] [file]
 
 Commands:
-  run [file.tsx|jsx]     Start dev server + local solidrt-go client
-  server [file.tsx|jsx]  Start dev server only
+  run [file]             Start dev server + local solidrt-go client
+  server [file]          Start dev server only
   client                 Start solidrt-go client only
-  bundle <file.tsx|jsx>  Transpile TSX/JSX to JS or bytecode
+  bundle <file>          Transpile TS/JS/TSX/JSX to JS or bytecode
   record <file.tsx|jsx>  Capture frames for video generation
   pack <file.ts|js>      Bundle + compile to a standalone executable (experimental, Flux only)
 

package/src/bundle.ts

@@ -20,7 +20,7 @@ export async function bundle(entry = source) {
       target: "browser",
       format: "esm",
       minify: values.minify,
-      external: ["qjs:*", "flux:*"],
+      external: ["flux:*"],
       define,
       plugins: [solidPlugin()],
     })
@@ -86,7 +86,7 @@ export async function runBundleCommand() {
     process.exit()
   }
 
-  let baseName = values.output ?? source!.replace(/\.[jt]sx$/, "")
+  let baseName = values.output ?? source!.replace(/\.[jt]sx?$/, "")
 
   if (values.stdout) {
     let result = await bundle()

package/src/main.ts

@@ -13,7 +13,7 @@
 //   srt record examples/hello.tsx       - bundle TSX and run with frame capture
 
 import pkg from "../package.json"
-import { values, command, source, isTsx, isTs, isPrebuilt, printUsage } from "./args"
+import { values, command, source, isTsx, isTs, isSource, isPrebuilt, printUsage } from "./args"
 import { state, requireBinary, run, shutdown } from "./util"
 import { bundle, bundleTo, runBundleCommand } from "./bundle"
 import { runPackCommand } from "./pack"
@@ -33,8 +33,8 @@ if (!command || !COMMANDS.includes(command)) {
   process.exit(1)
 }
 
-if (command === "bundle" && (!source || (!isTsx && !isPrebuilt))) {
-  console.error("Usage: srt bundle [options] <entry.[tsx|jsx|srt.js|srt.bin]>")
+if (command === "bundle" && (!source || (!isSource && !isPrebuilt))) {
+  console.error("Usage: srt bundle [options] <entry.[tsx|jsx|ts|js|srt.js|srt.bin]>")
   process.exit(1)
 }
 
@@ -120,7 +120,7 @@ startServer()
 
 // Bundle initial code if source file given (after server start so the
 // dev base URL is available to the bundler).
-if (source && isTsx) {
+if (source && isSource) {
   let initialResult = await bundle()
   if (initialResult) {
     for (let output of initialResult.outputs) {

package/src/pack.ts

@@ -9,7 +9,7 @@ async function bundleFlux(entry: string): Promise<string> {
     target: "browser",
     format: "esm",
     minify: values.minify,
-    external: ["qjs:*", "flux:*"],
+    external: ["flux:*"],
   })
   if (!result.success) {
     for (let msg of result.logs) console.error(msg)