vxrn 2.7.6 → 2.8.0

package/src/exports/prebuildWithoutExpo.ts

@@ -151,14 +151,9 @@ function escapeXml(value: string): string {
   return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
 }
 
-// uiscene adoption for the xcode 27 sdk: an app built with sdk 27 must
-// declare a scene manifest or it fails to launch on ios 27 ("UIScene life
-// cycle is required for apps built with this SDK"). prebuild therefore
-// always renders the scene manifest, a SceneDelegate that owns the window
-// and the RN root, and a trimmed AppDelegate. no toggle: the scene path is
-// the only path, on every ios version prebuild supports.
-const SCENE_DELEGATE_FILE_REF_ID = '1A2B3C4D5E6F7A8B9C0D1E2F'
-const SCENE_DELEGATE_BUILD_FILE_ID = '2B3C4D5E6F7A8B9C0D1E2F1A'
+// the rn template supplies the scene manifest and xcode source references.
+// keep factory ownership at app scope so background tasks and app intents can
+// start react native before a scene connects; each scene owns its window.
 const PUSH_ENTITLEMENTS_FILE_REF_ID = '3C4D5E6F7A8B9C0D1E2F1A2B'
 
 export function renderSceneDelegateSwift(appName: string): string {
@@ -185,40 +180,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     let window = UIWindow(windowScene: windowScene)
     self.window = window
 
-    // cold-start links arrive in connectionOptions under scenes, never in
-    // the app launchOptions, so they are translated into the launchOptions
-    // shape RCTLinkingManager.getInitialURL reads.
-    var launchOptions: [UIApplication.LaunchOptionsKey: Any] = [:]
-    if let url = connectionOptions.urlContexts.first?.url {
-      launchOptions[.url] = url
-    }
-    if let activity = connectionOptions.userActivities.first(where: {
-      $0.activityType == NSUserActivityTypeBrowsingWeb
-    }) {
-      launchOptions[.userActivityDictionary] = [
-        "UIApplicationLaunchOptionsUserActivityTypeKey": activity.activityType,
-        "UIApplicationLaunchOptionsUserActivityKey": activity,
-      ]
-    }
-
     factory.startReactNative(
       withModuleName: "${appName}",
       in: window,
-      launchOptions: launchOptions
+      connectionOptions: connectionOptions
     )
   }
 
   func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
-    guard let url = URLContexts.first?.url else { return }
-    RCTLinkingManager.application(UIApplication.shared, open: url, options: [:])
+    RCTLinkingManager.scene(scene, openURLContexts: URLContexts)
   }
 
   func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
-    RCTLinkingManager.application(
-      UIApplication.shared,
-      continue: userActivity,
-      restorationHandler: { _ in }
-    )
+    RCTLinkingManager.scene(scene, continue: userActivity)
   }
 }
 `
@@ -232,79 +206,32 @@ function insertAfterLine(haystack: string, anchor: string, insertion: string): s
   return `${haystack.slice(0, lineEnd + 1)}${insertion}\n${haystack.slice(lineEnd + 1)}`
 }
 
-function patchIosInfoPlistSceneManifest(rendered: string): string {
-  const anchor = '\t<key>LSRequiresIPhoneOS</key>'
-  if (!rendered.includes(anchor)) {
-    throw new Error(
-      '[vxrn] prebuild template Info.plist lost its LSRequiresIPhoneOS anchor'
-    )
-  }
-  return rendered.replace(
-    anchor,
-    `\t<key>UIApplicationSceneManifest</key>
-\t<dict>
-\t\t<key>UIApplicationSupportsMultipleScenes</key>
-\t\t<false/>
-\t\t<key>UISceneConfigurations</key>
-\t\t<dict>
-\t\t\t<key>UIWindowSceneSessionRoleApplication</key>
-\t\t\t<array>
-\t\t\t\t<dict>
-\t\t\t\t\t<key>UISceneConfigurationName</key>
-\t\t\t\t\t<string>Default Configuration</string>
-\t\t\t\t\t<key>UISceneDelegateClassName</key>
-\t\t\t\t\t<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-\t\t\t\t</dict>
-\t\t\t</array>
-\t\t</dict>
-\t</dict>
-${anchor}`
-  )
-}
-
 function patchIosAppDelegateSceneLifecycle(
   rendered: string,
-  appName: string,
   backgroundTasks: boolean,
   appIntents: boolean
 ): string {
   const anchor = `@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: "${appName}",
