sitevision-cli 1.0.0-beta.12 → 1.0.0-beta.14

package/dist/cli.js

@@ -1,22 +1,24 @@
 #!/usr/bin/env node
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink';
 import { Text, Box } from 'ink';
 import meow from 'meow';
 import { readFileSync } from 'node:fs';
-import App from './app.js';
+import { Shell } from './shell/Shell.js';
 import { getCommand } from './commands/index.js';
-import { requireProject, migrateLegacyPassword, } from './utils/project-detection.js';
+import { requireProject, detectProject, migrateLegacyPassword, } from './utils/project-detection.js';
+import { discoverApps } from './utils/workspace.js';
 import { promptYesNo } from './utils/password-prompt.js';
 import { checkForUpdate } from './utils/version-check.js';
-import { isFirstRun, markFirstRunComplete, getLastSeenVersion, setLastSeenVersion, } from './utils/config.js';
+import { isFirstRun, markFirstRunComplete, getLastSeenVersion, setLastSeenVersion, getSettings, } from './utils/config.js';
+import { setLanguage } from './utils/i18n.js';
 import { WelcomeScreen } from './components/WelcomeScreen.js';
 import { AnimatedLogo } from './components/AnimatedLogo.js';
 import { printBranding, BIG_LOGO, BIG_LOGO_WIDTH, SMALL_LOGO, SMALL_LOGO_WIDTH, } from './utils/branding.js';
 const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 const cli = meow(`
 	Usage
-	  $ svc                    Start interactive menu
+	  $ svc                    Open the interactive shell (app or workspace)
 	  $ svc <command> [options]
 
 	Commands
@@ -32,7 +34,7 @@ const cli = meow(`
 	  --version     Show version number
 
 	Examples
-	  $ svc                     # Interactive menu
+	  $ svc                     # Shell: run inside an app, or at the repo root
 	  $ svc dev
 	  $ svc dev --signed
 	  $ svc watch
@@ -67,6 +69,8 @@ const cli = meow(`
     },
 });
 const [commandName, ...args] = cli.input;
+const settings = getSettings();
+setLanguage(settings.language);
 const CYAN = '\x1b[36m';
 const BOLD = '\x1b[1m';
 const DIM = '\x1b[2m';
@@ -95,8 +99,12 @@ function printMasthead(version) {
         `${spaces(gap)}${DIM}${right}${RESET}${spaces(padding)}${CYAN}│${RESET}`);
     console.log(`${CYAN}╰${border}╯${RESET}`);
 }
+function fail(message, hint) {
+    render(_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Text, { color: "red", children: ["Error: ", message] }), _jsx(Text, { dimColor: true, children: hint })] }));
+    process.exit(1);
+}
 // Pick the widest wordmark that fits the terminal, or undefined if even the
-// compact one would wrap (caller then falls back to the static masthead).
+// compact one would wrap.
 function pickIntroArt(columns) {
     if (columns >= BIG_LOGO_WIDTH)
         return BIG_LOGO;
@@ -111,6 +119,26 @@ async function playIntro(art) {
         app.waitUntilExit().then(() => resolve(), () => resolve());
     });
 }
+// Run the full-screen shell on the alternate screen buffer so the scrollback
+// is untouched, and restore it on exit. The animated wordmark plays first,
+// inside the same buffer, when the terminal is wide enough for it.
+async function runShell(apps, workspaceRoot) {
+    process.stdout.write('\x1b[?1049h\x1b[H');
+    try {
+        const art = process.stdin.isTTY && settings.introAnimation
+            ? pickIntroArt(process.stdout.columns ?? 0)
+            : undefined;
+        if (art) {
+            await playIntro(art);
+            process.stdout.write('\x1b[2J\x1b[H');
+        }
+        const app = render(_jsx(Shell, { apps: apps, workspaceRoot: workspaceRoot, version: pkg.version }));
+        await app.waitUntilExit();
+    }
+    finally {
+        process.stdout.write('\x1b[?1049l');
+    }
+}
 async function main() {
     // On the very first run we show a dedicated welcome screen instead of the
     // masthead, so the branding is the moment. Only when stdin is a TTY — the
@@ -122,19 +150,12 @@ async function main() {
     // silently rather than claiming an update happened.
     const lastSeen = getLastSeenVersion();
     const isUpdate = !firstRun && lastSeen !== undefined && lastSeen !== pkg.version;
-    // On the plain interactive `svc` (no command), play the animated wordmark
-    // instead of the static masthead — sized to the terminal. Only on a TTY so it
-    // doesn't run in CI / piped input.
-    const introEligible = !firstRun && !isUpdate && !commandName && Boolean(process.stdin.isTTY);
-    const introArt = introEligible
-        ? pickIntroArt(process.stdout.columns ?? 0)
-        : undefined;
     if (!firstRun) {
         if (isUpdate) {
             printBranding();
             console.log(`\x1b[32m\n  ✨ Updated to v${pkg.version}\x1b[0m \x1b[2m(from v${lastSeen})\x1b[0m\n`);
         }
-        else if (!introArt) {
+        else if (commandName) {
             printMasthead(pkg.version);
         }
         // Record the current version so the banner shows once per upgrade.
@@ -145,14 +166,44 @@ async function main() {
             console.log(`\x1b[33m  ↑ update available: ${pkg.version} → ${latestVersion}  (run: npm i -g ${pkg.name})\x1b[0m`);
         }
     }
+    // No command: the shell. Inside an app it is single-app mode; anywhere
+    // above one or more apps it is workspace mode.
+    if (!commandName) {
+        let project = null;
+        try {
+            project = detectProject();
+        }
+        catch (error) {
+            fail(error.message, 'Fix the manifest and try again');
+        }
+        if (!project) {
+            const apps = discoverApps(process.cwd());
+            if (apps.length === 0) {
+                fail('No Sitevision apps found here.', 'Run svc inside an app directory (manifest.json) or at the root of a repo that contains apps.');
+            }
+            await runShell(apps, process.cwd());
+            return;
+        }
+        if (firstRun) {
+            await new Promise(resolve => {
+                const app = render(_jsx(WelcomeScreen, { project: project, onComplete: () => {
+                        markFirstRunComplete();
+                        setLastSeenVersion(pkg.version);
+                        app.unmount();
+                    } }));
+                app.waitUntilExit().then(() => resolve(), () => resolve());
+            });
+        }
+        await runShell([project]);
+        return;
+    }
     // Check if we're in a Sitevision project
     const project = (() => {
         try {
             return requireProject();
         }
         catch (error) {
-            render(_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Text, { color: "red", children: ["Error: ", error.message] }), _jsx(Text, { dimColor: true, children: "Make sure you're in a Sitevision project directory" })] }));
-            process.exit(1);
+            return fail(error.message, "Make sure you're in a Sitevision project directory");
         }
     })();
     // --token / --cookie override the resolved bearer token / session cookie for
@@ -171,27 +222,6 @@ async function main() {
             console.log('\x1b[33m--token/--cookie needs a .dev_properties.json (domain, site, addon) to deploy against.\x1b[0m');
         }
     }
-    // First run: show the welcome (branding + optional signing-password save),
-    // then continue to the normal flow once the user dismisses it.
-    if (firstRun) {
-        await new Promise(resolve => {
-            const app = render(_jsx(WelcomeScreen, { project: project, onComplete: () => {
-                    markFirstRunComplete();
-                    setLastSeenVersion(pkg.version);
-                    app.unmount();
-                } }));
-            app.waitUntilExit().then(() => resolve(), () => resolve());
-        });
-    }
-    // If no command, show interactive menu (with the animated intro first when
-    // the terminal can fit it).
-    if (!commandName) {
-        if (introArt) {
-            await playIntro(introArt);
-        }
-        render(_jsx(App, { project: project }));
-        return;
-    }
     // Get the command
     const command = getCommand(commandName);
     if (!command) {
@@ -199,9 +229,8 @@ async function main() {
         process.exit(1);
     }
     // Offer to migrate a legacy plaintext password into the OS keychain.
-    // Interactive `svc` handles this in SetupFlow; this covers direct commands
-    // (svc deploy/dev/sign/…). Skip on non-TTY stdin (e.g. CI) where prompting
-    // would fail — the plaintext password is still used for this run.
+    // Skip on non-TTY stdin (e.g. CI) where prompting would fail — the
+    // plaintext password is still used for this run.
     if (project.hasLegacyPassword && process.stdin.isTTY) {
         console.log('\n\x1b[33m⚠ Plaintext password found in .dev_properties.json\x1b[0m');
         const move = await promptYesNo('Move it to the OS keychain and remove it from the file? (y/N): ');

package/dist/commands/build.js

@@ -87,7 +87,7 @@ export function BuildScreen({ projectRoot, manifest, createZip = true, onBack, }
                     const runner = new WebpackRunner(projectRoot, {
                         mode: 'production',
                         cssPrefix: manifest.id,
-                        restApp: appType === 'rest',
+                        restApp: appType !== 'web' && appType !== 'widget',
                     });
                     const result = await runner.run();
                     await runner.close();

package/dist/commands/dev.d.ts

@@ -1,16 +1,14 @@
 import React from 'react';
 import { type Command } from './types.js';
-import type { SitevisionManifest, DevProperties, SigningCredentials } from '../types/index.js';
+import { type DevOptions } from '../utils/tasks.js';
+import type { ProjectInfo, SigningCredentials } from '../types/index.js';
 interface DevScreenProps {
-    projectRoot: string;
-    manifest: SitevisionManifest;
-    devProperties?: DevProperties;
-    signed: boolean;
-    deploy?: boolean;
-    signingCredentials?: SigningCredentials;
-    onBack?: () => void;
-    onRetryCredentials?: () => void;
+    project: ProjectInfo;
+    options: DevOptions;
 }
-export declare function DevScreen({ projectRoot, manifest, devProperties, signed, deploy, signingCredentials, onBack, onRetryCredentials, }: DevScreenProps): React.JSX.Element;
+/** Standalone `svc dev` / `svc watch`: one task, its log, Ctrl+C or q to stop. */
+export declare function DevScreen({ project, options }: DevScreenProps): React.JSX.Element;
+/** Resolve signing credentials for signed dev/watch, prompting if needed. */
+export declare function resolveSigningForCli(project: ProjectInfo): Promise<SigningCredentials | undefined>;
 export declare const devCommand: Command;
 export {};