peachsim 0.1.577 → 0.1.579

package/src/vite-plugin.ts

@@ -22,6 +22,7 @@ import {
   compatStubsForBuildResolver,
   reactNativeDeepStubsForBuildResolver,
 } from '../../peach-compat/src/stub-manifest.ts'
+import { isExpoHostSocketModule } from '../../peach-engine/src/guest-module-overrides.ts'
 import { resolveSootsimBridgePort } from './bridge-constants.ts'
 import {
   SHELL_BRIDGE_IDENTITY_PATH,
@@ -58,6 +59,10 @@ const compatRoot = path.resolve(sootsimRoot, '..', 'peach-compat')
 // renames of either package don't break things.
 const engineRoot = path.resolve(workspaceRoot, 'packages/peach-engine')
 const rnShimPath = path.resolve(engineRoot, 'src/react-native/index.ts')
+const rnAssetRegistryPath = path.resolve(
+  workspaceNodeModules,
+  'react-native/src/asset-registry.js',
+)
 const reactBridgePath = path.resolve(
   workspaceRoot,
   'packages/contrast-kit/src/react-bridge.ts',
@@ -81,6 +86,14 @@ const compatStubsDir = path.resolve(compatRoot, 'src/stubs')
 const nativeAutoStubPath = path.resolve(compatStubsDir, 'native-auto-stub.ts')
 const rnDeepStubDefault = path.resolve(compatStubsDir, 'react-native-internals.ts')
 
+function hasExactFileName(candidate: string): boolean {
+  // a differently cased native file must not shadow a directory entry on macos.
+  return (
+    fs.existsSync(candidate) &&
+    fs.readdirSync(path.dirname(candidate)).includes(path.basename(candidate))
+  )
+}
+
 function getInternalTamaguiPackages(): string[] {
   try {
     const scoped = fs
@@ -232,62 +245,6 @@ const expoUiJetpackComposeRealAliases = [
   }
 })
 
-// these components are upstream pure JS and should load unchanged over the
-// native seam. gesture handler 3 still supplies ReanimatedSwipeable but removed
-// DrawerLayout, so the latter resolves from the explicit v2 compatibility
-// alias. exact subpath aliases must precede the root facade alias.
-function rnghSubpathRealPath(packageName: string, subpath: string): string | null {
-  try {
-    const packageJsonPath = sootsimPluginRequire.resolve(
-      `${packageName}/${subpath}/package.json`,
-    )
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
-    const moduleEntry = packageJson?.module
-    if (typeof moduleEntry !== 'string' || moduleEntry.length === 0) return null
-    const modulePath = path.resolve(path.dirname(packageJsonPath), moduleEntry)
-    if (fs.existsSync(modulePath) && fs.statSync(modulePath).isFile()) return modulePath
-    const jsPath = `${modulePath}.js`
-    if (fs.existsSync(jsPath)) return jsPath
-    const indexPath = path.join(modulePath, 'index.js')
-    return fs.existsSync(indexPath) ? indexPath : null
-  } catch {
-    return null
-  }
-}
-
-const rnghReanimatedSwipeableRealPath = rnghSubpathRealPath(
-  'react-native-gesture-handler',
-  'ReanimatedSwipeable',
-)
-const rnghDrawerLayoutRealPath = rnghSubpathRealPath(
-  'react-native-gesture-handler-v2',
-  'DrawerLayout',
-)
-
-const rnghGestureHandlerRootViewContextRealPath = (() => {
-  try {
-    return path.join(
-      path.dirname(
-        sootsimPluginRequire.resolve('react-native-gesture-handler/package.json'),
-      ),
-      'lib/module/GestureHandlerRootViewContext.js',
-    )
-  } catch {
-    return null
-  }
-})()
-const rnghGestureHandlerRootViewContextShimPath = path.resolve(
-  compatStubsDir,
-  'rngh-gesture-handler-root-view-context.ts',
-)
-const rnghRootStubPath = path.resolve(compatStubsDir, 'react-native-gesture-handler.ts')
-const rnghLibModuleRoots = [
-  rnghGestureHandlerRootViewContextRealPath
-    ? path.dirname(rnghGestureHandlerRootViewContextRealPath)
-    : null,
-  rnghDrawerLayoutRealPath ? path.dirname(path.dirname(rnghDrawerLayoutRealPath)) : null,
-].filter((root): root is string => root !== null)
-
 const compatWrapperRealPackageAliases: Array<{
   find: string
   replacement: string
@@ -324,7 +281,6 @@ const coreOwnedPackages = [
   'react/jsx-dev-runtime',
   'canvaskit-wasm',
   'canvaskit-wasm/full',
-  'yoga-layout',
 ]
 
 const nativePackagePatterns = [
@@ -385,7 +341,7 @@ export function sootsim(options: SootSimOptions = {}): Plugin[] {
       },
     },
     sootsimConfigPlugin(appDir, extraSources, publishedBrowserPackages),
-    rnghUpstreamInternalResolvePlugin(),
+    expoHostSocketBootstrapRedirect(),
     fixJsxRuntimeExports(),
     flowStripTransform(),
     nodeModulesJsxTransform(),
@@ -408,6 +364,27 @@ export function sootsim(options: SootSimOptions = {}): Plugin[] {
   ]
 }
 
+function expoHostSocketBootstrapRedirect(): Plugin {
+  const target = '\0sootsim:expo-host-socket-bootstrap'
+  return {
+    name: 'sootsim-expo-host-socket-bootstrap',
+    enforce: 'pre',
+    resolveId(source, importer) {
+      if (isExpoHostSocketModule(stripViteQuery(source))) return target
+      if (!importer || !source.startsWith('.')) return null
+      const candidate = path.resolve(
+        path.dirname(stripViteQuery(importer)),
+        stripViteQuery(source),
+      )
+      return isExpoHostSocketModule(candidate) ? target : null
+    },
+    load(id) {
+      if (id !== target) return null
+      return 'export default function noopExpoHostSocketBootstrap() {}'
+    },
+  }
+}
+
 function stripViteQuery(id: string): string {
   return id.split('?')[0]
 }
@@ -417,41 +394,6 @@ function isPathInside(child: string, parent: string): boolean {
   return rel === '' || (!!rel && !rel.startsWith('..') && !path.isAbsolute(rel))
 }
 
-function rnghUpstreamInternalResolvePlugin(): Plugin {
-  return {
-    name: 'sootsim-rngh-upstream-internal-resolve',
-    enforce: 'pre',
-    resolveId: {
-      filter: {
-        id: /(?:^\.\.\/\.\.(?:\.(?:js|jsx|mjs|ts|tsx))?$|GestureDetector(?:\.(?:js|jsx|mjs|ts|tsx))?$|GestureHandlerRootViewContext(?:\.(?:js|jsx|mjs|ts|tsx))?$|(?:PanGestureHandler|TapGestureHandler|State)(?:\.(?:js|jsx|mjs|ts|tsx))?$)/,
-      },
-      handler(source, importer) {
-        if (!importer || rnghLibModuleRoots.length === 0) return null
-        const importerPath = stripViteQuery(importer)
-        if (!rnghLibModuleRoots.some((root) => isPathInside(importerPath, root))) {
-          return null
-        }
-        const sourcePath = source.replace(/\.(js|jsx|mjs|ts|tsx)$/, '')
-        if (
-          sourcePath === '../..' ||
-          sourcePath.endsWith('/handlers/gestures/GestureDetector') ||
-          // upstream's DrawerLayout builds on the old-API handlers and the
-          // State enum; both come from our seam, not upstream's native modules.
-          sourcePath.endsWith('/handlers/PanGestureHandler') ||
-          sourcePath.endsWith('/handlers/TapGestureHandler') ||
-          sourcePath === '../State'
-        ) {
-          return rnghRootStubPath
-        }
-        if (sourcePath.endsWith('GestureHandlerRootViewContext')) {
-          return rnghGestureHandlerRootViewContextShimPath
-        }
-        return null
-      },
-    },
-  }
-}
-
 // shared worker plugin chain for the engine's shell-host build (used by
 // both `vite.config.ts` for dev/watch and `vite.build.config.ts` for prod).
 // keep these here — duplicating the list inline drifts (which is exactly how
@@ -499,7 +441,6 @@ export function engineShellWorkerPlugins(): Plugin[] {
     reanimatedNativeSeamRedirect(),
     manifestNativeSeamRedirect(),
     keyboardControllerBindingsRedirect(),
-    rnghUpstreamInternalResolvePlugin(),
     workletsBabelTransform(() => true),
     workerBootChunkPlugin(ENGINE_WORKER_BOOT_CLOSURES),
   ]
@@ -523,27 +464,44 @@ export type WorkerBootClosure = {
   // substring of the worker entry module id this applies to
   entry: string
   // byte cap on the rendered worker file; fix excess boot dependencies and
-  // unneeded inclusions rather than raising the cap
+  // unneeded inclusions rather than raising the cap.
+  // a cap failure in a worktree whose node_modules is symlinked from another
+  // tree is suspect: workspace modules resolve into the other tree and bundle
+  // twice (~1MB rendered here). re-run with a real `bun install` first.
   maxBytes: number
 }
 
 const ENGINE_WORKER_BOOT_CLOSURES: WorkerBootClosure[] = [
   // these workers inline their dynamic imports, so anything reachable from the
   // entry lands in the boot file whether or not it runs. that is why the font
-  // parser is not reachable from either one: only the tenant reads a face's
+  // parser is not reachable from any of them: only the tenant reads a face's
   // name table, and it sends the aliases and metrics it read on the wire
   // (engine/app-font-registry.ts registerForwardedAppFonts). keep it that way
-  // when adding font work here, or both caps take the parser again.
+  // when adding font work here, or every cap takes the parser again.
   // measured 3,406,869 bytes after the shell engine config split: the shell
   // worker installs a slim config without the list, modal, slider, swipeable,
   // and tab components nothing shell-side reads (compat-bridge composes the
   // full config for main, tenant, headless, and external realms on top of
   // it), and the gesture-handler stub imports TouchableNativeFeedback
   // statically instead of require()ing the whole react-native namespace into
-  // the boot file.
-  { entry: 'src/render-worker/shell-worker-entry.ts', maxBytes: 3_451_000 },
-  { entry: 'src/render-worker/compositor-worker-entry.ts', maxBytes: 1_085_000 },
-  { entry: 'src/render-worker/compositor-worker-ganesh-entry.ts', maxBytes: 1_820_000 },
+  // the boot file. the shell worker is one file per compositor backend, so
+  // each carries only its own CanvasKit glue: 3,263,311 graphite and
+  // 3,256,832 ganesh bytes when the split landed, down from 3,386,929 with both.
+  { entry: 'src/render-worker/shell-worker-entry.ts', maxBytes: 3_310_000 },
+  { entry: 'src/render-worker/shell-worker-ganesh-entry.ts', maxBytes: 3_300_000 },
+  { entry: 'src/render-worker/compositor-worker-entry.ts', maxBytes: 1_200_000 },
+  { entry: 'src/render-worker/compositor-worker-ganesh-entry.ts', maxBytes: 1_110_000 },
+]
+
+// packages whose manifests omit `sideEffects` (metro never tree-shakes, so
+// upstream has no reason to declare it), which makes rolldown keep every module
+// their index reaches even when the worker reads none of it.
+// @gorhom/bottom-sheet's index reaches BottomSheetFlashList, whose top-level
+// optional require('@shopify/flash-list') put all of flash-list, plus the
+// sheet's unused modal, list, and text input components, in the shell worker
+// although the shell renders only the plain sheet: 67kB of the boot file.
+const WORKER_SIDE_EFFECT_FREE_PACKAGES = [
+  { test: /\/node_modules\/@gorhom\/bottom-sheet\//, sideEffects: false },
 ]
 
 export function workerBootChunkPlugin(closures: WorkerBootClosure[]): Plugin {
@@ -557,6 +515,13 @@ export function workerBootChunkPlugin(closures: WorkerBootClosure[]): Plugin {
         typeof input === 'string'
           ? (closures.find((candidate) => input.includes(candidate.entry)) ?? null)
           : null
+      if (!closure) return null
+      const treeshake =
+        typeof inputOptions.treeshake === 'object' ? inputOptions.treeshake : {}
+      return {
+        ...inputOptions,
+        treeshake: { ...treeshake, moduleSideEffects: WORKER_SIDE_EFFECT_FREE_PACKAGES },
+      }
     },
     outputOptions(options) {
       if (!closure) return null
@@ -572,8 +537,33 @@ export function workerBootChunkPlugin(closures: WorkerBootClosure[]): Plugin {
       }
       const bytes = Buffer.byteLength(chunks[0].code)
       if (bytes > closure.maxBytes) {
+        const chunk = chunks[0]
+        const pkgs = new Map<string, Set<string>>()
+        for (const id of chunk.moduleIds) {
+          const nmIndex = id.lastIndexOf('/node_modules/')
+          if (nmIndex !== -1) {
+            const rest = id.slice(nmIndex + '/node_modules/'.length)
+            const pkgMatch = rest.match(/^(?:@[^/]+\/)?[^/]+/)
+            if (pkgMatch) {
+              const pkgName = pkgMatch[0]
+              if (!pkgs.has(pkgName)) pkgs.set(pkgName, new Set())
+              const baseDir = id.slice(
+                0,
+                nmIndex + '/node_modules/'.length + pkgName.length,
+              )
+              pkgs.get(pkgName)!.add(baseDir)
+            }
+          }
+        }
+        const duplicates = [...pkgs.entries()]
+          .filter(([, dirs]) => dirs.size > 1)
+          .map(([name, dirs]) => `${name} (${[...dirs].join(', ')})`)
+        const dupDetail =
+          duplicates.length > 0
+            ? `\ndetected duplicate packages bundled from multiple roots (likely a symlinked or cross-tree node_modules):\n  ${duplicates.join('\n  ')}`
+            : ''
         this.error(
-          `worker ${closure.entry}: ${chunks[0].fileName} is ${bytes} bytes, over the ${closure.maxBytes} byte cap; eliminate excess boot dependencies rather than raising the cap`,
+          `worker ${closure.entry}: ${chunks[0].fileName} is ${bytes} bytes, over the ${closure.maxBytes} byte cap; eliminate excess boot dependencies rather than raising the cap${dupDetail}`,
         )
       }
     },
@@ -610,13 +600,13 @@ export function keyboardControllerBindingsRedirect(): Plugin {
     for (const ext of nativeExts) {
       const candidate = base + ext
       try {
-        if (fs.existsSync(candidate)) return candidate
+        if (hasExactFileName(candidate)) return candidate
       } catch {}
     }
     for (const ext of nativeExts) {
       const candidate = path.join(base, 'index' + ext)
       try {
-        if (fs.existsSync(candidate)) return candidate
+        if (hasExactFileName(candidate)) return candidate
       } catch {}
     }
     return null
@@ -679,6 +669,7 @@ export function keyboardControllerBindingsRedirect(): Plugin {
 // vite's worker build. redirect the validate script to a no-op stub.
 const reanimatedNativeSeamFiles = new Set([
   'NativeReanimatedModule',
+  'NativeWorkletsModule',
   'scrollTo',
   'measure',
   'setNativeProps',
@@ -700,7 +691,7 @@ export function reanimatedNativeSeamRedirect(): Plugin {
     enforce: 'pre',
     resolveId: {
       filter: {
-        id: /(?:^react-native-worklets\/package\.json$|^react-native-reanimated\/scripts\/validate-worklets-version(?:\.js)?$|(?:^|\/)(?:fabricUtils|NativeReanimatedModule|scrollTo|measure|setNativeProps|dispatchCommand|setGestureState)(?:\.(?:native|web|ios|android))?$)/,
+        id: /(?:^react-native-worklets\/package\.json$|^react-native-reanimated\/scripts\/validate-worklets-version(?:\.js)?$|(?:^|\/)(?:fabricUtils|NativeReanimatedModule|NativeWorkletsModule|scrollTo|measure|setNativeProps|dispatchCommand|setGestureState)(?:\.(?:native|web|ios|android))?$)/,
       },
       handler(source, importer) {
         // upstream's `assertWorkletsVersion` (DEV-only) imports a build-time
@@ -738,6 +729,9 @@ export function reanimatedNativeSeamRedirect(): Plugin {
           return reanimatedFabricUtilsRedirectPath
         }
         if (!reanimatedNativeSeamFiles.has(basename)) return null
+        if (basename === 'NativeWorkletsModule') {
+          return path.resolve(compatStubsDir, 'react-native-worklets-native.ts')
+        }
         if (process.env.SOOTSIM_REANIMATED_REDIRECT_DEBUG) {
           console.log(
             '[reanimatedRedirect]',
@@ -1029,11 +1023,12 @@ function sootsimConfigPlugin(
         // their parent package (e.g. foo) — vite processes aliases in order
         .sort((a, b) => b[0].length - a[0].length)
         .map(([find, file]) => ({
-          // the bare expo entry is a facade while its package subpaths are
-          // independent upstream modules. a string alias is prefix-matched by
-          // vite, so make this one exact or expo/devtools and future subpaths
-          // become impossible paths such as expo.ts/devtools.
-          find: find === 'expo' ? /^expo$/ : find,
+          // these stubs replace only the package root; their pure-js subpaths
+          // (core's modules, screens' experimental Split) run upstream.
+          find:
+            find === 'expo-modules-core' || find === 'react-native-screens'
+              ? new RegExp(`^${find}$`)
+              : find,
           replacement: path.resolve(compatStubsDir, file),
         }))
 
@@ -1195,13 +1190,21 @@ function sootsimConfigPlugin(
           alias: [
             ...sootsimBrowserSourceAliases,
             ...publishedBrowserEntryAliases,
+            {
+              find: /^@react-native\/assets-registry\/registry$/,
+              replacement: rnAssetRegistryPath,
+            },
             ...Object.entries(rnLibraryStubs).map(([find, replacement]) => ({
               find,
               replacement,
             })),
             { find: /^react-native\/Libraries\/.*/, replacement: rnDeepStubDefault },
-            { find: 'react-native', replacement: rnShimPath },
-            { find: 'react-native-web', replacement: rnShimPath },
+            {
+              find: /^react-native\/asset-registry$/,
+              replacement: rnAssetRegistryPath,
+            },
+            { find: /^react-native$/, replacement: rnShimPath },
+            { find: /^react-native-web$/, replacement: rnShimPath },
             // resolved-path alias for the synthetic specifier the
             // @react-navigation/native compat wrapper imports from. terminates
             // the wrapper's own real-package import without re-entering the
@@ -1233,22 +1236,6 @@ function sootsimConfigPlugin(
                 ]
               : []),
             ...expoUiJetpackComposeRealAliases,
-            ...(rnghReanimatedSwipeableRealPath
-              ? [
-                  {
-                    find: /^react-native-gesture-handler\/ReanimatedSwipeable$/,
-                    replacement: rnghReanimatedSwipeableRealPath,
-                  },
-                ]
-              : []),
-            ...(rnghDrawerLayoutRealPath
-              ? [
-                  {
-                    find: /^(?:react-native-gesture-handler|react-native-gesture-handler-v2)\/DrawerLayout$/,
-                    replacement: rnghDrawerLayoutRealPath,
-                  },
-                ]
-              : []),
             ...stubAliases,
           ],
         },
@@ -1439,13 +1426,13 @@ function sootsimEsbuildPlugin(appDir: string) {
         for (const ext of platformExts) {
           const candidate = resolved + ext
           try {
-            if (fs.existsSync(candidate)) return { path: candidate }
+            if (hasExactFileName(candidate)) return { path: candidate }
           } catch {}
         }
         for (const ext of platformExts) {
           const candidate = path.join(resolved, 'index' + ext)
           try {
-            if (fs.existsSync(candidate)) return { path: candidate }
+            if (hasExactFileName(candidate)) return { path: candidate }
           } catch {}
         }
         const allExts = [...platformExts, '.tsx', '.ts', '.jsx', '.js', '.mjs', '.cjs']
@@ -1455,7 +1442,7 @@ function sootsimEsbuildPlugin(appDir: string) {
             for (const pext of platformExts) {
               const candidate = base + pext
               try {
-                if (fs.existsSync(candidate)) return { path: candidate }
+                if (hasExactFileName(candidate)) return { path: candidate }
               } catch {}
             }
             break
@@ -1614,7 +1601,7 @@ export function workletsBabelTransform(
 // pipeline; vite/rolldown/oxc do not. detect the `@flow` pragma in node_modules and
 // run @babel/plugin-transform-flow-strip-types so the wrapper-real seam can pull
 // in the real upstream JS without re-implementing it locally. mirrored in
-// scripts/build-bundler-deps.ts so esbuild-based dep prebundles stay in sync.
+// scripts/build/bundler-deps.ts so esbuild-based dep prebundles stay in sync.
 let flowBabel: typeof import('@babel/core') | null = null
 let flowStripPlugin: import('@babel/core').PluginItem | null = null
 let jsxSyntaxPlugin: import('@babel/core').PluginItem | null = null
@@ -1698,13 +1685,13 @@ function metroNativeResolve(isAppSource: (p: string) => boolean): Plugin {
     for (const ext of platformExts) {
       const candidate = base + ext
       try {
-        if (fs.existsSync(candidate)) return candidate
+        if (hasExactFileName(candidate)) return candidate
       } catch {}
     }
     for (const ext of platformExts) {
       const candidate = path.join(base, 'index' + ext)
       try {
-        if (fs.existsSync(candidate)) return candidate
+        if (hasExactFileName(candidate)) return candidate
       } catch {}
     }
     return null

package/src/vite.d.ts

@@ -0,0 +1,10 @@
+import type { Plugin } from 'vite'
+
+export interface PeachPluginOptions {
+  bundleUrl?: string
+  prefix?: string
+  enabled?: boolean
+  open?: boolean | { appName: string }
+}
+
+export declare function rnxPlugin(options?: PeachPluginOptions): Plugin

package/cli/resolve-assets.ts

@@ -1,63 +0,0 @@
-// resolve peach's bundled assets (fonts, icons, sounds)
-// regardless of how the package was installed (source checkout, npm install, bunx).
-//
-// uses import.meta.url to derive the package root, then checks both
-// the source layout (public/) and npm-installed layout (public/).
-
-import { existsSync, readFileSync } from 'fs'
-import { dirname, resolve } from 'path'
-import { fileURLToPath } from 'url'
-import { rnxPublicBrand } from '../src/public-brand'
-
-// when bundled by esbuild, this file lives at dist-cli/bin.js
-// when running from source, this file lives at cli/resolve-assets.ts
-const thisDir = dirname(fileURLToPath(import.meta.url))
-
-// walk up to find package root: look for package.json with the peachsim package name
-function findPackageRoot(): string {
-  let dir = thisDir
-  for (let i = 0; i < 5; i++) {
-    try {
-      const pkgPath = resolve(dir, 'package.json')
-      if (existsSync(pkgPath)) {
-        const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
-        if (pkg.name === rnxPublicBrand.packageName) return dir
-      }
-    } catch {}
-    dir = dirname(dir)
-  }
-  // fallback: assume one level up from this file
-  return dirname(thisDir)
-}
-
-const packageRoot = findPackageRoot()
-
-export interface SootSimAssets {
-  fontsDir: string
-  iconsDir: string
-  soundsDir: string
-  packageRoot: string
-}
-
-export function resolveAssets(): SootSimAssets {
-  // both source and npm-installed layouts use public/ at the package root
-  const publicDir = resolve(packageRoot, 'public')
-
-  const fontsDir = resolve(publicDir, 'fonts')
-  const iconsDir = resolve(publicDir, 'icons')
-  const soundsDir = resolve(publicDir, 'sounds')
-
-  if (!existsSync(fontsDir)) {
-    console.warn(`[peach] warning: fonts directory not found at ${fontsDir}`)
-  }
-
-  return {
-    fontsDir,
-    iconsDir,
-    soundsDir,
-    packageRoot,
-  }
-}
-
-// re-export packageRoot for use in CLI commands that need SOOTSIM_ROOT
-export { packageRoot }