@nativescript/cloudflare-cli 0.1.0-beta.6 → 0.1.0-beta.8

package/README.md

@@ -2,11 +2,12 @@
 
 ```sh
 npx @nativescript/cloudflare-cli live          # a phone app: opens the IDE and prints a QR code for NativeScript Preview
+npx @nativescript/cloudflare-cli live --react  # the same with a framework: --ng (Angular), --react, --vue, --svelte or --solid
 npx @nativescript/cloudflare-cli live --mac    # a Mac app: opens the IDE and runs the app on this Mac, streamed into the IDE
 npx @nativescript/cloudflare-cli live --electron   # an Electron app with native views, run the same way
 ```
 
-`live` creates a project on preview.nativescript.org (`--server` or `NS_EDGE_SERVER` for another edge), saves it to `.ns-edge.json` and opens its IDE. Run it again in the same folder to reopen that project (no platform flag needed), or add `--new` for another. While `live` runs a Mac app it restarts the app if it crashes, unless it crashes three times in a minute. Without a create token the project is free: a few hosted agent turns a day, no backend, deleted after 30 days unused. `--no-open` skips the browser; with `--mac` or `--electron`, `--allow-eval` lets the agent run code on this Mac.
+`live` creates a project on preview.nativescript.org (`--server` or `NS_EDGE_SERVER` for another edge), saves it to `.ns-edge.json` and opens its IDE. The framework flags are `ns create`'s (`--ng`/`--angular`, `--react`, `--vue`, `--svelte`, `--solid`, `--ts`); without one a phone project is plain TypeScript with XML views. Run it again in the same folder to reopen that project (no flag needed), or add `--new` for another; a flag for a different kind of project than the folder's asks for `--new`. While `live` runs a Mac app it restarts the app if it crashes, unless it crashes three times in a minute. Without a create token the project is free: a few hosted agent turns a day, no backend, deleted after 30 days unused. `--no-open` skips the browser; with `--mac` or `--electron`, `--allow-eval` lets the agent run code on this Mac.
 
 ## Mirror a local project
 

package/dist/bin.js

@@ -9,12 +9,34 @@ import { applyChanges, collect, createProject, projectUrl, report, SYNCED } from
 const CONFIG = '.ns-edge.json';
 const DEBOUNCE_MS = 120;
 const LIVE_SERVER = process.env.NS_EDGE_SERVER ?? 'https://preview.nativescript.org';
-/** The hosts `live --mac` and `live --electron` run; bump them with each host release this CLI is tested against. */
+/** The hosts `live --mac`, `--electron` and `--expo` run; bump them with each host release this CLI is tested against. */
 const DESKTOP_HOSTS = {
-    macos: '@nativescript/cloudflare-desktop@0.1.0-alpha.5',
-    electron: '@nativescript/cloudflare-electron@0.1.0-alpha.2',
+    macos: { spec: '@nativescript/cloudflare-desktop@0.1.0-alpha.5', bin: 'ns-edge-desktop' },
+    electron: { spec: '@nativescript/cloudflare-electron@0.1.0-alpha.2', bin: 'ns-edge-electron' },
+    expo: { spec: '@nativescript/cloudflare-expo-desktop@0.1.0-alpha.0', bin: 'ns-edge-expo-desktop' },
+};
+const DESKTOP_TEMPLATES = new Set(['macos', 'electron', 'expo']);
+const DESKTOP_FLAGS = { macos: 'mac', electron: 'electron', expo: 'expo' };
+/** The NativeScript CLI's `ns create` framework flags, so `live` and `create` take the same ones. */
+const FRAMEWORK_FLAGS = {
+    angular: ['ng', 'angular'],
+    react: ['react', 'reactjs'],
+    vue: ['vue', 'vuejs'],
+    svelte: ['svelte'],
+    solid: ['solid', 'solidjs'],
+    core: ['ts', 'tsc', 'typescript'],
+};
+const TEMPLATE_KINDS = {
+    core: 'a phone',
+    angular: 'an Angular phone',
+    react: 'a React phone',
+    vue: 'a Vue phone',
+    svelte: 'a Svelte phone',
+    solid: 'a Solid phone',
+    macos: 'a Mac',
+    electron: 'an Electron',
+    expo: 'an Expo Desktop',
 };