-      in: window,
-      launchOptions: launchOptions
-    )
-
-    return true
+    true
   }
 }`
   if (!rendered.includes(anchor)) {
     throw new Error(
-      '[vxrn] prebuild template AppDelegate.swift changed shape: cannot move the RN root to the scene delegate'
+      '[vxrn] prebuild template AppDelegate.swift changed shape: cannot register the app-level React Native factory'
     )
   }
   return rendered.replace(
     anchor,
-    `@main
+    `import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
   var reactNativeDelegate: ReactNativeDelegate?
   var reactNativeFactory: RCTReactNativeFactory?
@@ -322,6 +249,16 @@ ${backgroundTasks ? `    OneBackgroundTasksRegisterHost(factory, launchOptions)
 ` : ''}${appIntents ? `    OneAppIntentsRegisterHost(factory, launchOptions)
 ` : ''}    return true
   }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
 }`
   )
 }
@@ -362,38 +299,6 @@ function patchIosPbxprojOneBridgingHeader(project: string, appName: string): str
     .join(`${anchor}\n\t\t\t\t${setting}`)
 }
 
-function patchIosPbxprojSceneDelegate(rendered: string, appName: string): string {
-  const edits: Array<[string, string]> = [
-    [
-      '/* AppDelegate.swift in Sources */ = {isa = PBXBuildFile;',
-      `\t\t${SCENE_DELEGATE_BUILD_FILE_ID} /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ${SCENE_DELEGATE_FILE_REF_ID} /* SceneDelegate.swift */; };`,
-    ],
-    [
-      '/* AppDelegate.swift */ = {isa = PBXFileReference;',
-      `\t\t${SCENE_DELEGATE_FILE_REF_ID} /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SceneDelegate.swift; path = ${appName}/SceneDelegate.swift; sourceTree = "<group>"; };`,
-    ],
-    [
-      '/* AppDelegate.swift */,',
-      `\t\t\t\t${SCENE_DELEGATE_FILE_REF_ID} /* SceneDelegate.swift */,`,
-    ],
-    [
-      '/* AppDelegate.swift in Sources */,',
-      `\t\t\t\t${SCENE_DELEGATE_BUILD_FILE_ID} /* SceneDelegate.swift in Sources */,`,
-    ],
-  ]
-  let patched = rendered
-  for (const [anchor, insertion] of edits) {
-    const next = insertAfterLine(patched, anchor, insertion)
-    if (next === patched) {
-      throw new Error(
-        `[vxrn] prebuild template project.pbxproj lost its AppDelegate.swift anchor (${anchor})`
-      )
-    }
-    patched = next
-  }
-  return patched
-}
-
 function patchIosPbxprojAppIntents(rendered: string, appName: string): string {
   const name = 'OneAppIntents.swift'
   const fileRef = pbxprojId('one-app-intents-file')
@@ -2703,12 +2608,10 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
         /\t<key>NS\w+UsageDescription<\/key>\s*<string><\/string>\n/g,
         ''
       )
-      rendered = patchIosInfoPlistSceneManifest(rendered)
     }
     if (platform === 'ios' && relativePath.endsWith('/AppDelegate.swift')) {
       rendered = patchIosAppDelegateSceneLifecycle(
         rendered,
-        appName,
         !!app.ios?.backgroundTasks,
         !!app.ios?.appIntents
       )
@@ -2734,15 +2637,19 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
         rendered = nativeProjectPatches.pointReleaseBundleURLAtOneUpdates(rendered)
       }
     }
