poveste 0.12.3 → 0.13.0

package/dist/node/build.js

@@ -15,6 +15,7 @@ import { findAllStories } from './stories.js';
 import { chromeCssScopePlugin, entryCssMergerPlugin, userCssScopePlugin, } from './style-isolation/index.js';
 import { applyHeadTransform } from './util/head.js';
 import { wrapLogError } from './util/log.js';
+import { viteMode } from './util/vite-mode.js';
 import { getViteConfigWithPlugins } from './vite.js';
 const PRELOAD_MODULES = [
     'vendor',
@@ -51,6 +52,10 @@ export async function build(ctx) {
     }
     const { viteConfig } = await getViteConfigWithPlugins(true, ctx);
     const server = await createViteServer(mergeViteConfig(viteConfig, {
+        // Same mode as the build below: `createServer` defaults to `development`,
+        // which would put one `.env` file in poveste.json and the other in the
+        // bundle built from it.
+        mode: viteMode(ctx.mode),
         optimizeDeps: { include: [], noDiscovery: true },
     }));
     await server.pluginContainer.buildStart({});
@@ -105,7 +110,9 @@ export async function build(ctx) {
         const emptyStoryCount = ctx.storyFiles.length - storyCount;
         const { viteConfig: buildViteConfigRaw } = await getViteConfigWithPlugins(false, ctx);
         const buildViteConfig = mergeViteConfig(buildViteConfigRaw, {
-            mode: 'development',
+            // Vite picks the `.env` file from `mode`, not from NODE_ENV — this said
+            // `'development'` from histoire until #349.
+            mode: viteMode(ctx.mode),
             build: {
                 lib: false,
                 rollupOptions: {
@@ -207,6 +214,10 @@ export async function build(ctx) {
                     emptyOutDir: true,
                     // Re-merged per-entry by entry-css-merger.
                     cssCodeSplit: true,
+                    // Not an oversight: the source pane prints story code by reading
+                    // functions back at runtime, and `Function.prototype.toString()`
+                    // returns whatever the minifier left — `codegen-vue3.spec.ts` fails
+                    // on three cases with this on (#329).
                     minify: false,
                     // Don't build in SSR mode
                     ssr: false,

package/dist/node/context.js

@@ -1,10 +1,15 @@
 import { resolveConfig as resolveViteConfig } from 'vite';
 import { processConfig, resolveConfig } from './config.js';
+import { viteCommand, viteMode } from './util/vite-mode.js';
 import { mergePovesteViteConfig } from './vite.js';
 export async function createContext(options) {
     const config = await resolveConfig(process.cwd(), options.mode, options.configFile);
-    const command = options.mode === 'dev' ? 'serve' : 'build';
-    const viteConfig = await resolveViteConfig({}, command);
+    const command = viteCommand(options.mode);
+    // The mode as well as the command: `resolveConfig` defaults to
+    // `'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));
     const supportPlugins = config.plugins.map(p => p.supportPlugin).filter(Boolean);
     const ctx = {
         root: viteConfig.root,

package/dist/node/util/vite-mode.d.ts

@@ -0,0 +1,13 @@
+import type { ConfigMode } from '@poveste/shared';
+/**
+ * poveste's `ConfigMode` in the vocabulary Vite's own API speaks.
+ *
+ * The two are different axes with overlapping words, and handing one straight
+ * to the other means a user config written the standard way — `mode ===
+ * 'production' ? … : …` — takes neither branch (#349).
+ *
+ * The public `vite(config, env)` hook takes it too: `env` is typed as Vite's own
+ * `ConfigEnv` in `@poveste/shared`, and its `command` was already translated.
+ */
+export declare function viteMode(mode: ConfigMode): 'development' | 'production';
+export declare function viteCommand(mode: ConfigMode): 'serve' | 'build';

package/dist/node/util/vite-mode.js

@@ -0,0 +1,16 @@
+/**
+ * poveste's `ConfigMode` in the vocabulary Vite's own API speaks.
+ *
+ * The two are different axes with overlapping words, and handing one straight
+ * to the other means a user config written the standard way — `mode ===
+ * 'production' ? … : …` — takes neither branch (#349).
+ *
+ * The public `vite(config, env)` hook takes it too: `env` is typed as Vite's own
+ * `ConfigEnv` in `@poveste/shared`, and its `command` was already translated.
+ */
+export function viteMode(mode) {
+    return mode === 'dev' ? 'development' : 'production';
+}
+export function viteCommand(mode) {
+    return mode === 'dev' ? 'serve' : 'build';
+}

package/dist/node/vite.js

@@ -9,14 +9,15 @@ import { optimizeEntries } from './optimize-entries.js';
 import { notifyStoryChange } from './stories.js';
 import { chromeCssScopePlugin, globalStylesPlugin, userCssScopePlugin, } from './style-isolation/index.js';
 import { applyHeadTransform } from './util/head.js';
+import { viteCommand, viteMode } from './util/vite-mode.js';
 import { createVirtualFilesPlugin } from './virtual/vite-plugin.js';
 const require = createRequire(import.meta.url);
 export async function mergePovesteViteConfig(viteConfig, ctx) {
     if (ctx.config.vite) {
-        const command = ctx.mode === 'dev' ? 'serve' : 'build';
+        const command = viteCommand(ctx.mode);
         const overrides = typeof ctx.config.vite === 'function'
             ? await ctx.config.vite(viteConfig, {
-                mode: ctx.mode,
+                mode: viteMode(ctx.mode),
                 command,
             })
             : ctx.config.vite;
@@ -44,7 +45,7 @@ export async function mergePovesteViteConfig(viteConfig, ctx) {
     return viteConfig;
 }
 export async function getViteConfigWithPlugins(isServer, ctx) {
-    const userViteConfigFile = await loadViteConfigFromFile({ command: ctx.mode === 'dev' ? 'serve' : 'build', mode: ctx.mode });
+    const userViteConfigFile = await loadViteConfigFromFile({ command: viteCommand(ctx.mode), mode: viteMode(ctx.mode) });
     const userViteConfig = mergeViteConfig(userViteConfigFile?.config ?? {}, { server: { port: 6006 } });
     const inlineConfig = await mergePovesteViteConfig(userViteConfig, ctx);
     const plugins = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poveste",
   "type": "module",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "description": "Interactive component playgrounds for Vue, Nuxt, Svelte, SvelteKit and Quasar — a drop-in fork of histoire, with Quasar support histoire does not ship.",
   "author": {
     "name": "Sorin Gitlan",
@@ -73,10 +73,10 @@
   },
   "dependencies": {
     "@akryum/tinypool": "^0.3.1",
-    "@poveste/app": "^0.12.3",
-    "@poveste/controls": "^0.12.3",
-    "@poveste/shared": "^0.12.3",
-    "@poveste/vendors": "^0.12.3",
+    "@poveste/app": "^0.13.0",
+    "@poveste/controls": "^0.13.0",
+    "@poveste/shared": "^0.13.0",
+    "@poveste/vendors": "^0.13.0",
     "@types/markdown-it": "^14.1.2",
     "birpc": "^0.2.19",
     "change-case": "^5.4.4",