@pyreon/vite-plugin 0.16.0 → 0.19.0

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src/index.ts","uid":"8d2ce63a-1"}]}],"isRoot":true},"nodeParts":{"8d2ce63a-1":{"renderedLength":28850,"gzipLength":9498,"brotliLength":0,"metaUid":"8d2ce63a-0"}},"nodeMetas":{"8d2ce63a-0":{"id":"/src/index.ts","moduleParts":{"index.js":"8d2ce63a-1"},"imported":[{"uid":"8d2ce63a-2"},{"uid":"8d2ce63a-3"},{"uid":"8d2ce63a-4"}],"importedBy":[],"isEntry":true},"8d2ce63a-2":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"8d2ce63a-0"}]},"8d2ce63a-3":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"8d2ce63a-0"}]},"8d2ce63a-4":{"id":"@pyreon/compiler","moduleParts":{},"imported":[],"importedBy":[{"uid":"8d2ce63a-0"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src/index.ts","uid":"88d6c780-1"}]}],"isRoot":true},"nodeParts":{"88d6c780-1":{"renderedLength":29326,"gzipLength":9623,"brotliLength":0,"metaUid":"88d6c780-0"}},"nodeMetas":{"88d6c780-0":{"id":"/src/index.ts","moduleParts":{"index.js":"88d6c780-1"},"imported":[{"uid":"88d6c780-2"},{"uid":"88d6c780-3"},{"uid":"88d6c780-4"}],"importedBy":[],"isEntry":true},"88d6c780-2":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"88d6c780-0"}]},"88d6c780-3":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"88d6c780-0"}]},"88d6c780-4":{"id":"@pyreon/compiler","moduleParts":{},"imported":[],"importedBy":[{"uid":"88d6c780-0"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { generateContext, transformJSX } from "@pyreon/compiler";
+import { generateContext, transformDeferInline, transformJSX } from "@pyreon/compiler";
 
 //#region src/index.ts
 /**
@@ -222,8 +222,11 @@ function pyreonPlugin(options) {
 			}
 			scanSignalExports(code, normalizeModuleId(id), signalExportRegistry);
 			if (islandsEnabled) scanIslandDeclarations(code, id, islandRegistry);
-			const knownSignals = await resolveImportedSignals(code, id, signalExportRegistry, this, resolveCache);
-			const result = transformJSX(code, id, {
+			const deferResult = transformDeferInline(code, id);
+			const sourceForJsx = deferResult.changed ? deferResult.code : code;
+			for (const w of deferResult.warnings) this.warn(`${w.message} (${id}:${w.line}:${w.column})`);
+			const knownSignals = await resolveImportedSignals(sourceForJsx, id, signalExportRegistry, this, resolveCache);
+			const result = transformJSX(sourceForJsx, id, {
 				ssr: transformOptions?.ssr === true,
 				knownSignals
 			});
@@ -440,7 +443,11 @@ function injectHmr(code, moduleId) {
 	if (hasSignals) lines.push(`import { __hmr_signal, __hmr_dispose } from "${HMR_RUNTIME_IMPORT}";`);
 	lines.push(`if (import.meta.hot) {`);
 	if (hasSignals) lines.push(`  import.meta.hot.dispose(() => __hmr_dispose(${escapedId}));`);
-	lines.push(`  import.meta.hot.accept();`);
+	lines.push(`  import.meta.hot.accept((__m) => {`);
+	lines.push(`    const __s = globalThis.__pyreon_hmr_swap__;`);
+	lines.push(`    if (typeof __s === "function" && __m && __s(${escapedId}, __m)) return;`);
+	lines.push(`    import.meta.hot.invalidate();`);
+	lines.push(`  });`);
 	lines.push(`}`);
 	output = `${output}\n\n${lines.join("\n")}\n`;
 	return output;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/vite-plugin",
-  "version": "0.16.0",
+  "version": "0.19.0",
   "description": "Vite plugin for Pyreon — .pyreon SFC support, HMR, compiler integration",
   "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/vite-plugin#readme",
   "bugs": {
@@ -43,7 +43,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@pyreon/compiler": "^0.16.0"
+    "@pyreon/compiler": "^0.19.0"
   },
   "devDependencies": {
     "vite": "^8.0.0"

package/src/index.ts

@@ -34,7 +34,7 @@
 
 import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs'
 import { dirname, join as pathJoin } from 'node:path'
-import { generateContext, transformJSX } from '@pyreon/compiler'
+import { generateContext, transformDeferInline, transformJSX } from '@pyreon/compiler'
 import type { Plugin, ViteDevServer } from 'vite'
 
 // Virtual module ID for the HMR runtime
@@ -429,16 +429,31 @@ export default function pyreonPlugin(options?: PyreonPluginOptions): Plugin {
       // next dev-server module reload.
       if (islandsEnabled) scanIslandDeclarations(code, id, islandRegistry)
 
+      // ── Inline-Defer pre-pass ──────────────────────────────────────────
+      // Rewrites `<Defer when={x}><Modal /></Defer>` into the explicit
+      // chunk-prop form so Rolldown emits a proper per-Defer chunk and
+      // the main bundle drops the static `import { Modal } from ...`
+      // when it's exclusively used inside this Defer's subtree. Runs
+      // BEFORE the JSX→runtime transform so the downstream pipeline
+      // sees an already-explicit `<Defer chunk={...}>` shape with no
+      // special-casing needed in `transformJSX`. See
+      // `@pyreon/compiler/defer-inline` for the rewrite contract.
+      const deferResult = transformDeferInline(code, id)
+      const sourceForJsx = deferResult.changed ? deferResult.code : code
+      for (const w of deferResult.warnings) {
+        this.warn(`${w.message} (${id}:${w.line}:${w.column})`)
+      }
+
       // ── Resolve imported signals from the registry ─────────────────────
       // Check each import in this file: if the imported module has signal
       // exports in the registry, pass them as knownSignals to the compiler.
-      const knownSignals = await resolveImportedSignals(code, id, signalExportRegistry, this, resolveCache)
+      const knownSignals = await resolveImportedSignals(sourceForJsx, id, signalExportRegistry, this, resolveCache)
 
       // Vite passes `ssr: true` when transforming for the SSR module graph
       // (both build --ssr and dev `ssrLoadModule`). The compiler emits plain
       // `h()` calls in that mode so `runtime-server` can render to a string.
       const isSsr = transformOptions?.ssr === true
-      const result = transformJSX(code, id, { ssr: isSsr, knownSignals })
+      const result = transformJSX(sourceForJsx, id, { ssr: isSsr, knownSignals })
       // Surface compiler warnings in the terminal
       for (const w of result.warnings) {
         this.warn(`${w.message} (${id}:${w.line}:${w.column})`)
@@ -730,7 +745,40 @@ function injectHmr(code: string, moduleId: string): string {
     lines.push(`  import.meta.hot.dispose(() => __hmr_dispose(${escapedId}));`)
   }
 
-  lines.push(`  import.meta.hot.accept();`)
+  // Self-accept the module, then drive Pyreon's HMR coordinator.
+  //
+  // The OLD code emitted a bare `import.meta.hot.accept()` (no callback):
+  // Vite re-evaluated the module but NOTHING re-rendered the mounted tree,
+  // AND the self-accept suppressed Vite's full-reload fallback — so a
+  // component/JSX edit produced a silently-stale UI until a MANUAL refresh.
+  //
+  // Now: the accept callback hands the FRESH module namespace Vite already
+  // re-evaluated straight to `globalThis.__pyreon_hmr_swap__` (registered
+  // by `@pyreon/router` in a dev browser — zero import coupling, same
+  // pattern as the perf-harness counter sink), keyed by THIS module's id.
+  // The coordinator finds every active matched route record whose lazy
+  // `_hmrId` matches and swaps in the new component, re-rendering ONLY
+  // that subtree IN PLACE (no page reload → `__pyreon_hmr_registry__`
+  // survives → `__hmr_signal` restores module-scope signal values).
+  //
+  // Using the namespace Vite passes (not a re-run of the lazy thunk)
+  // sidesteps the stale-`?t=` trap: the dynamic-import thunk lives in the
+  // virtual routes module, which is NOT invalidated when this leaf route
+  // self-accepts — re-importing it would return the OLD module.
+  //
+  // `__pyreon_hmr_swap__` returns falsy when the edit was outside the
+  // active route tree (nested non-route component, unrelated route,
+  // signal-only module) OR no coordinator is registered (plain
+  // `@pyreon/runtime-dom` app, or module loaded before any router
+  // mounted). Then `import.meta.hot.invalidate()` → Vite propagates → an
+  // AUTOMATIC full reload. Either way the user never refreshes by hand.
+  lines.push(`  import.meta.hot.accept((__m) => {`)
+  lines.push(`    const __s = globalThis.__pyreon_hmr_swap__;`)
+  lines.push(
+    `    if (typeof __s === "function" && __m && __s(${escapedId}, __m)) return;`,
+  )
+  lines.push(`    import.meta.hot.invalidate();`)
+  lines.push(`  });`)
   lines.push(`}`)
 
   output = `${output}\n\n${lines.join('\n')}\n`

package/src/tests/vite-plugin.test.ts

@@ -58,7 +58,7 @@ async function transform(plugin: ReturnType<typeof pyreonPlugin>, code: string,
 // ─── HMR injection ──────────────────────────────────────────────────────────
 
 describe('HMR injection', () => {
-  it('injects HMR accept for modules with component exports', async () => {
+  it('injects a coordinator-driven HMR accept for modules with component exports', async () => {
     const plugin = createPlugin()
     const code = `
 import { h } from "@pyreon/core"
@@ -66,7 +66,18 @@ export function App() { return h("div", null, "hello") }
 `
     const result = await transform(plugin, code, '/src/App.tsx')
     expect(result).toBeDefined()
-    expect(result!.code).toContain('import.meta.hot.accept()')
+    // Self-accept WITH a callback receiving the fresh module (the bare
+    // `accept()` was the bug — it suppressed Vite's reload fallback while
+    // re-rendering nothing).
+    expect(result!.code).toContain('import.meta.hot.accept((__m) => {')
+    expect(result!.code).not.toContain('import.meta.hot.accept();')
+    // Hands the fresh module to the router-registered HMR coordinator,
+    // keyed by THIS module's id (zero import coupling).
+    expect(result!.code).toContain('globalThis.__pyreon_hmr_swap__')
+    expect(result!.code).toContain('__s("/src/App.tsx", __m)')
+    // Falls back to an automatic full reload when the edit was outside the
+    // active route tree or no coordinator is registered.
+    expect(result!.code).toContain('import.meta.hot.invalidate()')
   })
 
   it('injects HMR for exported const components', async () => {