sitevision-cli 1.0.1 → 1.1.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 1.1.0-beta.0
+
+- Production deploys ask whether to activate the new version or only upload
+  it. Press `p` or `P` on a production environment and pick; Esc cancels.
+- Production deploys no longer overwrite an existing version on their own.
+  `P` in the shell and `--force` on the command line do that, as on dev.
+- `svc deploy --activate` works with any deploy, not only `--production`.
+- Dev (`d`) runs on a production environment. It needs signing credentials
+  and asks for confirmation before it starts, then signs and deploys every
+  build. `svc dev` needs `--signed` on a production base and asks the same.
+- The Production help text in the Config tab and both user guides describe
+  the new behaviour.
+
+## 1.0.2
+
+- Workspace settings can switch environment again. Press `v` in the settings
+  pane to cycle the workspace's environments; the pane now cycles the ones
+  defined in the workspace's root file, so an environment that only exists
+  in one app can no longer become a root override.
+- Adding an environment in a workspace checks the name against the file
+  being written, not the current app, so a name that clashes with the
+  workspace's base environment is rejected there too.
+
 ## 1.0.1
 
 - The "what's new" panel shown after an update now lists the earlier releases

package/dist/cli.js

@@ -39,7 +39,7 @@ const cli = meow(`
 	  --signed, -s      dev/watch: sign after each build
 	  --force, -f       deploy: overwrite the existing addon version
 	  --production, -p  deploy: upload the signed zip to production
-	  --activate, -a    deploy: activate after a production deploy
+	  --activate, -a    deploy: activate the uploaded version
 	  --no-zip          build: skip the zip archive
 	  --global          setup-signing: save for every project on this machine
 	  --minimal         Shell: compact layout for small terminals

package/dist/commands/dev.js

@@ -96,6 +96,18 @@ export const devCommand = {
             process.exitCode = 1;
             return;
         }
+        if (dev.production) {
+            if (!flags['signed']) {
+                say('\n\x1b[31mThe base environment is production, which only takes the signed zip. Run `svc dev --signed`.\x1b[0m\n');
+                process.exitCode = 1;
+                return;
+            }
+            const go = await promptYesNo(`\x1b[31m${dev.domain} is PRODUCTION.\x1b[0m Dev will sign and deploy every build of ${project.manifest.id} there (addon ${dev.addonName}). Start it? (y/N): `);
+            if (!go) {
+                process.exitCode = 1;
+                return;
+            }
+        }
         if (!(await resolveDeployPasswordForCli(dev)))
             return;
         let signingCredentials;

package/dist/shell/ConfigForm.js

@@ -109,7 +109,7 @@ const FIELDS = [
         label: 'Production',
         kind: 'bool',
         section: 'ENVIRONMENT',
-        help: 'Treat deploys to this base environment as production: signed zip, confirmation, activation, and no dev loop. Off by default even when the name says prod, so a repo with only a production site still gets a dev loop.',
+        help: 'Treat this base environment as production: deploys use the signed zip, ask for confirmation and offer activation, and dev confirms before it starts. Off by default even when the name says prod.',
     },
     {
         key: 'signingUsername',

package/dist/shell/Help.js

@@ -40,7 +40,7 @@ const GUIDE = {
         title: 'Versions',
         text: [
             "The versions uploaded to the addon on the active environment's site, the domain in the top bar. v switches environment.",
-            '↑↓ select, a activates the selected version, r refreshes. Production deploys activate on their own.',
+            '↑↓ select, a activates the selected version, r refreshes. A production deploy asks whether to activate.',
         ],
     },
     log: {

package/dist/shell/Shell.js

@@ -90,27 +90,33 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
     // Active environment, remembered per workspace (or app) in .svcconfig.
     const configRoot = workspaceRoot ?? rawProject.root;
     const [envChoice, setEnvChoice] = useState(() => readSvcConfig(configRoot).environment ?? '');
-    const envNames = environmentNames(rawProject.devProperties);
+    const rootDev = useMemo(() => workspaceRoot
+        ? readWorkspaceDevProperties(workspaceRoot)
+        : undefined, 
+    // Re-read after any reload so saved values show up.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [workspaceRoot, apps]);
+    // The settings pane edits the shared root file, so it only cycles the
+    // root's environments: an app-only one must never become a root override.
+    const envDev = settings ? rootDev : rawProject.devProperties;
+    const envNames = environmentNames(envDev);
     const envList = envNames.join(',');
     const env = envNames.includes(envChoice)
         ? envChoice
-        : baseEnvironment(rawProject.devProperties);
+        : baseEnvironment(envDev);
     const project = useMemo(() => environmentProject(rawProject, env), [rawProject, env]);
-    const isProduction = isProductionEnvironment(env, rawProject.devProperties);
+    const isProduction = isProductionEnvironment(env, envDev);
     const versionsKey = `${project.root}|${env}`;
     const single = !workspaceRoot;
-    const workspaceTarget = useMemo(() => workspaceRoot
+    const workspaceTarget = useMemo(() => workspaceRoot && rootDev
         ? {
             root: workspaceRoot,
-            base: readWorkspaceDevProperties(workspaceRoot),
-            devProperties: resolveEnvironment(readWorkspaceDevProperties(workspaceRoot), env),
+            base: rootDev,
+            devProperties: resolveEnvironment(rootDev, env),
             environment: env,
             workspace: true,
         }
-        : undefined, 
-    // Re-read after any reload so saved values show up.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [workspaceRoot, apps, env]);
+        : undefined, [workspaceRoot, rootDev, env]);
     const narrow = minimal || columns < NARROW_BELOW;
     const sidebar = navWidth(columns);
     // The navigator shows the fuzzy matches; `selected` stays an index into
@@ -210,13 +216,13 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                 ?.trim()
                 .toLowerCase()
                 .replaceAll(/[^\d\-a-z]/g, '');
-            if (!clean || clean === baseEnvironment(rawProject.devProperties))
-                return;
             const targetRoot = workspaceRoot ?? rawProject.root;
             const base = (workspaceRoot
                 ? readWorkspaceDevProperties(workspaceRoot)
                 : rawProject.devProperties);
-            if (!base)
+            // The base of the file being written: an app's package.json may
+            // name a different one, and a duplicate of the base is never listed.
+            if (!clean || !base || clean === baseEnvironment(base))
                 return;
             writeDevProperties(targetRoot, { ...base, environments: { ...base.environments, [clean]: {} } }, { complete: !workspaceRoot });
             reload();
@@ -416,6 +422,19 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
         confirm: message => new Promise(resolve => {
             setOverlay({ kind: 'confirm', message, resolve });
         }),
+        async choose(label, choices) {
+            const picked = await new Promise(resolve => {
+                setOverlay({
+                    kind: 'choice',
+                    label,
+                    choices,
+                    multi: false,
+                    initial: [0],
+                    resolve,
+                });
+            });
+            return picked?.[0] ?? null;
+        },
         openHelp() {
             setOverlay({ kind: 'help' });
         },
@@ -591,9 +610,11 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             return;
         }
         if (settings && focus === 'content') {
-            // Settings pane: the form owns everything but q, y and Tab/Esc above.
+            // Settings pane: the form owns everything but q, v, y and Tab/Esc above.
             if (input === 'q')
                 quit();
+            else if (input === 'v')
+                context.cycleEnvironment();
             else if (input === 'y') {
                 try {
                     if (syncDevPropertiesToPackageJson(workspaceRoot)) {
@@ -679,6 +700,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             ? h([
                 ['↑↓', 'field'],
                 ['Enter', 'edit'],
+                ['v', 'env'],
                 ['y', 'sync'],
                 ['Esc', 'back'],
                 ['q', 'quit'],

package/dist/shell/actions.js

@@ -144,21 +144,25 @@ const deployDetail = (p) => {
         ? `${env} · ${t('signed zip · confirms first')}`
         : env;
 };
-/** Deploy to the active environment; production means signed + activate. */
+/** Deploy to the active environment; production means signed, and asks whether to activate. */
 async function deployTo(ctx, force) {
-    if (ctx.isProduction &&
-        !(await ctx.confirm(t('Deploy the signed {id} to {env} (addon {addon}) and activate it?', {
+    let activate = false;
+    if (ctx.isProduction) {
+        const pick = await ctx.choose(t('Deploy the signed {id} to {env} (addon {addon})', {
             id: ctx.project.manifest.id,
             env: ctx.environment,
             addon: ctx.project.devProperties?.addonName ?? '?',
-        })))) {
-        return;
+        }), [t('Deploy and activate'), t('Deploy only')]);
+        if (pick === null)
+            return;
+        activate = pick === 0;
     }
     const config = await resolveDeployConfig(ctx);
     if (!config)
         return;
     startDeploy(ctx.project, config, {
-        ...(ctx.isProduction ? { production: true, activate: true } : { force }),
+        force,
+        ...(ctx.isProduction && { production: true, activate }),
         onAddonMissing: askCreateAddon(ctx),
     });
     ctx.setTab('log');
@@ -166,10 +170,17 @@ async function deployTo(ctx, force) {
 const hasSigning = (p) => Boolean(p.devProperties?.signingUsername);
 async function startDevOrWatch(ctx, deploy) {
     if (deploy && ctx.isProduction) {
-        ctx.notify(t('Dev never deploys to a production environment ({env}). Switch with v.', {
+        if (!hasSigning(ctx.project)) {
+            ctx.notify(t('Dev on {env} needs signing credentials: production only takes the signed zip. / sets them up.', { env: ctx.environment }), 'warn');
+            return;
+        }
+        const go = await ctx.confirm(t('{env} is PRODUCTION. Dev will sign and deploy every build of {id} there (addon {addon}). Start it?', {
             env: ctx.environment,
-        }), 'warn');
-        return;
+            id: ctx.project.manifest.id,
+            addon: ctx.project.devProperties?.addonName ?? '?',
+        }));
+        if (!go)
+            return;
     }
     if (runningTasks(ctx.project.root).some(task => task.kind === 'dev' || task.kind === 'watch')) {
         ctx.notify(t('A dev/watch task is already running for this app (K stops it).'), 'warn');
@@ -198,9 +209,14 @@ export const actions = [
         key: 'd',
         group: 'app',
         label: 'Dev',
-        detail: p => hasSigning(p)
-            ? t('build, sign and deploy on change')
-            : t('build and deploy on change'),
+        detail(p) {
+            const base = hasSigning(p)
+                ? t('build, sign and deploy on change')
+                : t('build and deploy on change');
+            return p.devProperties?.productionEnvironment
+                ? `${base} · ${t('confirms first')}`
+                : base;
+        },
         enabled: hasDev,
         async run(ctx) {
             await startDevOrWatch(ctx, true);

package/dist/utils/i18n.js

@@ -114,7 +114,7 @@ const sv = {
     'Enter edits and saves a field, Esc cancels, ←→ or space cycles choices, Ctrl+O lists the addons on the site. y copies shared values into package.json for the team.': 'Enter redigerar och sparar ett fält, Esc avbryter, ←→ eller mellanslag bläddrar bland val, Ctrl+O listar webbplatsens tillägg. y kopierar delade värden till package.json för teamet.',
     'Passwords and secrets go to the OS keychain, never to a file. Leave them empty to be asked on each run.': 'Lösenord och hemligheter sparas i nyckelringen, aldrig i en fil. Lämna dem tomma för att bli tillfrågad varje gång.',
     "The versions uploaded to the addon on the active environment's site, the domain in the top bar. v switches environment.": 'Versionerna som laddats upp till tillägget på den aktiva miljöns webbplats, domänen i toppraden. v byter miljö.',
-    '↑↓ select, a activates the selected version, r refreshes. Production deploys activate on their own.': '↑↓ väljer, a aktiverar vald version, r uppdaterar. Produktionsdriftsättningar aktiverar själva.',
+    '↑↓ select, a activates the selected version, r refreshes. A production deploy asks whether to activate.': '↑↓ väljer, a aktiverar vald version, r uppdaterar. En produktionsdriftsättning frågar om den ska aktivera.',
     'Output from build, sign, deploy, dev and watch for the selected app. Dev and watch keep running while you switch apps; K stops them.': 'Utdata från build, sign, deploy, dev och watch för vald app. Dev och watch fortsätter köra medan du byter app; K stoppar dem.',
     '↑↓ scroll, PgUp/PgDn page, f jumps to the end, x toggles line wrap.': '↑↓ scrollar, PgUp/PgDn bläddrar sida, f hoppar till slutet, x växlar radbrytning.',
     "What's new": 'Nyheter',
@@ -129,8 +129,12 @@ const sv = {
     'Addon {addon} does not exist on {domain}. Create it and deploy again?': 'Tillägget {addon} finns inte på {domain}. Skapa det och driftsätt igen?',
     'e.g. test or prod, overriding domain and auth': 't.ex. test eller prod, med egen domän och auth',
     'Environment name (e.g. test, prod)': 'Miljönamn (t.ex. test, prod)',
-    'Deploy the signed {id} to {env} (addon {addon}) and activate it?': 'Driftsätt signerade {id} till {env} (addon {addon}) och aktivera?',
-    'Dev never deploys to a production environment ({env}). Switch with v.': 'Dev driftsätter aldrig till en produktionsmiljö ({env}). Byt med v.',
+    'Deploy the signed {id} to {env} (addon {addon})': 'Driftsätt signerade {id} till {env} (addon {addon})',
+    'Deploy and activate': 'Driftsätt och aktivera',
+    'Deploy only': 'Bara driftsätt',
+    'Dev on {env} needs signing credentials: production only takes the signed zip. / sets them up.': 'Dev mot {env} kräver signeringsuppgifter: produktion tar bara den signerade zip-filen. / ställer in dem.',
+    '{env} is PRODUCTION. Dev will sign and deploy every build of {id} there (addon {addon}). Start it?': '{env} är PRODUKTION. Dev signerar och driftsätter varje bygge av {id} dit (addon {addon}). Starta?',
+    'confirms first': 'bekräftar först',
     'switched to {env}': 'bytte till {env}',
     'environment {env} added': 'miljön {env} tillagd',
     environment: 'miljö',
@@ -245,7 +249,7 @@ const sv = {
     'Environment name': 'Miljönamn',
     Production: 'Produktion',
     'What this base configuration is: dev, test, prod… Other environments are added on top of it with E or the palette and override only what differs.': 'Vad denna grundkonfiguration är: dev, test, prod… Andra miljöer läggs ovanpå med E eller paletten och skriver bara över det som skiljer.',
-    'Treat deploys to this base environment as production: signed zip, confirmation, activation, and no dev loop. Off by default even when the name says prod, so a repo with only a production site still gets a dev loop.': 'Behandla driftsättningar till grundmiljön som produktion: signerad zip, bekräftelse, aktivering och ingen dev-loop. Av som standard även om namnet säger prod, så att ett repo med bara en produktionssajt ändå får en dev-loop.',
+    'Treat this base environment as production: deploys use the signed zip, ask for confirmation and offer activation, and dev confirms before it starts. Off by default even when the name says prod.': 'Behandla grundmiljön som produktion: driftsättningar använder den signerade zip-filen, ber om bekräftelse och erbjuder aktivering, och dev bekräftar innan den startar. Av som standard även om namnet säger prod.',
     'Saved {label}.': 'Sparade {label}.',
     'Looking up OAuth2 endpoints…': 'Slår upp OAuth2-endpoints…',
     'Endpoints filled from the site OpenID config.': 'Endpoints ifyllda från webbplatsens OpenID-konfig.',

package/dist/utils/sitevision-api.js

@@ -3,10 +3,9 @@
  *
  * Handles all API interactions with Sitevision servers:
  * - Signing apps via developer.sitevision.se
- * - Deploying to development environments
- * - Deploying to production environments
+ * - Deploying apps
  * - Creating addons
- * - Activating production apps
+ * - Activating uploaded versions
  */
 import fs from 'fs';
 import path from 'path';
@@ -425,38 +424,6 @@ export async function deployApp(zipPath, config, appType, force = false) {
         };
     }
 }
-/**
- * Deploy an app to production
- *
- * @param signedZipPath - Path to the SIGNED zip file (required for production)
- * @param config - Production deployment configuration
- * @param appType - The app type (web, widget, rest)
- */
-export async function deployProduction(signedZipPath, config, appType) {
-    // Deploy the signed app
-    const deployResult = await deployApp(signedZipPath, config, appType, true);
-    if (!deployResult.success) {
-        return deployResult;
-    }
-    if (!config.activate)
-        return deployResult;
-    if (!deployResult.executableId) {
-        return {
-            ...deployResult,
-            activated: false,
-            message: 'Deployed, but not activated: the server did not return an executable id.',
-        };
-    }
-    const activationResult = await activateApp(deployResult.executableId, config, appType);
-    return {
-        success: true,
-        executableId: deployResult.executableId,
-        activated: activationResult.success,
-        message: activationResult.success
-            ? 'Deployed and activated successfully'
-            : `Deployed successfully but activation failed: ${activationResult.error}`,
-    };
-}
 // =============================================================================
 // ADDON MANAGEMENT API
 // =============================================================================
@@ -524,7 +491,7 @@ export async function createAddon(config, appType) {
     }
 }
 /**
- * Activate a deployed production app
+ * Activate an uploaded version
  *
  * @param executableId - The executable ID returned from deployment
  * @param config - Deployment configuration

package/dist/utils/tasks.js

@@ -8,7 +8,7 @@ import { hasSitevisionScripts, runSitevisionScriptsBuild, getDelegatedZipPath, c
 import { copyStaticToBuild, copySrcToBuild, cleanBuild, createBuildZip, formatFileSize, getZipSize, zipExists, } from './zip.js';
 import { deleteSessionCookie } from './keychain.js';
 import { isBundledApp, getAppType, getFullAppId, getZipPath, getSignedZipPath, getDeployZipPath, localizedText, } from './project-detection.js';
-import { signApp, deployApp, deployProduction, activateApp, createAddon, listAddons, classifyAddon, } from './sitevision-api.js';
+import { signApp, deployApp, activateApp, createAddon, listAddons, classifyAddon, } from './sitevision-api.js';
 import { ProcessRunner } from './process-runner.js';
 import { debug } from './debug.js';
 const MAX_LINES = 2000;
@@ -170,10 +170,8 @@ async function signOnce(project, task, log, zipPath, credentials) {
 async function deployOnce(project, task, log, zipPath, config, options) {
     setPhase(task, 'deploying');
     const appType = getAppType(project.manifest);
-    log('dep', `POST multipart → ${options.production ? 'production' : 'dev'} import · ${config.addonName} · ${path.basename(zipPath)}`);
-    const upload = async () => options.production
-        ? deployProduction(zipPath, { ...config, activate: options.activate }, appType)
-        : deployApp(zipPath, config, appType, options.force);
+    log('dep', `POST multipart → import · ${config.addonName} · ${path.basename(zipPath)}`);
+    const upload = async () => deployApp(zipPath, config, appType, options.force);
     let result = await upload();
     if (!result.success && result.contextNodeMissing) {
         const addon = classifyAddon(await listAddons(config), config.addonName);
@@ -202,12 +200,23 @@ async function deployOnce(project, task, log, zipPath, config, options) {
     }
     if (!result.success)
         throw new Error(result.error ?? 'Deployment failed');
-    if (options.production && options.activate && !result.activated) {
-        throw new Error(result.message ?? 'Deployed, but not activated');
-    }
     log('dep', `${result.message ?? 'deployed'}${result.executableId ? ` · exec ${result.executableId}` : ''}`, 'ok');
+    if (options.activate) {
+        if (!result.executableId) {
+            throw new Error('Deployed, but not activated: the server did not return an executable id.');
+        }
+        await activateOnce(task, log, config, appType, result.executableId, `exec ${result.executableId}`);
+    }
     return result.executableId;
 }
+async function activateOnce(task, log, config, appType, executableId, versionLabel) {
+    setPhase(task, 'activating');
+    log('act', `PUT activateCustomModuleExecutable · ${versionLabel}`);
+    const result = await activateApp(executableId, config, appType);
+    if (!result.success)
+        throw new Error(result.error ?? 'Activation failed');
+    log('act', `${versionLabel} is now active`, 'ok');
+}
 // ---------------------------------------------------------------------------
 // Tasks
 // ---------------------------------------------------------------------------
@@ -271,12 +280,7 @@ export function startActivate(project, config, executableId, versionLabel) {
     const { task, log, finish } = createTask('activate', project, `activate ${versionLabel}`);
     void (async () => {
         try {
-            setPhase(task, 'activating');
-            log('act', `PUT activateCustomModuleExecutable · ${versionLabel}`);
-            const result = await activateApp(executableId, config, getAppType(project.manifest));
-            if (!result.success)
-                throw new Error(result.error ?? 'Activation failed');
-            log('act', `${versionLabel} is now active`, 'ok');
+            await activateOnce(task, log, config, getAppType(project.manifest), executableId, versionLabel);
             finish('success');
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.1",
+	"version": "1.1.0-beta.0",
 	"description": "Build, sign and deploy Sitevision apps from the terminal",
 	"license": "MIT",
 	"author": "Rasmus Söderström",

package/readme.md

@@ -13,7 +13,7 @@ MCPServer) from a full-screen terminal shell or as plain commands.
   works with SSO), or a captured browser session for SAML-only sites.
 - **No secrets on disk.** Passwords, tokens and cookies live in the OS keychain.
 - **Environments.** dev, test and prod in one config; production deploys use
-  the signed zip, confirm and activate.
+  the signed zip, confirm, and activate only if you say so.
 - **Shared config in git.** Site and auth settings for the whole team live in
   `package.json`, once at the repo root; your username stays in a local
   `.dev_properties.json`. Compatible with plain sitevision-scripts.
@@ -46,7 +46,7 @@ svc
    every change and deploy. Output is in the **Log** tab (`4`).
 
 For production: switch environment with `v`, press `b` to build, `s` to sign
-and `p` to deploy and activate.
+and `p` to deploy. It asks whether to activate the new version or just upload it.
 
 ## The shell
 
@@ -79,7 +79,7 @@ svc                                   # interactive shell
 svc build [--no-zip]                  # build to dist/<id>.zip
 svc sign                              # sign to dist/<id>-signed.zip
 svc deploy [--force]                  # deploy the zip
-svc deploy --production [--activate]  # deploy the signed zip
+svc deploy [--production] [--activate]  # signed zip only / activate after
 svc dev [--signed]                    # build + deploy on change
 svc watch [--signed]                  # build on change, no deploy
 svc info                              # project information