-const DESKTOP_TEMPLATES = new Set(['macos', 'electron']);
 const MAX_CRASHES = 3;
 const CRASH_WINDOW_MS = 60_000;
 const RESTART_DELAY_MS = 1000;
@@ -30,6 +52,22 @@ const flag = (name) => {
     return i >= 0 ? args[i + 1] : undefined;
 };
 const has = (name) => args.includes(`--${name}`);
+/** The template --template, a framework flag or a desktop flag asks for, if any; asking for two is an error. */
+function requestedTemplate() {
+    const asked = new Set();
+    const named = flag('template');
+    if (named)
+        asked.add(named);
+    for (const [template, names] of Object.entries(FRAMEWORK_FLAGS))
+        if (names.some((name) => has(name)))
+            asked.add(template);
+    for (const [template, name] of Object.entries(DESKTOP_FLAGS))
+        if (has(name))
+            asked.add(template);
+    if (asked.size > 1)
+        throw new Error(`Pick one kind of project: this asked for ${[...asked].join(' and ')}.`);
+    return [...asked][0];
+}
 const root = process.cwd();
 async function loadRef() {
     let ref;
@@ -90,6 +128,8 @@ async function runDesktopHost(ref) {
     const device = `${projectUrl(ref)}#${ref.deviceKey}`;
     const extra = has('allow-eval') ? ['--allow-eval'] : [];
     const host = DESKTOP_HOSTS[ref.template ?? 'macos'] ?? DESKTOP_HOSTS.macos;
+    // NS_EDGE_HOST runs another spec of the host (a version, or file:<packed .tgz>) to test a release before publishing it.
+    const spec = process.env.NS_EDGE_HOST ?? host.spec;
     let child;
     let stopping = false;
     for (const signal of ['SIGINT', 'SIGTERM']) {
@@ -100,7 +140,7 @@ async function runDesktopHost(ref) {
     }
     const crashes = [];
     for (;;) {
-        child = spawn('npx', ['-y', host, device, '--yes', ...extra], { stdio: 'inherit' });
+        child = spawn('npx', ['-y', '--package', spec, '--', host.bin, device, '--yes', ...extra], { stdio: 'inherit' });
         const exit = await new Promise((resolve, reject) => {
             child.on('error', reject);
             child.on('exit', (code, signal) => resolve({ code, signal }));
@@ -123,17 +163,16 @@ const commands = {
     async live() {
         for (const later of ['ios', 'android', 'all']) {
             if (has(later))
-                throw new Error(`--${later} isn't available yet. Run \`live\` for a phone app or \`live --mac\` for a Mac app.`);
+                throw new Error(`--${later} isn't available yet. Run \`live\` for a phone app, or \`live --mac\`, \`--electron\` or \`--expo\` for a Mac app.`);
         }
         let ref = has('new') ? null : await savedProject();
-        // Without a platform flag, this folder's project runs as whatever it was made as.
-        const template = flag('template') ?? (has('electron') ? 'electron' : has('mac') ? 'macos' : (ref?.template ?? 'core'));
+        const requested = requestedTemplate();
+        // Without a template flag, this folder's project runs as whatever it was made as.
+        const template = requested ?? ref?.template ?? 'core';
         const desktop = DESKTOP_TEMPLATES.has(template);
-        if (ref && DESKTOP_TEMPLATES.has(ref.template ?? 'core') !== desktop) {
-            throw new Error(`This folder's project (${CONFIG}) is a ${desktop ? 'phone' : 'Mac'} project. Add --new to replace it, or run this in another folder.`);
-        }
-        if (ref && desktop && ref.template !== template) {
-            throw new Error(`This folder's project (${CONFIG}) is a ${ref.template} project. Add --new to replace it, or run this in another folder.`);
+        if (ref && requested && (ref.template ?? 'core') !== requested) {
+            const current = TEMPLATE_KINDS[ref.template ?? 'core'] ?? `a ${ref.template}`;
+            throw new Error(`This folder's project (${CONFIG}) is ${current} project. Add --new to start ${TEMPLATE_KINDS[requested] ?? `a ${requested}`} one, or run this in another folder.`);
         }
         if (ref) {
             console.log(`Opening this folder's project ${ref.id} (${CONFIG})`);
@@ -141,7 +180,7 @@ const commands = {
         else {
             ref = await createProject(flag('server') ?? LIVE_SERVER, flag('token') ?? process.env.NS_EDGE_CREATE_TOKEN, template);
             await writeFile(join(root, CONFIG), JSON.stringify(ref, null, 2) + '\n');
-            console.log(`Created ${template === 'electron' ? 'an Electron' : desktop ? 'a Mac' : 'a phone'} project, saved to ${CONFIG} (it holds the project's keys: keep it private and out of git).`);
+            console.log(`Created ${TEMPLATE_KINDS[template] ?? `a ${template}`} project, saved to ${CONFIG} (it holds the project's keys: keep it private and out of git).`);
             if (ref.free) {
                 console.log(`It's a free project: ${ref.free.agentTurnsPerDay} hosted agent turn${ref.free.agentTurnsPerDay === 1 ? '' : 's'} a day, deleted after ${ref.free.idleDays} days unused. ` +
                     'For an unlimited agent, add your own API key in the agent panel or connect Claude Code from Connect agent.');
@@ -152,7 +191,8 @@ const commands = {
         if (!has('no-open'))
             openInBrowser(ide);
         if (desktop) {
-            console.log(`Starting the app on this Mac${template === 'electron' ? ' (the first run downloads Electron)' : ''}. Its window streams to the IDE's Device pane. Press Ctrl+C to stop.\n`);
+            const first = template === 'electron' ? ' (the first run downloads Electron)' : template === 'expo' ? ' (the first run downloads the Expo Desktop shell)' : '';
+            console.log(`Starting the app on this Mac${first}. Its window streams to the IDE's Device pane. Press Ctrl+C to stop.\n`);
             return runDesktopHost(ref);
         }
         const device = `${projectUrl(ref)}#${ref.deviceKey}`;
@@ -162,7 +202,7 @@ const commands = {
     },
     async create() {
         const server = flag('server') ?? 'http://localhost:5173';
-        const ref = await createProject(server, flag('token') ?? process.env.NS_EDGE_CREATE_TOKEN, flag('template'));
+        const ref = await createProject(server, flag('token') ?? process.env.NS_EDGE_CREATE_TOKEN, requestedTemplate());
         await writeFile(join(root, CONFIG), JSON.stringify(ref, null, 2) + '\n');
         console.log(`Created project ${ref.id} (saved to ${CONFIG}; it holds the project keys, keep it out of git)`);
         await printPairing(ref);
@@ -232,10 +272,12 @@ const commands = {
     async help() {
         console.log(`ns-edge <command>
 
-  live [--mac|--electron] [--new] [--no-open] [--allow-eval]
+  live [--ng|--react|--vue|--svelte|--solid|--mac|--electron|--expo] [--new] [--no-open] [--allow-eval]
                             create a project (or reopen this folder's), open its IDE, and print a QR code
-                            for your phone; --mac or --electron runs it on this Mac instead
-  create [--server <url>] [--token <t>] [--template core|vue|react|solid|svelte|angular]
+                            for your phone; --ng, --react, --vue, --svelte or --solid picks the framework
+                            (plain TypeScript with XML views otherwise); --mac, --electron or --expo runs it
+                            on this Mac instead
+  create [--server <url>] [--token <t>] [--ng|--react|--vue|--svelte|--solid|--template <name>]
                             create an edge project and save .ns-edge.json
   push                      upload app/ and server/ in one transaction
   watch                     push, then stream every save to the edge

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/cloudflare-cli",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.8",
   "description": "Mirror a NativeScript project into an ns-edge project from a terminal or a Vite dev server",
   "license": "Apache-2.0",
   "type": "module",