poveste 0.18.2 → 0.18.3

package/dist/node/commands/port.d.ts

@@ -7,11 +7,23 @@
  * neither the flag nor the mistake. A non-numeric value fails the same way.
  */
 export declare function resolvePort(value: unknown, command: string): number | undefined;
+type SocketOptions = Record<string, unknown>;
 /**
- * The HMR socket port for a book served on `devPort`. Derived from the dev port
- * so each concurrent dev server's socket is as distinct as its book port (#175),
- * offset clear of the usual dev-port range and wrapped so it stays a valid port
- * for an unusually high `--port`. `@nuxt/vite-builder` otherwise pins every
- * server to the framework default (24678), a constant that collides (#221).
+ * The book server's HMR socket settings: whatever the merged config asked for,
+ * minus a port or server of its own, so Vite serves the socket on the book's port
+ * and the browser dials the page's own origin. Vite takes these from `server.ws`
+ * and from the deprecated `server.hmr` alike, so both are cleared.
+ *
+ * A socket on a second port was never routed on StackBlitz, which previews each
+ * port on its own hostname, so a page opened before collection ended waited for
+ * the list on a socket that never connected, and stayed blank (#1245). It is
+ * also how `@nuxt/vite-builder`'s 24678 default made two books collide (#221).
  */
-export declare function hmrPortFor(devPort: number | undefined): number;
+export declare function socketOnBookPort(server: {
+    hmr?: unknown;
+    ws?: unknown;
+}): {
+    hmr: SocketOptions;
+    ws: SocketOptions;
+};
+export {};

package/dist/node/commands/port.js

@@ -22,14 +22,24 @@ export function resolvePort(value, command) {
     }
     return port;
 }
+function withoutOwnPort(options) {
+    if (options === null || typeof options !== 'object') {
+        return {};
+    }
+    const { port: _port, server: _server, ...rest } = options;
+    return rest;
+}
 /**
- * The HMR socket port for a book served on `devPort`. Derived from the dev port
- * so each concurrent dev server's socket is as distinct as its book port (#175),
- * offset clear of the usual dev-port range and wrapped so it stays a valid port
- * for an unusually high `--port`. `@nuxt/vite-builder` otherwise pins every
- * server to the framework default (24678), a constant that collides (#221).
+ * The book server's HMR socket settings: whatever the merged config asked for,
+ * minus a port or server of its own, so Vite serves the socket on the book's port
+ * and the browser dials the page's own origin. Vite takes these from `server.ws`
+ * and from the deprecated `server.hmr` alike, so both are cleared.
+ *
+ * A socket on a second port was never routed on StackBlitz, which previews each
+ * port on its own hostname, so a page opened before collection ended waited for
+ * the list on a socket that never connected, and stayed blank (#1245). It is
+ * also how `@nuxt/vite-builder`'s 24678 default made two books collide (#221).
  */
-export function hmrPortFor(devPort) {
-    const base = devPort ?? 6006;
-    return base < 45536 ? base + 20000 : base - 20000;
+export function socketOnBookPort(server) {
+    return { hmr: withoutOwnPort(server.hmr), ws: withoutOwnPort(server.ws) };
 }

package/dist/node/server.js

@@ -2,7 +2,7 @@ import { performance } from 'node:perf_hooks';
 import pc from 'picocolors';
 import { createServer as createViteServer, mergeConfig as mergeViteConfig } from 'vite';
 import { useCollectStories } from './collect/index.js';
-import { hmrPortFor } from './commands/port.js';
+import { socketOnBookPort } from './commands/port.js';
 import { useModuleLoader } from './load.js';
 import { createMarkdownFilesWatcher, onMarkdownFileChange, onMarkdownListChange } from './markdown.js';
 import { DevEventPluginApi, DevPluginApi } from './plugin.js';
@@ -42,14 +42,19 @@ async function startServer(ctx, options, onOpen, close) {
             serverConfig.hmr = false;
         }
         else {
-            // `@nuxt/vite-builder` pins the HMR socket to the constant 24678 on every
-            // server it configures, so two poveste dev servers on different `--port`s
-            // collide on it and the second silently loses HMR (#221). It only does
-            // this when `server.hmr` carries no port of its own (it fills the gap with
-            // `defu`), so pin the socket to a port derived from this book's `--port`,
-            // before the config is resolved: each dev server then owns a distinct one
-            // (#175).
-            serverConfig.hmr = { port: hmrPortFor(options.port ?? serverConfig.port) };
+            // On the book's own port, never a second one: StackBlitz does not route
+            // it, and `@nuxt/vite-builder`'s default collides between books (#1245,
+            // #221). Post-ordered, because that default is filled in by Nuxt's own
+            // `config` hook.
+            viteConfig.plugins = [...viteConfig.plugins ?? [], {
+                    name: 'poveste:socket-on-book-port',
+                    config: {
+                        order: 'post',
+                        handler(config) {
+                            config.server = { ...config.server, ...socketOnBookPort(config.server ?? {}) };
+                        },
+                    },
+                }];
             if (options.open) {
                 serverConfig.open = true;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poveste",
   "type": "module",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "Interactive component playgrounds for Vue, Nuxt, Svelte, SvelteKit and Quasar, plus Solid (renderer only) — a drop-in fork of histoire, with Quasar support histoire does not ship.",
   "author": {
     "name": "Sorin Gitlan",
@@ -77,10 +77,10 @@
   },
   "dependencies": {
     "@11ty/gray-matter": "^3.0.0",
-    "@poveste/app": "^0.18.2",
-    "@poveste/controls": "^0.18.2",
-    "@poveste/shared": "^0.18.2",
-    "@poveste/vendors": "^0.18.2",
+    "@poveste/app": "^0.18.3",
+    "@poveste/controls": "^0.18.3",
+    "@poveste/shared": "^0.18.3",
+    "@poveste/vendors": "^0.18.3",
     "change-case": "^5.4.4",
     "chokidar": "^5.0.0",
     "defu": "^6.1.4",