one 1.24.8 → 1.25.2

package/src/vite/one.ts

@@ -8,6 +8,7 @@ import {
 import events from 'node:events'
 import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
+import { exactRegex } from 'rolldown/filter'
 import { normalizePath, type Plugin, type PluginOption } from 'vite'
 import { autoDepOptimizePlugin, getOptionsFilled, loadEnv } from 'vxrn'
 import vxrnVitePlugin from 'vxrn/vite-plugin'
@@ -37,6 +38,11 @@ import type { One } from './types'
 
 type MetroOptions = MetroPluginOptions
 
+// deep react-native Libraries/* paths that don't exist in react-native-web.
+// used as a rust-side resolveId filter so ordinary imports never reach js.
+const RN_DEEP_IMPORT_RE =
+  /^react-native\/Libraries\/|react-native-web(-lite)?\/.*\/Libraries\//
+
 /**
  * This needs a big refactor!
  * I guess these plugins are all being loaded by native??
@@ -388,6 +394,28 @@ export function one(options: One.PluginOptions = {}): PluginOption {
               } catch {}
             }
 
+            // load eagerly so the rust-side hook filter below can be built from
+            // the actual tsconfig prefixes. hook filters are fixed at
+            // registration time, so waiting for configResolved would mean no
+            // filter at all and a napi round trip for every import in the graph
+            loadMappings(root)
+
+            // only ids that could match a mapping reach js. if the eager load
+            // found nothing we can't narrow to prefixes, so fall back to "any
+            // bare specifier" — tsconfig paths are never relative or absolute,
+            // so this still drops every ./ and ../ import while staying correct
+            // if configResolved loads mappings later from a different root.
+            const tsconfigPathsFilter = mappings.length
+              ? new RegExp(
+                  mappings
+                    .map(
+                      (m) =>
+                        `^${m.prefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}${m.wildcard ? '' : '$'}`
+                    )
+                    .join('|')
+                )
+              : /^[^./]/
+
             return {
               name: 'one:tsconfig-paths',
               enforce: 'pre',
@@ -404,40 +432,43 @@ export function one(options: One.PluginOptions = {}): PluginOption {
                 }
               },
 
-              resolveId(source: string) {
-                const jsExts = [
-                  '.ts',
-                  '.tsx',
-                  '.js',
-                  '.jsx',
-                  '.mts',
-                  '.mjs',
-                  '.cjs',
-                  '.cts',
-                ]
-                for (const m of mappings) {
-                  let candidate: string | undefined
-                  if (m.wildcard) {
-                    if (source.startsWith(m.prefix)) {
-                      candidate = m.replacement + source.slice(m.prefix.length)
+              resolveId: {
+                filter: { id: tsconfigPathsFilter },
+                handler(source: string) {
+                  const jsExts = [
+                    '.ts',
+                    '.tsx',
+                    '.js',
+                    '.jsx',
+                    '.mts',
+                    '.mjs',
+                    '.cjs',
+                    '.cts',
+                  ]
+                  for (const m of mappings) {
+                    let candidate: string | undefined
+                    if (m.wildcard) {
+                      if (source.startsWith(m.prefix)) {
+                        candidate = m.replacement + source.slice(m.prefix.length)
+                      }
+                    } else if (source === m.prefix) {
+                      candidate = m.replacement
                     }
-                  } else if (source === m.prefix) {
-                    candidate = m.replacement
-                  }
-                  if (!candidate) continue
-                  // already has a js/ts extension
-                  if (jsExts.includes(path.extname(candidate))) return candidate
-                  // try appending extensions
-                  for (const e of jsExts) {
-                    if (existsSync(candidate + e)) return candidate + e
-                  }
-                  // try /index
-                  for (const e of jsExts) {
-                    if (existsSync(candidate + '/index' + e))
-                      return candidate + '/index' + e
+                    if (!candidate) continue
+                    // already has a js/ts extension
+                    if (jsExts.includes(path.extname(candidate))) return candidate
+                    // try appending extensions
+                    for (const e of jsExts) {
+                      if (existsSync(candidate + e)) return candidate + e
+                    }
+                    // try /index
+                    for (const e of jsExts) {
+                      if (existsSync(candidate + '/index' + e))
+                        return candidate + '/index' + e
+                    }
+                    return candidate
                   }
-                  return candidate
-                }
+                },
               },
             } satisfies Plugin
           })(),
@@ -471,24 +502,40 @@ export function one(options: One.PluginOptions = {}): PluginOption {
               android: resolveMap(a.android),
             }
 
+            // every alias is an exact source match, so the union of all keys is
+            // an exact rust-side filter. anything else never enters js.
+            const aliasKeys = [
+              ...new Set(
+                Object.values(resolved).flatMap((m) => (m ? Object.keys(m) : []))
+              ),
+            ]
+            const aliasFilter = aliasKeys.length
+              ? new RegExp(
+                  `^(?:${aliasKeys.map((k) => k.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|')})$`
+                )
+              : /(?!)/
+
             return {
               name: 'one:alias',
               enforce: 'pre',
-              resolveId(source) {
-                const env = this.environment?.name
-
-                // specific env wins over general
-                const specific = env ? resolved[env as keyof typeof resolved] : null
-                if (specific && source in specific) {
-                  return { id: specific[source], external: false }
-                }
+              resolveId: {
+                filter: { id: aliasFilter },
+                handler(source) {
+                  const env = this.environment?.name
+
+                  // specific env wins over general
+                  const specific = env ? resolved[env as keyof typeof resolved] : null
+                  if (specific && source in specific) {
+                    return { id: specific[source], external: false }
+                  }
 
-                // fall back to general (web/native)
-                const isWeb = !env || env === 'client' || env === 'ssr'
-                const general = isWeb ? resolved.web : resolved.native
-                if (general && source in general) {
-                  return { id: general[source], external: false }
-                }
+                  // fall back to general (web/native)
+                  const isWeb = !env || env === 'client' || env === 'ssr'
+                  const general = isWeb ? resolved.web : resolved.native
+                  if (general && source in general) {
+                    return { id: general[source], external: false }
+                  }
+                },
               },
             } satisfies Plugin
           })(),
@@ -501,21 +548,22 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       name: 'one:redirect-rn-deep-imports',
       enforce: 'pre',
 
-      resolveId(source) {
-        if (this.environment?.name === 'client' || this.environment?.name === 'ssr') {
-          if (
-            source.startsWith('react-native/Libraries/') ||
-            /react-native-web(-lite)?\/.*\/Libraries\//.test(source)
-          ) {
+      // rust-side filter matching the two source patterns below, so the ~24k
+      // non-matching imports in a build never enter js at all
+      resolveId: {
+        filter: { id: RN_DEEP_IMPORT_RE },
+        handler(source) {
+          if (this.environment?.name === 'client' || this.environment?.name === 'ssr') {
             return '\0rn-empty-module'
           }
-        }
+        },
       },
 
-      load(id) {
-        if (id === '\0rn-empty-module') {
+      load: {
+        filter: { id: exactRegex('\0rn-empty-module') },
+        handler() {
           return 'export default {}; export {};'
-        }
+        },
       },
     } satisfies Plugin,
 
@@ -734,15 +782,20 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       name: 'one:remove-server-from-client',
       enforce: 'pre',
 
-      transform(code, id) {
-        if (this.environment.name === 'client') {
-          if (id.includes(`one-server-only`)) {
-            return code.replace(
-              `import { AsyncLocalStorage } from "node:async_hooks"`,
-              `class AsyncLocalStorage {}`
-            )
-          }
-        }
+      // both conditions are rust-side: only one-server-only modules that
+      // actually contain the import cross into js
+      transform: {
+        filter: {
+          id: /one-server-only/,
+          code: 'import { AsyncLocalStorage } from "node:async_hooks"',
+        },
+        handler(code) {
+          if (this.environment.name !== 'client') return
+          return code.replace(
+            `import { AsyncLocalStorage } from "node:async_hooks"`,
+            `class AsyncLocalStorage {}`
+          )
+        },
       },
     },
 
@@ -773,7 +826,9 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     // (source) path. the optimizer doesn't recognize the real path, so it
     // loads from source — creating a duplicate instance.
     // this plugin forces optimized SSR deps to resolve via node_modules.
-    ssrSymlinkDedupPlugin,
+    // off by default, and every hook bails on `!dedupeSymlinks`, so skip
+    // registering it entirely rather than paying a napi round trip per import
+    ...(dedupeSymlinks ? [ssrSymlinkDedupPlugin] : []),
   ] satisfies Plugin[]
 
   // TODO move to single config and through environments

package/src/vite/plugins/bundledDevPlugin.ts

@@ -38,11 +38,13 @@ const MIME: Record<string, string> = {
 // FullBundleDev and diverges from the client's inlined data-uri → React hydration
 // mismatch. So the inliner runs on client (rolldown plugin) and ssr (top-level
 // transform) alike — see bundledDevPlugin().
+const ASSET_EXT_RE = /\.(png|jpe?g|gif|webp|avif|bmp|ico)/
+
 function inlineAssetImports(
   code: string,
   id: string
 ): { code: string; map: null } | null {
-  if (!/\.(png|jpe?g|gif|webp|avif|bmp|ico)/.test(code)) return null
+  if (!ASSET_EXT_RE.test(code)) return null
   const importRe =
     /import\s+(\w+)\s+from\s*['"]([^'"?]+\.(?:png|jpe?g|gif|webp|avif|bmp|ico))['"]\s*;?/g
   const base = id.split('?')[0]
@@ -78,12 +80,20 @@ export function bundledDevPlugin(enabled: boolean): Plugin {
 
     // mirror the client's asset inlining on the server env so SSR emits the same
     // data-uris (the rolldown client plugin above can't reach the ssr pipeline).
-    transform(code, id) {
-      if (!enabled) return
-      const env = (this as any).environment
-      if (!env || env.name !== 'ssr' || env.mode !== 'dev') return
-      return inlineAssetImports(code, id)
-    },
+    // bundledDev is off by default, so only register the hook when it's on, and
+    // let rust pre-filter on the asset extensions inlineAssetImports looks for.
+    ...(enabled
+      ? {
+          transform: {
+            filter: { code: ASSET_EXT_RE },
+            handler(code: string, id: string) {
+              const env = (this as any).environment
+              if (!env || env.name !== 'ssr' || env.mode !== 'dev') return
+              return inlineAssetImports(code, id)
+            },
+          },
+        }
+      : {}),
 
     config(_userConfig, env) {
       if (!enabled || env.command !== 'serve') return

package/src/vite/plugins/criticalCSSPlugin.test.ts

@@ -13,32 +13,16 @@ describe('criticalCSSPlugin', () => {
   })
 
   describe('resolveId', () => {
-    it('should return null for non-inline CSS imports', async () => {
+    // non-matching ids are now rejected by the rust-side hook filter, so the
+    // handler never runs for them. assert the filter itself does that.
+    it('filters out non-inline CSS imports before the handler runs', async () => {
       const { criticalCSSPlugin } = await import('./criticalCSSPlugin')
       const plugin = criticalCSSPlugin()
+      const filter = (plugin.resolveId as any).filter.id as RegExp
 
-      ;(plugin.configResolved as any)({ root: PROJECT_ROOT })
-
-      const result = await (plugin.resolveId as any).call(
-        { resolve: vi.fn() },
-        './styles.css',
-        resolve('/project/src/App.tsx')
-      )
-      expect(result).toBeNull()
-    })
-
-    it('should return null for non-css imports', async () => {
-      const { criticalCSSPlugin } = await import('./criticalCSSPlugin')
-      const plugin = criticalCSSPlugin()
-
-      ;(plugin.configResolved as any)({ root: PROJECT_ROOT })
-
-      const result = await (plugin.resolveId as any).call(
-        { resolve: vi.fn() },
-        './data.json',
-        resolve('/project/src/App.tsx')
-      )
-      expect(result).toBeNull()
+      expect(filter.test('./styles.css')).toBe(false)
+      expect(filter.test('./data.json')).toBe(false)
+      expect(filter.test('./styles.inline.css')).toBe(true)
     })
 
     it('should resolve .inline.css and track it', async () => {
@@ -53,7 +37,7 @@ describe('criticalCSSPlugin', () => {
       })
 
       const importerPath = resolve('/project/src/App.tsx')
-      const result = await (plugin.resolveId as any).call(
+      const result = await (plugin.resolveId as any).handler.call(
         { resolve: mockResolve },
         './styles.inline.css',
         importerPath
@@ -77,7 +61,7 @@ describe('criticalCSSPlugin', () => {
         id: resolve('/project/src/layout.inline.css'),
       })
 
-      await (plugin.resolveId as any).call(
+      await (plugin.resolveId as any).handler.call(
         { resolve: mockResolve },
         './layout.inline.css',
         resolve('/project/src/App.tsx')
@@ -98,7 +82,7 @@ describe('criticalCSSPlugin', () => {
 
       const mockResolve = vi.fn().mockResolvedValue(null)
 
-      const result = await (plugin.resolveId as any).call(
+      const result = await (plugin.resolveId as any).handler.call(
         { resolve: mockResolve },
         './nonexistent.inline.css',
         resolve('/project/src/App.tsx')
@@ -119,7 +103,7 @@ describe('criticalCSSPlugin', () => {
       const mockResolve = vi.fn().mockResolvedValue({
         id: resolve('/project/app/layout.inline.css'),
       })
-      await (plugin.resolveId as any).call(
+      await (plugin.resolveId as any).handler.call(
         { resolve: mockResolve },
         './layout.inline.css',
         resolve('/project/app/_layout.tsx')

package/src/vite/plugins/criticalCSSPlugin.ts

@@ -15,6 +15,9 @@ import type { Plugin } from 'vite'
  */
 
 const INLINE_CSS_EXT = '.inline.css'
+// rust-side hook filter, so non-css ids never cross into js. exactly equivalent
+// to the `id.endsWith(INLINE_CSS_EXT)` guard it replaced.
+const INLINE_CSS_RE = /\.inline\.css$/
 
 // source paths of CSS files with .inline.css extension (relative to root)
 const criticalCSSSources = new Set<string>()
@@ -57,19 +60,20 @@ export function criticalCSSPlugin(): Plugin {
       root = config.root
     },
 
-    async resolveId(id, importer) {
-      if (!id.endsWith(INLINE_CSS_EXT)) return null
+    resolveId: {
+      filter: { id: INLINE_CSS_RE },
+      async handler(id, importer) {
+        const resolved = await this.resolve(id, importer, { skipSelf: true })
 
-      const resolved = await this.resolve(id, importer, { skipSelf: true })
+        if (resolved) {
+          // store as relative path to match manifest keys (forward slashes to match Vite)
+          const relativePath = normalizePath(relative(root, resolved.id))
+          criticalCSSSources.add(relativePath)
+          return resolved
+        }
 
-      if (resolved) {
-        // store as relative path to match manifest keys (forward slashes to match Vite)
-        const relativePath = normalizePath(relative(root, resolved.id))
-        criticalCSSSources.add(relativePath)
-        return resolved
-      }
-
-      return null
+        return null
+      },
     },
   }
 }

