sitevision-cli 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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
+  below the new ones, dimmed, instead of stopping at the version you had.
+
 ## 1.0.0
 
 First stable release. Everything from the betas is in, see the entries below.

package/dist/shell/Changelog.js

@@ -5,8 +5,9 @@ import { Box, Text, useInput } from 'ink';
 import { t } from '../utils/i18n.js';
 import { ACCENT } from './Frame.js';
 /**
- * CHANGELOG.md without its title, or undefined when it isn't shipped. With
- * `since`, only the releases above that version's heading.
+ * CHANGELOG.md without its title, or undefined when it isn't shipped. `cutoff`
+ * is the line where `since` (the version the user had) begins: everything
+ * before it is new to them, everything from it on is shown dimmed for context.
  */
 export function readChangelog(since) {
     try {
@@ -15,14 +16,16 @@ export function readChangelog(since) {
             .trim()
             .split('\n');
         const end = since ? lines.indexOf(`## ${since}`) : -1;
-        return end > 0 ? lines.slice(0, end) : lines;
+        return { lines, cutoff: end > 0 ? end : lines.length };
     }
     catch {
         return undefined;
     }
 }
 export function ChangelogPanel({ since, height, onClose, }) {
-    const lines = useMemo(() => readChangelog(since), [since]);
+    const changelog = useMemo(() => readChangelog(since), [since]);
+    const lines = changelog?.lines;
+    const cutoff = changelog?.cutoff ?? 0;
     const [top, setTop] = useState(0);
     const visible = Math.max(1, height - 1);
     const max = Math.max(0, (lines?.length ?? 0) - visible);
@@ -40,5 +43,8 @@ export function ChangelogPanel({ since, height, onClose, }) {
     });
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: since
                             ? t("What's new since {version}", { version: since })
-                            : t('Changelog') }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", t('↑↓ scroll · Esc close')] })] }), lines ? (lines.slice(top, top + visible).map((line, i) => line.startsWith('## ') ? (_jsx(Text, { bold: true, color: ACCENT, children: line.slice(3) }, top + i)) : (_jsx(Text, { wrap: "truncate", children: line || ' ' }, top + i)))) : (_jsx(Text, { dimColor: true, children: t('No changelog found.') }))] }));
+                            : t('Changelog') }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", t('↑↓ scroll · Esc close')] })] }), lines ? (lines.slice(top, top + visible).map((line, i) => {
+                const old = top + i >= cutoff;
+                return line.startsWith('## ') ? (_jsx(Text, { bold: true, color: old ? undefined : ACCENT, dimColor: old, children: line.slice(3) }, top + i)) : (_jsx(Text, { wrap: "truncate", dimColor: old, children: line || ' ' }, top + i));
+            })) : (_jsx(Text, { dimColor: true, children: t('No changelog found.') }))] }));
 }

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();
@@ -591,9 +597,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 +687,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             ? h([
                 ['↑↓', 'field'],
                 ['Enter', 'edit'],
+                ['v', 'env'],
                 ['y', 'sync'],
                 ['Esc', 'back'],
                 ['q', 'quit'],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"description": "Build, sign and deploy Sitevision apps from the terminal",
 	"license": "MIT",
 	"author": "Rasmus Söderström",
@@ -25,8 +25,8 @@
 		"node": ">=22"
 	},
 	"scripts": {
-		"build": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\" && tsc && node -e \"fs.chmodSync('dist/cli.js',0o755)\"",
-		"dev": "tsc --watch",
+		"build": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json && node -e \"fs.chmodSync('dist/cli.js',0o755)\"",
+		"dev": "tsc -p tsconfig.build.json --watch",
 		"test": "prettier --check . && xo && ava",
 		"prepublishOnly": "npm test && npm run build",
 		"release": "./scripts/publish.sh",
@@ -62,6 +62,7 @@
 		"xo": "^3.0.2"
 	},
 	"ava": {
+		"workerThreads": false,
 		"extensions": [
 			"ts",
 			"tsx"

package/readme.md

@@ -1,5 +1,8 @@
 # Sitevision CLI
 
+[![Test](https://github.com/xrasod/SitevisionCli/actions/workflows/test.yml/badge.svg)](https://github.com/xrasod/SitevisionCli/actions/workflows/test.yml)
+[![npm](https://img.shields.io/npm/v/sitevision-cli)](https://www.npmjs.com/package/sitevision-cli)
+
 `svc` builds, signs and deploys Sitevision apps (WebApp, Widget, RESTApp,
 MCPServer) from a full-screen terminal shell or as plain commands.
 
@@ -147,7 +150,8 @@ To run your local build as `svc`, link it once with `npm link`, then keep
 any Sitevision app reflects your changes. `npm unlink -g sitevision-cli` and
 `npm install -g sitevision-cli` restore the published version.
 
-Releasing: see [RELEASING.md](RELEASING.md).
+Contributing: see [CONTRIBUTING.md](CONTRIBUTING.md). Releasing: see
+[RELEASING.md](RELEASING.md).
 
 ## License