-    if (platform === 'ios' && app.ios?.deploymentTarget) {
+    if (platform === 'ios') {
+      // one requires ios 17 (see the schema minimumVersion and
+      // One.podspec); the template's react native 15.1 default fails pod
+      // install, so an unset target falls back to one's floor.
+      const deploymentTarget = app.ios?.deploymentTarget ?? '17.0'
       rendered = rendered
         .replace(
           'platform :ios, min_ios_version_supported',
-          `platform :ios, '${app.ios.deploymentTarget}'`
+          `platform :ios, '${deploymentTarget}'`
         )
         .replace(
           /IPHONEOS_DEPLOYMENT_TARGET = \d+(?:\.\d+)?;/g,
-          `IPHONEOS_DEPLOYMENT_TARGET = ${app.ios.deploymentTarget};`
+          `IPHONEOS_DEPLOYMENT_TARGET = ${deploymentTarget};`
         )
       if (relativePath === 'Podfile') {
         rendered = rendered.replace(
@@ -2751,7 +2658,7 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
 
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '${app.ios.deploymentTarget}'
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '${deploymentTarget}'
       end
     end
   end
@@ -2761,7 +2668,6 @@ end`
     }
     if (platform === 'ios' && relativePath.endsWith('.xcodeproj/project.pbxproj')) {
       rendered = patchIosBundlePhase(rendered, app.updates?.runtimeVersion)
-      rendered = patchIosPbxprojSceneDelegate(rendered, appName)
       if (app.ios?.appIntents) rendered = patchIosPbxprojAppIntents(rendered, appName)
       rendered = patchIosPbxprojOneBridgingHeader(rendered, appName)
       if (Object.keys(appEntitlements(app)).length && !app.ios?.widgets) {

package/src/plugins/autoDepOptimizeExternal.test.ts

@@ -0,0 +1,101 @@
+import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { createServer } from 'vite'
+import { expect, it } from 'vitest'
+import { autoDepOptimizePlugin } from './autoDepOptimizePlugin'
+
+it.each([
+  { external: 'external-dep', rootBundled: false, exclude: [] },
+  { external: 'external-dep/feature', rootBundled: true, exclude: [] },
+  { external: 'external-dep', rootBundled: false, exclude: ['internal-dep'] },
+  {
+    external: 'external-dep',
+    rootBundled: false,
+    exclude: [/some-pattern/, 'internal-dep'],
+  },
+])(
+  'keeps SSR external $external and exclusions $exclude outside prebundling',
+  async ({ external, rootBundled, exclude }) => {
+    const root = realpathSync(mkdtempSync(join(tmpdir(), 'vxrn-ssr-external-')))
+    const bundled = new Set<string>()
+    const names = ['external-dep', 'external-dep-extra', 'internal-dep']
+    writeFileSync(
+      join(root, 'package.json'),
+      JSON.stringify({
+        private: true,
+        dependencies: Object.fromEntries(names.map((name) => [name, '1.0.0'])),
+      })
+    )
+    for (const name of names) {
+      const folder = join(root, 'node_modules', name)
+      mkdirSync(folder, { recursive: true })
+      writeFileSync(
+        join(folder, 'package.json'),
+        JSON.stringify({
+          name,
+          version: '1.0.0',
+          type: 'module',
+          peerDependencies: { react: '*' },
+          exports: {
+            '.': { import: './index.js' },
+            './feature': { import: './feature.js' },
+          },
+        })
+      )
+      writeFileSync(join(folder, 'index.js'), 'export const value = 1')
+      writeFileSync(join(folder, 'feature.js'), 'export const value = 2')
+    }
+    writeFileSync(
+      join(root, 'entry.js'),
+      `import { value as external } from 'external-dep'
+import { value as feature } from 'external-dep/feature'
+import { value as sibling } from 'external-dep-extra'
+import { value as internal } from 'internal-dep'
+export const value = external + feature + sibling + internal
+`
+    )
+    const server = await createServer({
+      root,
+      configFile: false,
+      server: { middlewareMode: true },
+      optimizeDeps: { noDiscovery: true },
+      ssr: { external: [external] },
+      plugins: [autoDepOptimizePlugin({ root, exclude })],
+      environments: {
+        ssr: {
+          optimizeDeps: {
+            noDiscovery: true,
+            rolldownOptions: {
+              plugins: [
+                {
+                  name: 'record-prebundled-packages',
+                  load(id) {
+                    if (id.startsWith(join(root, 'node_modules'))) bundled.add(id)
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    })
+    try {
+      await server.environments.ssr.listen(server)
+      expect((await server.ssrLoadModule(join(root, 'entry.js'))).value).toBe(5)
+      expect(bundled.has(join(root, 'node_modules/internal-dep/index.js'))).toBe(
+        !exclude.includes('internal-dep')
+      )
+      expect(bundled.has(join(root, 'node_modules/external-dep-extra/index.js'))).toBe(
+        true
+      )
+      expect(bundled.has(join(root, 'node_modules/external-dep/index.js'))).toBe(
+        rootBundled
+      )
+      expect(bundled.has(join(root, 'node_modules/external-dep/feature.js'))).toBe(false)
+    } finally {
+      await server.close()
+      rmSync(root, { recursive: true, force: true })
+    }
+  }
+)

package/src/plugins/autoDepOptimizePlugin.ts

@@ -47,6 +47,7 @@ export function autoDepOptimizePlugin(props: FindDepsOptions): Plugin {
       const finalConfig = await getScannedOptimizeDepsConfig({
         ...props,
         mode: env.mode,
+        external: cfg.ssr?.external,
         exclude: [
           ...exclude,
           ...userExcludes,
@@ -68,7 +69,10 @@ export const getSSRExternalsCachePath = (root: string) => {
   return path.join(getCacheDir(root), 'deps-to-pre-bundle-for-ssr-cache.json')
 }
 
-type FindDepsOptionsByMode = FindDepsOptions & { mode: string }
+type FindDepsOptionsByMode = FindDepsOptions & {
+  mode: string
+  external?: string[] | true
+}
 
 export async function getScannedOptimizeDepsConfig(props: FindDepsOptionsByMode) {
   const result = await findDepsToOptimize(props)
@@ -80,8 +84,13 @@ export async function getScannedOptimizeDepsConfig(props: FindDepsOptionsByMode)
   const excludeArray = Array.isArray(props.exclude) ? props.exclude : [props.exclude]
   const excludeStrings = excludeArray.filter((e): e is string => typeof e === 'string')
   const excludeSet = new Set(excludeStrings)
+  const external = props.external
+  const shouldOptimize = (dep: string) =>
+    !excludeSet.has(dep) &&
+    external !== true &&
+    !external?.some((name) => dep === name || dep.startsWith(`${name}/`))
 
-  const filteredDeps = result.prebundleDeps.filter((dep) => !excludeSet.has(dep))
+  const filteredDeps = result.prebundleDeps.filter(shouldOptimize)
 
   return {
     ssr: {
@@ -89,10 +98,7 @@ export async function getScannedOptimizeDepsConfig(props: FindDepsOptionsByMode)
         include: filteredDeps,
         exclude: EXCLUDE_LIST,
       },
-      noExternal: [
-        ...filteredDeps,
-        ...result.noExternalDeps.filter((dep) => !excludeSet.has(dep)),
-      ],
+      noExternal: [...filteredDeps, ...result.noExternalDeps.filter(shouldOptimize)],
     },
   }
 }

package/src/plugins/rnCodegenPlugin.ts

@@ -2,8 +2,7 @@ import type { Plugin } from 'vite'
 import { transformReactNativeCodegen } from '@vxrn/compiler'
 
 // the transform itself lives in @vxrn/compiler so the metro transformer worker
-// can run it too. vxrn depends on @vxrn/vite-plugin-metro, so the worker cannot
-// reach back into this package.
+// can run it too without loading vxrn.
 export { transformReactNativeCodegen } from '@vxrn/compiler'
 
 export function rnCodegenPlugin(options?: { projectRoot?: string }): Plugin {

package/src/rn-commands/bundle/buildBundle.ts

@@ -1,9 +1,7 @@
 import FSExtra from 'fs-extra'
 import { clearTransformCache } from '@vxrn/compiler'
-import {
-  bundle as metroBundle,
-  type BundleCommandArgs,
-} from '@vxrn/vite-plugin-metro/rn-commands'
+import type { BundleCommandArgs } from '@vxrn/vite-plugin-metro/rn-commands'
+import { resolveConfig } from 'vite'
 import { loadEnv } from '../../exports/loadEnv'
 import { buildNativeBundle } from '../../utils/createNativeDevEngine'
 
@@ -48,11 +46,14 @@ export async function buildBundle(
     throw new Error(`Expected ctx.root to be a string, but got ${typeof root}`)
   }
 
-  const metroBuildBundleFn = await metroBundle.getBuildBundleFn()
+  const viteConfig = await resolveConfig({}, 'build', 'production')
 
-  if (metroBuildBundleFn) {
+  // resolving the config runs the metro plugin only in metro mode, and metro is
+  // an optional peer, so only that mode loads it
+  if (globalThis['__viteMetroPluginOptions__']) {
     console.info('Using @vxrn/vite-plugin-metro to build the bundle.')
-    await metroBuildBundleFn(_argv, ctx, args, bundleImpl)
+    const { bundle } = await import('@vxrn/vite-plugin-metro/rn-commands')
+    await bundle.getBuildBundleFn(viteConfig)(_argv, ctx, args, bundleImpl)
     // metroBuildBundleFn calls ensureProcessExitsAfterDelay internally,
     // which kills lingering child handles (esbuild --service) and lets
     // the event loop drain naturally. no extra setTimeout needed —