sitevision-cli 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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

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.1",
+	"version": "1.0.2",
 	"description": "Build, sign and deploy Sitevision apps from the terminal",
 	"license": "MIT",
 	"author": "Rasmus Söderström",