npm - @pyreon/zero - Versions diffs - 0.19.0 → 0.20.0 - Mend

@pyreon/zero 0.19.0 → 0.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/lib/{api-routes-CQiOi3q5.js → api-routes-CMsLztoj.js} +1 -1
package/lib/favicon.js +57 -3
package/lib/{fs-router-BVY4lTH_.js → fs-router-Bacdhsq-.js} +2 -2
package/lib/image-plugin.js +13 -6
package/lib/server.js +2716 -179
package/lib/types/favicon.d.ts +17 -1
package/lib/types/i18n-routing.d.ts +2 -4
package/lib/types/index.d.ts +3 -5
package/lib/types/link.d.ts +2 -4
package/lib/types/server.d.ts +2 -4
package/lib/types/theme.d.ts +1 -2
package/package.json +10 -10
package/src/favicon.ts +84 -2
package/src/image-plugin.ts +43 -12
package/lib/vite-plugin-8TXXFqdP.js +0 -2491

package/lib/types/favicon.d.ts CHANGED Viewed

@@ -1,6 +1,22 @@
 import { Plugin } from "vite";
 //#region src/favicon.d.ts
+/**
+ * Stable content hash (FNV-1a, 32-bit) of the favicon source file(s),
+ * rendered as a `?v=<hex>` cache-bust query for the injected `<head>`
+ * links. Browsers cache favicons extremely aggressively (often per-
+ * session / effectively forever), so with a stable URL a changed icon
+ * is never re-fetched by returning visitors. Same source bytes →
+ * identical query (no needless cache churn); changed bytes → new query
+ * → browser re-downloads. Falls back to `''` (no query, prior
+ * behaviour) if a source can't be read — never break the build over a
+ * cache-bust nicety. NOTE: this versions everything referenced via
+ * `<link>` (svg/png/apple-touch/manifest). The bare `/favicon.ico`
+ * convention request (browsers fetch it with no link tag) and the
+ * `site.webmanifest`'s internal icon entries keep stable URLs — those
+ * rely on host cache headers / are re-resolved on PWA (re)install.
+ */
+declare function faviconVersionQuery(paths: string[]): string;
 interface FaviconLocaleConfig {
   /** Locale-specific source icon (SVG or PNG). */
   source: string;
@@ -102,5 +118,5 @@ interface IcoEntry {
 /** @internal Exported for testing */
 declare function createIcoFromPngs(entries: IcoEntry[]): Uint8Array;
 //#endregion
-export { FaviconLocaleConfig, FaviconPluginConfig, IcoEntry, createIcoFromPngs, faviconLinks, faviconPlugin };
+export { FaviconLocaleConfig, FaviconPluginConfig, IcoEntry, createIcoFromPngs, faviconLinks, faviconPlugin, faviconVersionQuery };
 //# sourceMappingURL=favicon2.d.ts.map

package/lib/types/i18n-routing.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import * as _$_pyreon_core0 from "@pyreon/core";
-import * as _$_pyreon_reactivity0 from "@pyreon/reactivity";
 import { Plugin } from "vite";
 //#region src/types.d.ts
 type RenderMode = 'ssr' | 'ssg' | 'spa' | 'isr';
@@ -265,9 +263,9 @@ declare function createLocaleContext(locale: string, path: string, config: I18nR
  */
 declare function i18nRouting(config: I18nRoutingConfig): Plugin;
 /** @internal Context for the current locale. */
-declare const LocaleCtx: _$_pyreon_core0.Context<string>;
+declare const LocaleCtx: import("@pyreon/core").Context<string>;
 /** Current locale signal — set by the server middleware or client-side detection. */
-declare const localeSignal: _$_pyreon_reactivity0.Signal<string>;
+declare const localeSignal: import("@pyreon/reactivity").Signal<string>;
 /**
  * Read the current locale reactively.
  *

package/lib/types/index.d.ts CHANGED Viewed

@@ -1,6 +1,4 @@
-import * as _$_pyreon_core0 from "@pyreon/core";
 import { ComponentFn, Ref, SvgAttributes, VNodeChild } from "@pyreon/core";
-import * as _$_pyreon_reactivity0 from "@pyreon/reactivity";
 import { LoaderContext, NavigationGuard } from "@pyreon/router";
 import { Middleware } from "@pyreon/server";
@@ -272,7 +270,7 @@ interface LinkProps {
 /** Props passed to a custom component via createLink. */
 interface LinkRenderProps {
   href: string;
-  ref: _$_pyreon_core0.Ref<HTMLAnchorElement>;
+  ref: import('@pyreon/core').Ref<HTMLAnchorElement>;
   onClick: (e: MouseEvent) => void;
   onMouseEnter: () => void;
   onTouchStart: () => void;
@@ -289,7 +287,7 @@ interface LinkRenderProps {
 /** Return type of useLink. */
 interface UseLinkReturn {
   /** Ref object — attach to the root element for viewport-based prefetch. */
-  ref: _$_pyreon_core0.Ref<HTMLAnchorElement>;
+  ref: import('@pyreon/core').Ref<HTMLAnchorElement>;
   /** Click handler — performs client-side navigation. */
   handleClick: (e: MouseEvent) => void;
   /** Mouse enter handler — triggers hover prefetch. */
@@ -1191,7 +1189,7 @@ declare function buildMetaTags(props: Omit<MetaProps, 'title' | 'description' |
 //#region src/theme.d.ts
 type Theme = 'light' | 'dark' | 'system';
 /** Reactive theme signal. */
-declare const theme: _$_pyreon_reactivity0.Signal<Theme>;
+declare const theme: import("@pyreon/reactivity").Signal<Theme>;
 /**
  * Set the default theme for SSR (when `matchMedia` is unavailable).
  * Call once at server startup before rendering.

package/lib/types/link.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import * as _$_pyreon_core0 from "@pyreon/core";
 //#region src/link.d.ts
 interface LinkProps {
   /** Target URL path. */
@@ -26,7 +24,7 @@ interface LinkProps {
 /** Props passed to a custom component via createLink. */
 interface LinkRenderProps {
   href: string;
-  ref: _$_pyreon_core0.Ref<HTMLAnchorElement>;
+  ref: import('@pyreon/core').Ref<HTMLAnchorElement>;
   onClick: (e: MouseEvent) => void;
   onMouseEnter: () => void;
   onTouchStart: () => void;
@@ -43,7 +41,7 @@ interface LinkRenderProps {
 /** Return type of useLink. */
 interface UseLinkReturn {
   /** Ref object — attach to the root element for viewport-based prefetch. */
-  ref: _$_pyreon_core0.Ref<HTMLAnchorElement>;
+  ref: import('@pyreon/core').Ref<HTMLAnchorElement>;
   /** Click handler — performs client-side navigation. */
   handleClick: (e: MouseEvent) => void;
   /** Mouse enter handler — triggers hover prefetch. */

package/lib/types/server.d.ts CHANGED Viewed

@@ -1,6 +1,4 @@
-import * as _$_pyreon_core0 from "@pyreon/core";
 import { ComponentFn } from "@pyreon/core";
-import * as _$_pyreon_router0 from "@pyreon/router";
 import { RouteRecord } from "@pyreon/router";
 import { Middleware, MiddlewareContext } from "@pyreon/server";
 import { Plugin } from "vite";
@@ -36,8 +34,8 @@ interface CreateAppOptions {
  * Used internally by entry-server and entry-client.
  */
 declare function createApp(options: CreateAppOptions): {
-  App: () => _$_pyreon_core0.VNode;
-  router: _$_pyreon_router0.Router<string>;
+  App: () => import("@pyreon/core").VNode;
+  router: import("@pyreon/router").Router<string>;
 };
 //#endregion
 //#region src/api-routes.d.ts

package/lib/types/theme.d.ts CHANGED Viewed

@@ -1,10 +1,9 @@
-import * as _$_pyreon_reactivity0 from "@pyreon/reactivity";
 import { VNodeChild } from "@pyreon/core";
 //#region src/theme.d.ts
 type Theme = 'light' | 'dark' | 'system';
 /** Reactive theme signal. */
-declare const theme: _$_pyreon_reactivity0.Signal<Theme>;
+declare const theme: import("@pyreon/reactivity").Signal<Theme>;
 /**
  * Set the default theme for SSR (when `matchMedia` is unavailable).
  * Call once at server startup before rendering.

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/zero",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Pyreon Zero — zero-config full-stack framework powered by Pyreon and Vite",
   "license": "MIT",
   "author": "Vit Bokisch",
@@ -168,15 +168,15 @@
     "lint": "oxlint ."
   },
   "dependencies": {
-    "@pyreon/core": "^0.19.0",
-    "@pyreon/head": "^0.19.0",
-    "@pyreon/meta": "^0.19.0",
-    "@pyreon/reactivity": "^0.19.0",
-    "@pyreon/router": "^0.19.0",
-    "@pyreon/runtime-dom": "^0.19.0",
-    "@pyreon/runtime-server": "^0.19.0",
-    "@pyreon/server": "^0.19.0",
-    "@pyreon/vite-plugin": "^0.19.0",
+    "@pyreon/core": "^0.20.0",
+    "@pyreon/head": "^0.20.0",
+    "@pyreon/meta": "^0.20.0",
+    "@pyreon/reactivity": "^0.20.0",
+    "@pyreon/router": "^0.20.0",
+    "@pyreon/runtime-dom": "^0.20.0",
+    "@pyreon/runtime-server": "^0.20.0",
+    "@pyreon/server": "^0.20.0",
+    "@pyreon/vite-plugin": "^0.20.0",
     "vite": "^8.0.0"
   },
   "devDependencies": {

package/src/favicon.ts CHANGED Viewed

@@ -1,8 +1,43 @@
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import type { Plugin } from 'vite'
+/**
+ * Stable content hash (FNV-1a, 32-bit) of the favicon source file(s),
+ * rendered as a `?v=<hex>` cache-bust query for the injected `<head>`
+ * links. Browsers cache favicons extremely aggressively (often per-
+ * session / effectively forever), so with a stable URL a changed icon
+ * is never re-fetched by returning visitors. Same source bytes →
+ * identical query (no needless cache churn); changed bytes → new query
+ * → browser re-downloads. Falls back to `''` (no query, prior
+ * behaviour) if a source can't be read — never break the build over a
+ * cache-bust nicety. NOTE: this versions everything referenced via
+ * `<link>` (svg/png/apple-touch/manifest). The bare `/favicon.ico`
+ * convention request (browsers fetch it with no link tag) and the
+ * `site.webmanifest`'s internal icon entries keep stable URLs — those
+ * rely on host cache headers / are re-resolved on PWA (re)install.
+ */
+export function faviconVersionQuery(paths: string[]): string {
+  let h = 0x811c9dc5
+  let any = false
+  for (const p of paths) {
+    let buf: Buffer
+    try {
+      buf = readFileSync(p)
+    } catch {
+      continue
+    }
+    any = true
+    for (let i = 0; i < buf.length; i++) {
+      h ^= buf[i]!
+      h = Math.imul(h, 0x01000193)
+    }
+  }
+  if (!any) return ''
+  return `?v=${(h >>> 0).toString(16).padStart(8, '0')}`
+}
 let sharpWarned = false
 function warnSharpMissing() {
   if (sharpWarned) return
@@ -126,6 +161,17 @@ export function faviconPlugin(config: FaviconPluginConfig): Plugin {
   let root = ''
   let isBuild = false
+  // Lazily computed once per build/dev session (source rarely changes
+  // within a run; recomputing per index.html transform is wasteful).
+  let versionQuery: string | null = null
+  function getVersionQuery(): string {
+    if (versionQuery === null) {
+      const paths = [join(root, config.source)]
+      if (config.darkSource) paths.push(join(root, config.darkSource))
+      versionQuery = faviconVersionQuery(paths)
+    }
+    return versionQuery
+  }
   return {
     name: 'pyreon-zero-favicon',
@@ -156,7 +202,11 @@ export function faviconPlugin(config: FaviconPluginConfig): Plugin {
       }
       server.middlewares.use(async (req, res, next) => {
-        const url = req.url ?? ''
+        // Strip the `?v=<hash>` cache-bust query (and any query) before
+        // matching — the injected links carry it; dev serves fresh
+        // (`Cache-Control: no-cache`) so the version is irrelevant here,
+        // but a query in the path would break every name match below.
+        const url = (req.url ?? '').split('?')[0]!
         // Resolve locale-specific source
         const localeSource = resolveLocaleSource(url, config, root)
@@ -316,12 +366,44 @@ export function faviconPlugin(config: FaviconPluginConfig): Plugin {
         } as any)
       }
+      // Cache-bust: stamp the source content hash onto every injected
+      // favicon/manifest link href so a changed icon is actually
+      // re-downloaded by returning visitors (theme-swap toggles `media`,
+      // not `href`, so this is orthogonal to the light/dark variants).
+      const v = getVersionQuery()
+      if (v) {
+        for (const t of tags) {
+          if (t.tag === 'link' && t.attrs.href) t.attrs.href += v
+        }
+      }
       return tags
     },
     async generateBundle() {
       if (!isBuild) return
+      // `faviconPlugin` is in the plugin list and a `source` is configured
+      // (it's a required field), so the user clearly WANTS favicons. If
+      // `sharp` is missing, the old behaviour was a single swallow-able
+      // `console.warn` + emit nothing — i.e. silently ship a production
+      // site with zero favicons. That's the footgun. Fail the build loudly
+      // with an actionable message instead. Dev keeps the soft warning
+      // (see `warnSharpMissing`) so local iteration isn't blocked.
+      try {
+        await import('sharp')
+      } catch {
+        this.error(
+          '[Pyreon] faviconPlugin: a favicon `source` is configured but ' +
+            '`sharp` is not installed — NO favicons would be generated and ' +
+            'the production build would silently ship none.\n' +
+            '  Fix:    bun add -D sharp   (or: npm i -D sharp)\n' +
+            `  Source: ${config.source}\n` +
+            'To intentionally build without favicons, remove faviconPlugin() ' +
+            'from your Vite plugins.',
+        )
+      }
       // Generate favicons for the base (default) source
       await generateFaviconSet.call(this, root, config.source, config.darkSource, '', config, themeColor, backgroundColor, generateManifest)

package/src/image-plugin.ts CHANGED Viewed

@@ -229,23 +229,45 @@ export function imagePlugin(config: ImagePluginConfig = {}): Plugin {
       isBuild = resolvedConfig.command === 'build'
     },
-    async resolveId(id) {
-      // SVG as component: import Logo from './logo.svg?component'
-      if (svgOpts && id.includes('?component') && id.split('?')[0]!.endsWith('.svg')) {
-        return `\0virtual:zero-svg:${id}`
-      }
-      // Handle ?optimize query on image imports
-      if (id.includes('?optimize') && include.test(id.split('?')[0]!)) {
-        return `\0virtual:zero-image:${id}`
-      }
-      return null
+    async resolveId(id, importer) {
+      const isSvgComponent =
+        svgOpts && id.includes('?component') && id.split('?')[0]!.endsWith('.svg')
+      const isOptimize =
+        id.includes('?optimize') && include.test(id.split('?')[0]!)
+      if (!isSvgComponent && !isOptimize) return null
+      // Resolve the bare specifier to an ABSOLUTE fs path the way Vite
+      // resolves `?url` — importer-relative + alias-aware. The old code
+      // embedded the raw unresolved id, so `load()` had to guess: a
+      // relative `./img.png?optimize` resolved against cwd (≠ the
+      // importer's dir → ENOENT), and an aliased `~/x.png?optimize`
+      // arrived already-absolute and got `join(root,'public',…)`-doubled.
+      // `this.resolve` (skipSelf so we don't recurse into our own
+      // resolveId) handles relative + aliases + extensions. A public-dir
+      // web path (`/foo.png?optimize`) doesn't resolve to a module →
+      // null → keep the original id so load()'s public/ fallback applies.
+      const qIdx = id.indexOf('?')
+      const bare = qIdx === -1 ? id : id.slice(0, qIdx)
+      const query = qIdx === -1 ? '' : id.slice(qIdx)
+      const resolved = await this.resolve(bare, importer, { skipSelf: true })
+      const carried = resolved ? `${resolved.id}${query}` : id
+      if (isSvgComponent) return `\0virtual:zero-svg:${carried}`
+      return `\0virtual:zero-image:${carried}`
     },
     async load(id) {
       // SVG component loading
       if (id.startsWith('\0virtual:zero-svg:')) {
         const rawPath = id.replace('\0virtual:zero-svg:', '').split('?')[0] ?? id
-        const absPath = rawPath.startsWith('/') ? join(root, rawPath) : rawPath
+        // resolveId now carries an absolute fs path for relative/aliased
+        // imports → trust it if it exists. Only a public-dir web path
+        // (`/logo.svg`, unresolved) falls back to root-join.
+        const absPath = existsSync(rawPath)
+          ? rawPath
+          : rawPath.startsWith('/')
+            ? join(root, rawPath)
+            : rawPath
         if (!existsSync(absPath)) return null
         let svg = await readFile(absPath, 'utf-8')
@@ -287,7 +309,16 @@ export default function SvgComponent(props) {
       if (!id.startsWith('\0virtual:zero-image:')) return null
       const rawPath = id.replace('\0virtual:zero-image:', '').split('?')[0] ?? id
-      const absPath = rawPath.startsWith('/') ? join(root, 'public', rawPath) : rawPath
+      // resolveId now carries an absolute fs path for relative/aliased
+      // imports (the `./img.png?optimize` and `~/img.png?optimize` cases
+      // that used to ENOENT / double-`public`). Trust an existing
+      // absolute path; only an unresolved public-dir web path
+      // (`/foo.png?optimize`) falls back to `<root>/public/…`.
+      const absPath = existsSync(rawPath)
+        ? rawPath
+        : rawPath.startsWith('/')
+          ? join(root, 'public', rawPath)
+          : rawPath
       // CDN mode — rewrite URLs, no local processing
       if (cdn) {