poveste 0.17.1 → 0.18.0

package/dist/node/context.js

@@ -1,7 +1,7 @@
-import { resolveConfig as resolveViteConfig } from 'vite';
+import { loadConfigFromFile as loadViteConfigFromFile, resolveConfig as resolveViteConfig } from 'vite';
 import { processConfig, resolveConfig } from './config.js';
 import { viteCommand, viteMode } from './util/vite-mode.js';
-import { mergePovesteViteConfig } from './vite.js';
+import { mergePovesteViteConfig, withoutIgnoredPlugins } from './vite.js';
 export async function createContext(options) {
     const config = await resolveConfig(process.cwd(), options.mode, options.configFile);
     const command = viteCommand(options.mode);
@@ -9,7 +9,15 @@ export async function createContext(options) {
     // `'development'` whatever the command, and `base` from this resolution is
     // what the hand-written index.html uses while the bundle uses the build's.
     // A user config setting `base` by mode would otherwise disagree with itself.
-    const viteConfig = await resolveViteConfig({}, command, viteMode(options.mode));
+    // Through `viteIgnorePlugins`, as the dev server and the build are: an ignored
+    // plugin's `config` hook still runs in a resolution that skips it, and SvelteKit's
+    // sets a relative `base` here, which index.html then carries (#1200).
+    const userViteConfig = await loadViteConfigFromFile({ command, mode: viteMode(options.mode) });
+    const viteConfig = await resolveViteConfig({
+        ...userViteConfig?.config,
+        configFile: false,
+        plugins: await withoutIgnoredPlugins(userViteConfig?.config.plugins, config.viteIgnorePlugins),
+    }, command, viteMode(options.mode));
     const supportPlugins = config.plugins.flatMap(p => p.supportPlugin ? [p.supportPlugin] : []);
     const partial = {
         root: viteConfig.root,

package/dist/node/vite.d.ts

@@ -1,5 +1,11 @@
-import type { InlineConfig } from 'vite';
+import type { PovesteConfig } from '@poveste/shared';
+import type { InlineConfig, PluginOption } from 'vite';
 import type { Context } from './context.js';
+/**
+ * The user's plugins, flattened one level as Vite's own options are, without the
+ * ones `viteIgnorePlugins` names.
+ */
+export declare function withoutIgnoredPlugins(plugins: PluginOption[] | undefined, ignored: PovesteConfig['viteIgnorePlugins']): Promise<PluginOption[]>;
 export declare function mergePovesteViteConfig(viteConfig: InlineConfig, ctx: Pick<Context, 'config' | 'mode'>): Promise<InlineConfig>;
 export interface ViteConfigWithPlugins {
     viteConfig: InlineConfig;

package/dist/node/vite.js

@@ -13,6 +13,23 @@ import { viteCommand, viteMode } from './util/vite-mode.js';
 import { collapseVendoredVue } from './vendors.js';
 import { createVirtualFilesPlugin } from './virtual/vite-plugin.js';
 const require = createRequire(import.meta.url);
+/**
+ * The user's plugins, flattened one level as Vite's own options are, without the
+ * ones `viteIgnorePlugins` names.
+ */
+export async function withoutIgnoredPlugins(plugins, ignored) {
+    const flat = [];
+    for (const pluginOption of plugins ?? []) {
+        const resolvedPluginOption = await pluginOption;
+        if (Array.isArray(resolvedPluginOption)) {
+            flat.push(...await Promise.all(resolvedPluginOption));
+        }
+        else {
+            flat.push(resolvedPluginOption);
+        }
+    }
+    return flat.filter(plugin => plugin && !('name' in plugin && ignored?.includes(plugin.name)));
+}
 export async function mergePovesteViteConfig(viteConfig, ctx) {
     if (ctx.config.vite) {
         const command = viteCommand(ctx.mode);
@@ -26,24 +43,7 @@ export async function mergePovesteViteConfig(viteConfig, ctx) {
             viteConfig = mergeViteConfig(viteConfig, overrides);
         }
     }
-    let flatPlugins = [];
-    if (viteConfig.plugins) {
-        for (const pluginOption of viteConfig.plugins) {
-            const resolvedPluginOption = await pluginOption;
-            if (Array.isArray(resolvedPluginOption)) {
-                flatPlugins.push(...await Promise.all(resolvedPluginOption));
-            }
-            else {
-                flatPlugins.push(resolvedPluginOption);
-            }
-        }
-        flatPlugins = flatPlugins.filter(Boolean);
-    }
-    const ignoredPlugins = ctx.config.viteIgnorePlugins;
-    if (ignoredPlugins) {
-        flatPlugins = flatPlugins.filter(plugin => !(plugin && 'name' in plugin && ignoredPlugins.includes(plugin.name)));
-    }
-    viteConfig.plugins = flatPlugins;
+    viteConfig.plugins = await withoutIgnoredPlugins(viteConfig.plugins, ctx.config.viteIgnorePlugins);
     return viteConfig;
 }
 export async function getViteConfigWithPlugins(isServer, ctx) {
@@ -146,7 +146,12 @@ export async function getViteConfigWithPlugins(isServer, ctx) {
     plugins.push({
         name: 'poveste-vite-plugin',
         config(_, { command }) {
+            const collapsedVue = isServer || process.env['POVESTE_DEV'] ? {} : collapseVendoredVue({ root: ctx.root });
             return {
+                // The book is a single-page app whatever the project's framework says: a
+                // framework serving its own app sets `custom`, which turns off the fallback
+                // that serves `/story/...` (#1200).
+                appType: 'spa',
                 resolve: {
                     dedupe: [
                         'vue',
@@ -160,7 +165,7 @@ export async function getViteConfigWithPlugins(isServer, ctx) {
                         // `@poveste/vendors/vue`, so sending `poveste-vue` back to `vue` would
                         // point the vendored entry at itself — the empty re-export its own
                         // comment warns about.
-                        ...(isServer || process.env['POVESTE_DEV'] ? {} : collapseVendoredVue({ root: ctx.root })),
+                        ...collapsedVue,
                     },
                     ...(isServer
                         ? {
@@ -177,9 +182,17 @@ export async function getViteConfigWithPlugins(isServer, ctx) {
                         // their deps cost a full reload when they turn up later (#282).
                         ...optimizeEntries(ctx.config, ctx.root, isServer),
                     ],
-                    include: optimizeDeps([
-                        'shiki',
-                    ]),
+                    include: [
+                        ...optimizeDeps([
+                            'shiki',
+                        ]),
+                        // With the alias above, `poveste-vue` is pre-bundled from the project's
+                        // Vue, but bare `vue` is pre-bundled only if a project file imports it.
+                        // A Svelte, Solid or React book has none, so `poveste-vue-router`'s
+                        // bare `vue` was served raw beside the pre-bundled copy of the same
+                        // file: two module instances, and `RouterView` rendered nothing (#1134).
+                        ...(Object.keys(collapsedVue).length > 0 ? ['vue'] : []),
+                    ],
                     exclude: [
                         'poveste',
                         '@poveste/vendors',

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "poveste",
   "type": "module",
-  "version": "0.17.1",
-  "description": "Interactive component playgrounds for Vue, Nuxt, Svelte, SvelteKit and Quasar — a drop-in fork of histoire, with Quasar support histoire does not ship.",
+  "version": "0.18.0",
+  "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",
     "url": "https://x.com/50rayn"
@@ -29,6 +29,8 @@
     "svelte",
     "nuxt",
     "sveltekit",
+    "solid",
+    "solidjs",
     "cli"
   ],
   "publishConfig": {
@@ -75,10 +77,10 @@
   },
   "dependencies": {
     "@11ty/gray-matter": "^3.0.0",
-    "@poveste/app": "^0.17.1",
-    "@poveste/controls": "^0.17.1",
-    "@poveste/shared": "^0.17.1",
-    "@poveste/vendors": "^0.17.1",
+    "@poveste/app": "^0.18.0",
+    "@poveste/controls": "^0.18.0",
+    "@poveste/shared": "^0.18.0",
+    "@poveste/vendors": "^0.18.0",
     "change-case": "^5.4.4",
     "chokidar": "^5.0.0",
     "defu": "^6.1.4",