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

package/dist/bin.js

@@ -9,12 +9,14 @@ 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']);
+const DESKTOP_TEMPLATES = new Set(['macos', 'electron', 'expo']);
+const DESKTOP_FLAGS = { macos: 'mac', electron: 'electron', expo: 'expo' };
 const MAX_CRASHES = 3;
 const CRASH_WINDOW_MS = 60_000;
 const RESTART_DELAY_MS = 1000;
@@ -90,6 +92,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 +104,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,11 +127,11 @@ 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 template = flag('template') ?? Object.entries(DESKTOP_FLAGS).find(([, name]) => has(name))?.[0] ?? 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.`);
@@ -141,7 +145,8 @@ 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).`);
+            const kind = template === 'electron' ? 'an Electron' : template === 'expo' ? 'an Expo Desktop' : desktop ? 'a Mac' : 'a phone';
+            console.log(`Created ${kind} 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 +157,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}`;
@@ -232,9 +238,9 @@ const commands = {
     async help() {
         console.log(`ns-edge <command>
 
-  live [--mac|--electron] [--new] [--no-open] [--allow-eval]
+  live [--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
+                            for your phone; --mac, --electron or --expo runs it on this Mac instead
   create [--server <url>] [--token <t>] [--template core|vue|react|solid|svelte|angular]
                             create an edge project and save .ns-edge.json
   push                      upload app/ and server/ in one transaction

package/package.json

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