package/src/vite/plugins/environmentGuardPlugin.ts

@@ -19,6 +19,7 @@
  * platform, not by consumer type.
  */
 
+import { prefixRegex } from 'rolldown/filter'
 import type { Plugin } from 'vite'
 
 const VIRTUAL_PREFIX = '\0one-env-guard:'
@@ -30,6 +31,9 @@ const GUARD_SPECIFIERS = [
   'web-only',
 ] as const
 
+// derived so the hook filter can never drift from the list above
+const GUARD_SPECIFIERS_RE = new RegExp(`^(?:${GUARD_SPECIFIERS.join('|')})$`)
+
 type GuardSpecifier = (typeof GUARD_SPECIFIERS)[number]
 type ViteEnvironment = 'client' | 'ssr' | 'ios' | 'android'
 
@@ -141,15 +145,24 @@ export function environmentGuardPlugin(options?: EnvironmentGuardOptions): Plugi
     name: 'one:environment-guard',
     enforce: 'pre',
 
-    resolveId(source) {
-      const envName = this.environment?.name
-      if (!envName) return null
-      const consumer = this.environment?.config?.consumer
-      return resolveEnvironmentGuard(source, envName, consumer, options)
+    // filters are evaluated in rust, so non-guard ids never cross into js.
+    // without them every import in the graph paid a napi round trip to be told
+    // it wasn't one of these four specifiers.
+    resolveId: {
+      filter: { id: GUARD_SPECIFIERS_RE },
+      handler(source) {
+        const envName = this.environment?.name
+        if (!envName) return null
+        const consumer = this.environment?.config?.consumer
+        return resolveEnvironmentGuard(source, envName, consumer, options)
+      },
     },
 
-    load(id) {
-      return loadEnvironmentGuard(id)
+    load: {
+      filter: { id: prefixRegex(VIRTUAL_PREFIX) },
+      handler(id) {
+        return loadEnvironmentGuard(id)
+      },
     },
   }
 }

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -699,9 +699,13 @@ export function createFileSystemRouterPlugin(
       // 404s in this mode, so point preloads (and bootstrap) at the bundled url.
       const clientEnv = server.environments?.client as any
       if (clientEnv?.config?.isBundled || clientEnv?.bundledDev) {
-        // bundled mode: the HMR client + refresh runtime are bundled into the
-        // entry; /@vite/client doesn't exist as a standalone module (404s).
-        preloads = ['/assets/_virtual_one-entry.js']
+        // bundled mode: /@vite/client doesn't exist as a standalone module
+        // (404s). vite 8.2 moved the bundled-dev client out of the entry bundle
+        // and serves it standalone at /bundledDevClient.mjs; it defines
+        // __rolldown_runtime__, which the entry calls on nearly every module, so
+        // it has to load first or nothing hydrates. bootstrapModules emits these
+        // in order, and module scripts execute in order.
+        preloads = ['/bundledDevClient.mjs', '/assets/_virtual_one-entry.js']
       }
 
       // change this to .server to test using the indepedently scoped env

package/src/vite/plugins/imageDataPlugin.test.ts

@@ -35,29 +35,17 @@ describe('imageDataPlugin', () => {
   })
 
   describe('resolveId', () => {
-    it('should return null for non-imagedata imports', async () => {
+    // these ids are now rejected by the rust-side hook filter, so the handler
+    // never runs for them. assert the filter itself does that.
+    it('filters out ids without a trailing ?imagedata', async () => {
       const { imageDataPlugin } = await import('./imageDataPlugin')
       const plugin = imageDataPlugin()
+      const filter = (plugin.resolveId as any).filter.id as RegExp
 
-      if (plugin.configResolved) {
-        ;(plugin.configResolved as any)(mockConfig())
-      }
-
-      const result = await (plugin.resolveId as any)('./image.jpg', undefined)
-      expect(result).toBeNull()
-    })
-
-    it('should return null for imports with imagedata not as suffix', async () => {
-      const { imageDataPlugin } = await import('./imageDataPlugin')
-      const plugin = imageDataPlugin()
-
-      if (plugin.configResolved) {
-        ;(plugin.configResolved as any)(mockConfig())
-      }
-
+      expect(filter.test('./image.jpg')).toBe(false)
       // ?imagedata in the middle should not match
-      const result = await (plugin.resolveId as any)('./image?imagedata.jpg', undefined)
-      expect(result).toBeNull()
+      expect(filter.test('./image?imagedata.jpg')).toBe(false)
+      expect(filter.test('./image.jpg?imagedata')).toBe(true)
     })
 
     it('should resolve public dir paths starting with /', async () => {
@@ -68,7 +56,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '/test-image.jpg?imagedata',
         undefined
       )
@@ -83,7 +71,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         './test-image.jpg?imagedata',
         HERO_FILE
       )
@@ -98,7 +86,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '/nonexistent.jpg?imagedata',
         undefined
       )
@@ -115,7 +103,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '/../../../etc/passwd?imagedata',
         undefined
       )
@@ -130,7 +118,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '../../../../etc/passwd?imagedata',
         HERO_FILE
       )
@@ -145,7 +133,7 @@ describe('imageDataPlugin', () => {
         ;(plugin.configResolved as any)(mockConfig())
       }
 
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '../../../etc/passwd?imagedata',
         undefined
       )
@@ -162,7 +150,7 @@ describe('imageDataPlugin', () => {
 
       // Going up and back down should still work if within bounds
       // From /project/src/components, ../.. goes to /project, then src/test-image.jpg
-      const result = await (plugin.resolveId as any)(
+      const result = await (plugin.resolveId as any).handler(
         '../../src/test-image.jpg?imagedata',
         HERO_FILE
       )
@@ -171,20 +159,13 @@ describe('imageDataPlugin', () => {
   })
 
   describe('load', () => {
-    it('should return null for non-virtual modules', async () => {
+    it('filters out non-virtual modules before the handler runs', async () => {
       const { imageDataPlugin } = await import('./imageDataPlugin')
       const plugin = imageDataPlugin()
+      const filter = (plugin.load as any).filter.id as RegExp
 
-      if (plugin.configResolved) {
-        ;(plugin.configResolved as any)(mockConfig())
-      }
-
-      const mockContext = {
-        addWatchFile: vi.fn(),
-      }
-
-      const result = await (plugin.load as any).call(mockContext, './image.jpg')
-      expect(result).toBeNull()
+      expect(filter.test('./image.jpg')).toBe(false)
+      expect(filter.test('\0imagedata:/abs/path/image.jpg')).toBe(true)
     })
 
     it('should return fallback data when sharp fails', async () => {
@@ -203,7 +184,7 @@ describe('imageDataPlugin', () => {
 
       // This will fail because the file doesn't actually exist
       // But it should gracefully fallback
-      const result = await (plugin.load as any).call(
+      const result = await (plugin.load as any).handler.call(
         mockContext,
         '\0imagedata:' + testFilePath
       )
@@ -248,7 +229,7 @@ describe('imageDataPlugin output format', () => {
 
     const testFilePath = resolve(PUBLIC_DIR, 'test-image.jpg')
 
-    const result = await (plugin.load as any).call(
+    const result = await (plugin.load as any).handler.call(
       mockContext,
       '\0imagedata:' + testFilePath
     )