vxrn 2.7.7 → 2.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "2.7.7",
+  "version": "2.8.1",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -57,7 +57,6 @@
   "files": [
     "src",
     "types",
-    "patches",
     "dist",
     "run.mjs",
     "expo-plugin.cjs",
@@ -77,19 +76,18 @@
     "@hono/node-server": "^1.19.14",
     "@jridgewell/remapping": "^2.3.0",
     "@jridgewell/trace-mapping": "^0.3.25",
-    "@react-native/codegen": "^0.87.1",
+    "@react-native/codegen": "^0.88.0",
     "@react-native-community/cli": "^20.2.0",
     "@react-native-community/cli-config": "^20.2.0",
-    "@react-native/dev-middleware": "^0.87.1",
-    "@vxrn/compiler": "2.7.7",
-    "@vxrn/debug": "2.7.7",
-    "@vxrn/query-string": "2.7.7",
-    "@vxrn/resolve": "2.7.7",
-    "@vxrn/url-parse": "2.7.7",
-    "@vxrn/utils": "2.7.7",
-    "@vxrn/vendor": "2.7.7",
-    "@vxrn/vite-flow": "2.7.7",
-    "@vxrn/vite-plugin-metro": "2.7.7",
+    "@react-native/dev-middleware": "^0.88.0",
+    "@vxrn/compiler": "2.8.1",
+    "@vxrn/debug": "2.8.1",
+    "@vxrn/query-string": "2.8.1",
+    "@vxrn/resolve": "2.8.1",
+    "@vxrn/url-parse": "2.8.1",
+    "@vxrn/utils": "2.8.1",
+    "@vxrn/vendor": "2.8.1",
+    "@vxrn/vite-flow": "2.8.1",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
@@ -117,23 +115,32 @@
     "sucrase": "3.35.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.3",
+    "@biomejs/biome": "2.5.15",
     "@jridgewell/gen-mapping": "^0.3.5",
-    "@tamagui/build": "3.0.17",
+    "@tamagui/build": "3.0.18",
     "@types/find-node-modules": "^2.1.2",
     "@types/node": "^24.10.0",
     "@types/ws": "^8.18.1",
     "depcheck": "^1.4.7",
-    "hermes-compiler": "250829098.0.17",
-    "metro-source-map": "0.84.4",
-    "react-native": "0.87.1",
+    "hermes-compiler": "260318099.0.4",
+    "metro-source-map": "0.87.1",
+    "react-native": "0.88.0",
     "typescript": "7.0.2",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.0",
+    "@vxrn/vite-plugin-metro": "2.8.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "releaseSourceCommit": "2335a80d570e794536b7bb62b023bb73ec1e4d59",
+  "peerDependencies": {
+    "@vxrn/vite-plugin-metro": "2.8.1"
+  },
+  "peerDependenciesMeta": {
+    "@vxrn/vite-plugin-metro": {
+      "optional": true
+    }
+  },
+  "releaseSourceCommit": "9c7de1d429903229d3a6ef9a741c5ec57102ba6b",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onejs/one.git",

package/src/config/getBaseViteConfigOnly.ts

@@ -97,7 +97,7 @@ export async function getBaseViteConfig(
         // have these native-only subpaths
         {
           find: /^react-native\/Libraries\/.*/,
-          replacement: resolvePath('@vxrn/vite-plugin-metro/empty', import.meta.dirname),
+          replacement: resolvePath('@vxrn/utils/empty', import.meta.dirname),
         },
         {
           // react native 0.87 removed @react-native/assets-registry, but libraries

package/src/config/getReactNativePlugins.ts

@@ -1,4 +1,5 @@
-import { metroPlugin, type MetroPluginOptions } from '@vxrn/vite-plugin-metro'
+import type { MetroPluginOptions } from '@vxrn/vite-plugin-metro'
+import type { PluginOption } from 'vite'
 
 import type { VXRNOptionsFilled } from './getOptionsFilled'
 import { DEFAULT_ASSET_EXTS } from '../constants/defaults'
@@ -17,7 +18,7 @@ export function getReactNativePlugins(
     /** Passing a non-null value will enable metro mode */
     metro?: MetroPluginOptions | null
   } = {}
-) {
+): PluginOption[] {
   // when native is disabled (via one's `native: false`), skip all RN / metro
   // plugins so web-only projects don't spin up the RN dev server, middleware,
   // websockets, or rolldown native engine.
@@ -27,8 +28,11 @@ export function getReactNativePlugins(
 
   const metroOptions: typeof metro = metro || globalThis['__vxrnMetroOptions__']
   if (metroOptions) {
-    // Metro mode
-    return [applyBuiltInPatchesPlugin(), metroPlugin(metroOptions)]
+    // metro mode. metro is an optional peer, so only this mode loads it
+    return [
+      applyBuiltInPatchesPlugin(),
+      import('@vxrn/vite-plugin-metro').then(({ metroPlugin }) => metroPlugin(metroOptions)),
+    ]
   }
 
   return [

package/src/exports/prebuildWithoutExpo.test.ts

@@ -49,15 +49,17 @@ const app = {
   android: { applicationId: 'dev.one.myapp', minSdk: 28 },
 } satisfies PrebuildAppConfig
 
-const templateRnDelegate = readFileSync(
-  fileURLToPath(
-    new URL(
-      '../../../../node_modules/@react-native-community/template/template/ios/HelloWorld/AppDelegate.swift',
-      import.meta.url
-    )
-  ),
-  'utf8'
-).split('class ReactNativeDelegate:')[1]
+const templateFile = (file: string) =>
+  readFileSync(
+    fileURLToPath(
+      new URL(
+        `../../../../node_modules/@react-native-community/template/template/ios/${file}`,
+        import.meta.url
+      )
+    ),
+    'utf8'
+  )
+const templateAppDelegate = templateFile('HelloWorld/AppDelegate.swift')
 
 describe('native.app prebuild validation', () => {
   // smoke for the shared definition re-export; the full cases live beside
@@ -149,10 +151,13 @@ describe('native.app prebuild validation', () => {
   })
 })
 
-// the template's AppDelegate entries, which the scene delegate patch anchors
-// on, and its two app-target plist settings, beside which the bridging header
-// setting lands
-const APP_DELEGATE_PBXPROJ = `\t\t761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
+// the template's app and scene source entries and two app-target plist settings,
+// beside which the bridging header setting lands
+const APP_DELEGATE_PBXPROJ = `		761780EF2CA45674006654EF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EE2CA45674006654EF /* SceneDelegate.swift */; };
+		761780EE2CA45674006654EF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SceneDelegate.swift; path = HelloWorld/SceneDelegate.swift; sourceTree = "<group>"; };
+				761780EE2CA45674006654EF /* SceneDelegate.swift */,
+				761780EF2CA45674006654EF /* SceneDelegate.swift in Sources */,
+\t\t761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
 \t\t761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = HelloWorld/AppDelegate.swift; sourceTree = "<group>"; };
 \t\t\t\t761780EC2CA45674006654EE /* AppDelegate.swift */,
 \t\t\t\t761780ED2CA45674006654EE /* AppDelegate.swift in Sources */,
@@ -485,6 +490,30 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
     expect(noPedometerManifest.content).not.toContain('ACTIVITY_RECOGNITION')
   })
 
+  it('defaults the ios deployment target to the 17.0 floor when unset', () => {
+    // one requires ios 17 (see schema minimumVersion and One.podspec);
+    // leaving the template's react native 15.1 default fails pod install.
+    const noTarget = { ...app, ios: { bundleId: 'dev.one.myapp' } }
+    const podfile = renderPrebuildFile({
+      relativePath: 'Podfile',
+      content:
+        "platform :ios, min_ios_version_supported\ntarget 'HelloWorld' do\n  config = use_native_modules!\n  post_install do |installer|\n    react_native_post_install(\n      installer\n    )\n  end\nend",
+      platform: 'ios',
+      app: noTarget,
+    })
+    expect(podfile.content).toContain("platform :ios, '17.0'")
+    expect(podfile.content).toContain(
+      "config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '17.0'"
+    )
+    const pbxproj = renderPrebuildFile({
+      relativePath: 'HelloWorld.xcodeproj/project.pbxproj',
+      content: `IPHONEOS_DEPLOYMENT_TARGET = 15.1; target HelloWorld\nshellScript = ${JSON.stringify('REACT_NATIVE_XCODE="$REACT_NATIVE_PATH/scripts/react-native-xcode.sh"\n/bin/sh -c "\\"$WITH_ENVIRONMENT\\" \\"$REACT_NATIVE_XCODE\\""\n')};\n${APP_DELEGATE_PBXPROJ}`,
+      platform: 'ios',
+      app: noTarget,
+    })
+    expect(pbxproj.content).toContain('IPHONEOS_DEPLOYMENT_TARGET = 17.0;')
+  })
+
   it('stamps the brightness write-settings permission from native.app', () => {
     const content =
       '<manifest>\n    <uses-permission android:name="android.permission.INTERNET" />\n    <activity>\n      </activity>\n    </application>'
@@ -829,36 +858,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
 
     const appDelegate = renderPrebuildFile({
       relativePath: 'HelloWorld/AppDelegate.swift',
-      content: `@main
-class AppDelegate: UIResponder, UIApplicationDelegate {
-  var window: UIWindow?
-
-  var reactNativeDelegate: ReactNativeDelegate?
-  var reactNativeFactory: RCTReactNativeFactory?
-
-  func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
-  ) -> Bool {
-    let delegate = ReactNativeDelegate()
-    let factory = RCTReactNativeFactory(delegate: delegate)
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-
-    reactNativeDelegate = delegate
-    reactNativeFactory = factory
-
-    window = UIWindow(frame: UIScreen.main.bounds)
-
-    factory.startReactNative(
-      withModuleName: "HelloWorld",
-      in: window,
-      launchOptions: launchOptions
-    )
-
-    return true
-  }
-}
-class ReactNativeDelegate:${templateRnDelegate}`,
+      content: templateAppDelegate,
       platform: 'ios',
       app: push,
     })
@@ -1163,42 +1163,10 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
 })
 
 describe('ios scene lifecycle', () => {
-  const templateAppDelegate = `@main
-class AppDelegate: UIResponder, UIApplicationDelegate {
-  var window: UIWindow?
-
-  var reactNativeDelegate: ReactNativeDelegate?
-  var reactNativeFactory: RCTReactNativeFactory?
-
-  func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
-  ) -> Bool {
-    let delegate = ReactNativeDelegate()
-    let factory = RCTReactNativeFactory(delegate: delegate)
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-
-    reactNativeDelegate = delegate
-    reactNativeFactory = factory
-
-    window = UIWindow(frame: UIScreen.main.bounds)
-
-    factory.startReactNative(
-      withModuleName: "HelloWorld",
-      in: window,
-      launchOptions: launchOptions
-    )
-
-    return true
-  }
-}
-`
-
-  it('trims the AppDelegate to app-level work and keeps the RN delegate', () => {
+  it('registers the app-level factory and keeps the RN launch screen delegate', () => {
     const rendered = renderPrebuildFile({
       relativePath: 'HelloWorld/AppDelegate.swift',
-      content: `${templateAppDelegate}
-class ReactNativeDelegate:${templateRnDelegate}`,
+      content: templateAppDelegate,
       platform: 'ios',
       app,
     })
@@ -1212,13 +1180,15 @@ class ReactNativeDelegate:${templateRnDelegate}`,
     expect(rendered.content).toContain('OneHoldLaunchScreen(rootView)')
   })
 
-  it('rejects a template that cannot request dev bytecode', () => {
-    expect(() => renderPrebuildFile({
+  it('requests Hermes dev bytecode from the generated RN delegate', () => {
+    const rendered = renderPrebuildFile({
       relativePath: 'HelloWorld/AppDelegate.swift',
-      content: `${templateAppDelegate}class ReactNativeDelegate:${templateRnDelegate.replace('forBundleRoot: "index"', 'forBundleRoot: "changed"')}`,
+      content: templateAppDelegate,
       platform: 'ios',
       app,
-    })).toThrow('expected the template bundle URL provider')
+    })
+    expect(rendered.content).toContain('URLQueryItem(name: "bytecode", value: "hermes")')
+    expect(rendered.content).toContain('if bundleURL.isFileURL { return bundleURL }')
   })
 
   it('throws instead of shipping a non-scene AppDelegate', () => {
@@ -1232,10 +1202,10 @@ class ReactNativeDelegate:${templateRnDelegate}`,
     ).toThrow('changed shape')
   })
 
-  it('stamps the scene manifest and delegate into the project', () => {
+  it('preserves the upstream scene manifest and renders the RN delegate', () => {
     const infoPlist = renderPrebuildFile({
       relativePath: 'HelloWorld/Info.plist',
-      content: '<dict>\n\t<key>LSRequiresIPhoneOS</key>\n</dict>',
+      content: templateFile('HelloWorld/Info.plist'),
       platform: 'ios',
       app,
     })
@@ -1254,25 +1224,9 @@ class ReactNativeDelegate:${templateRnDelegate}`,
     expect(sceneDelegate).toContain('continue userActivity')
     expect(sceneDelegate).toContain('RCTLinkingManager')
     expect(sceneDelegate).toContain('appDelegate.reactNativeFactory')
-  })
-
-  it('throws when the template loses a scene anchor', () => {
-    expect(() =>
-      renderPrebuildFile({
-        relativePath: 'HelloWorld/Info.plist',
-        content: '<dict>\n</dict>',
-        platform: 'ios',
-        app,
-      })
-    ).toThrow('LSRequiresIPhoneOS')
-    expect(() =>
-      renderPrebuildFile({
-        relativePath: 'HelloWorld.xcodeproj/project.pbxproj',
-        content: `shellScript = ${JSON.stringify('REACT_NATIVE_XCODE="$REACT_NATIVE_PATH/scripts/react-native-xcode.sh"\n/bin/sh -c "\\"$WITH_ENVIRONMENT\\" \\"$REACT_NATIVE_XCODE\\""\n')};\nno app delegate here`,
-        platform: 'ios',
-        app,
-      })
-    ).toThrow('AppDelegate.swift anchor')
+    expect(sceneDelegate).toContain('connectionOptions: connectionOptions')
+    expect(sceneDelegate).toContain('RCTLinkingManager.scene(scene, openURLContexts: URLContexts)')
+    expect(sceneDelegate).toContain('RCTLinkingManager.scene(scene, continue: userActivity)')
   })
 
   it('bundles native.app fonts into both platforms from the real template', async () => {
@@ -1364,7 +1318,7 @@ class ReactNativeDelegate:${templateRnDelegate}`,
     expect(appDelegate).toContain('class ReactNativeDelegate')
 
     const infoPlist = readFileSync(join(output, 'ios', 'MyApp', 'Info.plist'), 'utf8')
-    expect(infoPlist).toContain('<key>UIApplicationSceneManifest</key>')
+    expect(infoPlist.split('<key>UIApplicationSceneManifest</key>')).toHaveLength(2)
     expect(infoPlist).toContain('<key>OneNativeNotificationsEnabled</key>')
     // orientation default opens the phone list to all four; ipad keeps its own.
     const phoneOrientations = infoPlist
@@ -1387,7 +1341,7 @@ class ReactNativeDelegate:${templateRnDelegate}`,
       'utf8'
     )
     expect(project).toContain('path = MyApp/SceneDelegate.swift')
-    expect(project).toContain('/* SceneDelegate.swift in Sources */,')
+    expect(project.split('/* SceneDelegate.swift in Sources */,')).toHaveLength(2)
     // no push flag: no entitlements file and no entitlement wiring.
     expect(project).not.toContain('CODE_SIGN_ENTITLEMENTS')
     expect(() => statSync(join(output, 'ios', 'MyApp', 'MyApp.entitlements'))).toThrow()
@@ -2357,55 +2311,6 @@ describe('one updates prebuild', () => {
     updates: { url: 'https://updates.example.com', runtimeVersion: 'test-1' },
   } satisfies PrebuildAppConfig
 
-  const templateAppDelegate = `import UIKit
-import React
-import React_RCTAppDelegate
-import ReactAppDependencyProvider
-
-@main
-class AppDelegate: UIResponder, UIApplicationDelegate {
-  var window: UIWindow?
-
-  var reactNativeDelegate: ReactNativeDelegate?
-  var reactNativeFactory: RCTReactNativeFactory?
-
-  func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
-  ) -> Bool {
-    let delegate = ReactNativeDelegate()
-    let factory = RCTReactNativeFactory(delegate: delegate)
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-
-    reactNativeDelegate = delegate
-    reactNativeFactory = factory
-
-    window = UIWindow(frame: UIScreen.main.bounds)
-
-    factory.startReactNative(
-      withModuleName: "HelloWorld",
-      in: window,
-      launchOptions: launchOptions
-    )
-
-    return true
-  }
-}
-
-class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
-  override func sourceURL(for bridge: RCTBridge) -> URL? {
-    self.bundleURL()
-  }
-
-  override func bundleURL() -> URL? {
-#if DEBUG
-    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-#else
-    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
-#endif
-  }
-}
-`
 
   it('validates the updates config', () => {
     expect(() => validatePrebuildApp(updatesApp)).not.toThrow()
@@ -2484,15 +2389,15 @@ buildSettings = {
     ).toThrow('bridging header')
   })
 
-  it('throws instead of shipping a stock bundleURL with updates configured', () => {
+  it('rejects an incompatible app delegate with updates configured', () => {
     expect(() =>
       renderPrebuildFile({
         relativePath: 'HelloWorld/AppDelegate.swift',
-        content: templateAppDelegate.replace('Bundle.main.url', 'Bundle.main.path'),
+        content: templateAppDelegate.replace('    true', '    false'),
         platform: 'ios',
         app: updatesApp,
       })
-    ).toThrow('One.Updates')
+    ).toThrow('changed shape')
   })
 
   it('locks userInterfaceStyle on both platforms, and follows the system when unset', () => {
@@ -2803,7 +2708,7 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
         platform: 'android',
         app: updatesApp,
       })
-    ).toThrow('One.Updates')
+    ).toThrow('changed shape')
   })
 
   it('stamps the updates config into the android manifest', () => {