vxrn 2.0.0-beta.58.1 → 2.0.0-beta.59.1

package/expo-plugin.cjs

@@ -0,0 +1,82 @@
+const fs = require('node:fs')
+const { createRequire } = require('node:module')
+const path = require('node:path')
+const nativeProjectPatches = require('./native-project-patches.cjs')
+
+module.exports = function withVxrn(config) {
+  const projectRoot = config?._internal?.projectRoot
+  if (!projectRoot) {
+    throw new Error('[vxrn/expo-plugin] Expo config is missing _internal.projectRoot')
+  }
+
+  const projectRequire = createRequire(path.join(projectRoot, 'package.json'))
+  const {
+    withAppBuildGradle,
+    withDangerousMod,
+    withMainActivity,
+    withPlugins,
+    withXcodeProject,
+  } = projectRequire('@expo/config-plugins')
+
+  return withPlugins(config, [
+    [
+      withXcodeProject,
+      (nextConfig) => {
+        const phase = nextConfig.modResults.buildPhaseObject(
+          'PBXShellScriptBuildPhase',
+          'Bundle React Native code and images'
+        )
+        if (!phase) return nextConfig
+
+        let script = JSON.parse(phase.shellScript)
+        script =
+          nativeProjectPatches.removeExpoDefaultsFromBundleReactNativeShellScript(script)
+        script = nativeProjectPatches.addSetCliPathToBundleReactNativeShellScript(script)
+        script = nativeProjectPatches.addPodHermescToBundleReactNativeShellScript(script)
+        script = nativeProjectPatches.addDepsPatchToBundleReactNativeShellScript(script)
+        phase.shellScript = JSON.stringify(script)
+        return nextConfig
+      },
+    ],
+    [
+      withAppBuildGradle,
+      (nextConfig) => {
+        let contents = nativeProjectPatches.replaceAppBuildGradleReactBlock(
+          nextConfig.modResults.contents
+        )
+        contents = nativeProjectPatches.addDepsPatchToAppBuildGradle(contents)
+        nextConfig.modResults.contents = contents
+        return nextConfig
+      },
+    ],
+    [
+      withMainActivity,
+      (nextConfig) => {
+        nextConfig.modResults.contents = nativeProjectPatches.addReactNativeScreensFix(
+          nextConfig.modResults.contents
+        )
+        return nextConfig
+      },
+    ],
+    [
+      withDangerousMod,
+      [
+        'ios',
+        (nextConfig) => {
+          const podfilePath = path.join(
+            nextConfig.modRequest.platformProjectRoot,
+            'Podfile'
+          )
+          if (!fs.existsSync(podfilePath)) return nextConfig
+
+          let podfile = fs.readFileSync(podfilePath, 'utf8')
+          podfile = nativeProjectPatches.injectFmtCxx17FixIntoPodfile(podfile)
+          podfile = nativeProjectPatches.injectHermesMinificationPatchIntoPodfile(podfile)
+          podfile = nativeProjectPatches.injectReactNativeScreensGammaIntoPodfile(podfile)
+          fs.writeFileSync(podfilePath, podfile, 'utf8')
+          return nextConfig
+        },
+      ],
+    ],
+  ])
+}

package/native-project-patches.cjs

@@ -117,6 +117,17 @@ function injectReactNativeScreensGammaIntoPodfile(podfile) {
   return `${RNS_SCREENS_GAMMA_MARKER}\nENV['RNS_GAMMA_ENABLED'] ||= '1'\n${podfile}`
 }
 
+/**
+ * Expo's bundle phase defaults to Expo CLI's export:embed command. One routes
+ * the React Native bundle command through react-native.config.cjs instead.
+ */
+function removeExpoDefaultsFromBundleReactNativeShellScript(input) {
+  const cliPath = /if \[\[ -z "\$CLI_PATH" \]\]; then[\s\S]*?fi\n?/g
+  const bundleCommand = /if \[\[ -z "\$BUNDLE_COMMAND" \]\]; then[\s\S]*?fi\n?/g
+
+  return input.replace(cliPath, '').replace(bundleCommand, '')
+}
+
 /**
  * replace android/app/build.gradle's react block with one's generated settings.
  */
@@ -130,9 +141,7 @@ function replaceAppBuildGradleReactBlock(appBuildGradleContents) {
     reactBlockStartIndex
 
   if (reactBlockStartIndex === -1 || reactBlockEndIndex === -1) {
-    console.warn(
-      '[vxrn] failed to patch Android app/build.gradle: react block not found'
-    )
+    console.warn('[vxrn] failed to patch Android app/build.gradle: react block not found')
     return appBuildGradleContents
   }
 
@@ -514,4 +523,15 @@ function addReactNativeScreensFix(input) {
   return input
 }
 
-module.exports = { addSetCliPathToBundleReactNativeShellScript, addPodHermescToBundleReactNativeShellScript, addDepsPatchToBundleReactNativeShellScript, injectFmtCxx17FixIntoPodfile, injectHermesMinificationPatchIntoPodfile, injectReactNativeScreensGammaIntoPodfile, replaceAppBuildGradleReactBlock, addDepsPatchToAppBuildGradle, addReactNativeScreensFix }
+module.exports = {
+  addSetCliPathToBundleReactNativeShellScript,
+  addPodHermescToBundleReactNativeShellScript,
+  addDepsPatchToBundleReactNativeShellScript,
+  injectFmtCxx17FixIntoPodfile,
+  injectHermesMinificationPatchIntoPodfile,
+  injectReactNativeScreensGammaIntoPodfile,
+  removeExpoDefaultsFromBundleReactNativeShellScript,
+  replaceAppBuildGradleReactBlock,
+  addDepsPatchToAppBuildGradle,
+  addReactNativeScreensFix,
+}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "vxrn",
-  "version": "2.0.0-beta.58.1",
+  "version": "2.0.0-beta.59.1",
   "sideEffects": false,
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
     "./react-native-commands": "./react-native-commands.cjs",
+    "./expo-plugin": "./expo-plugin.cjs",
     ".": {
       "types": "./types/index.d.ts",
       "default": "./dist/index.mjs"
@@ -43,6 +44,7 @@
     "patches",
     "dist",
     "run.mjs",
+    "expo-plugin.cjs",
     "native-project-patches.cjs",
     "react-native-commands.cjs"
   ],
@@ -62,16 +64,16 @@
     "@react-native/codegen": "^0.87.1",
     "@react-native-community/cli-config": "^20.2.0",
     "@react-native/dev-middleware": "^0.87.1",
-    "@vxrn/compiler": "2.0.0-beta.58.1",
-    "@vxrn/debug": "2.0.0-beta.58.1",
-    "@vxrn/query-string": "2.0.0-beta.58.1",
-    "@vxrn/resolve": "2.0.0-beta.58.1",
-    "@vxrn/safe-area": "2.0.0-beta.58.1",
-    "@vxrn/url-parse": "2.0.0-beta.58.1",
-    "@vxrn/utils": "2.0.0-beta.58.1",
-    "@vxrn/vendor": "2.0.0-beta.58.1",
-    "@vxrn/vite-flow": "2.0.0-beta.58.1",
-    "@vxrn/vite-plugin-metro": "2.0.0-beta.58.1",
+    "@vxrn/compiler": "2.0.0-beta.59.1",
+    "@vxrn/debug": "2.0.0-beta.59.1",
+    "@vxrn/query-string": "2.0.0-beta.59.1",
+    "@vxrn/resolve": "2.0.0-beta.59.1",
+    "@vxrn/safe-area": "2.0.0-beta.59.1",
+    "@vxrn/url-parse": "2.0.0-beta.59.1",
+    "@vxrn/utils": "2.0.0-beta.59.1",
+    "@vxrn/vendor": "2.0.0-beta.59.1",
+    "@vxrn/vite-flow": "2.0.0-beta.59.1",
+    "@vxrn/vite-plugin-metro": "2.0.0-beta.59.1",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",

package/src/exports/expoPlugin.test.mjs

@@ -0,0 +1,135 @@
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import withVxrn from '../../expo-plugin.cjs'
+
+const require = createRequire(import.meta.url)
+const patches = require('../../native-project-patches.cjs')
+const temporaryDirectories = []
+
+afterEach(() => {
+  for (const directory of temporaryDirectories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+const expoBundlePhase = [
+  'if [[ -z "$CLI_PATH" ]]; then',
+  '  export CLI_PATH="expo-cli"',
+  'fi',
+  'if [[ -z "$BUNDLE_COMMAND" ]]; then',
+  '  export BUNDLE_COMMAND="export:embed"',
+  'fi',
+  '"`"$NODE_BINARY" --print "require(\'path\').dirname(require.resolve(\'react-native/package.json\')) + \'/scripts/react-native-xcode.sh\'"`"',
+].join('\n')
+
+const podfile = `
+target 'TestApp' do
+  post_install do |installer|
+    react_native_post_install(installer)
+  end
+end
+`
+
+describe('vxrn Expo project patches', () => {
+  it('replaces Expo bundle defaults with One bundle configuration', () => {
+    let result =
+      patches.removeExpoDefaultsFromBundleReactNativeShellScript(expoBundlePhase)
+    result = patches.addSetCliPathToBundleReactNativeShellScript(result)
+    result = patches.addPodHermescToBundleReactNativeShellScript(result)
+    result = patches.addDepsPatchToBundleReactNativeShellScript(result)
+
+    expect(result).not.toContain('export:embed')
+    expect(result).toContain('[vxrn/one] React Native now defaults CLI_PATH')
+    expect(result).toContain('[vxrn/one] use the hermes-engine pod')
+    expect(result).toContain('[vxrn/one] ensure patches are applied')
+    expect(result.indexOf('export CLI_PATH=')).toBeLessThan(
+      result.indexOf('react-native-xcode.sh')
+    )
+  })
+
+  it('replaces the Expo Android react block and applies build patches', () => {
+    const input = `react {\n    entryFile = file("../index.js")\n}\n`
+    let result = patches.replaceAppBuildGradleReactBlock(input)
+    result = patches.addDepsPatchToAppBuildGradle(result)
+
+    expect(result).toContain('cliFile = new File(')
+    expect(result).toContain('autolinkLibrariesWithApp()')
+    expect(result).not.toContain('entryFile = file("../index.js")')
+    expect(result).toContain('[vxrn/one] ensure patches are applied')
+  })
+
+  it('applies the shared Podfile patches idempotently', () => {
+    let once = patches.injectFmtCxx17FixIntoPodfile(podfile)
+    once = patches.injectHermesMinificationPatchIntoPodfile(once)
+    once = patches.injectReactNativeScreensGammaIntoPodfile(once)
+    let twice = patches.injectFmtCxx17FixIntoPodfile(once)
+    twice = patches.injectHermesMinificationPatchIntoPodfile(twice)
+    twice = patches.injectReactNativeScreensGammaIntoPodfile(twice)
+
+    expect(twice).toBe(once)
+    expect(once).toContain('[vxrn/one] fmt c++17 fix')
+    expect(once).toContain('[vxrn/one] minify iOS Hermes Release bundle input')
+    expect(once).toContain("ENV['RNS_GAMMA_ENABLED'] ||= '1'")
+  })
+
+  it('applies the shared Android screens fix', () => {
+    const result = patches.addReactNativeScreensFix(`
+package dev.one.test
+import com.facebook.react.ReactActivity
+class MainActivity : ReactActivity() {
+}
+`)
+
+    expect(result).toContain('RNScreensFragmentFactory')
+    expect(result).toContain('super.onCreate(null)')
+  })
+})
+
+describe('vxrn/expo-plugin', () => {
+  it('resolves Expo config plugins from the app and binds the dangerous mod', async () => {
+    const projectRoot = mkdtempSync(join(tmpdir(), 'vxrn-expo-plugin-'))
+    temporaryDirectories.push(projectRoot)
+    const iosRoot = join(projectRoot, 'ios')
+    mkdirSync(iosRoot, { recursive: true })
+    writeFileSync(join(iosRoot, 'Podfile'), podfile)
+    writeFileSync(join(projectRoot, 'package.json'), '{"private":true}')
+    const workspaceRequire = createRequire(import.meta.url)
+    const configPluginsRoot = workspaceRequire.resolve(
+      '@expo/config-plugins/package.json'
+    )
+    const scopedDirectory = join(projectRoot, 'node_modules', '@expo')
+    mkdirSync(scopedDirectory, { recursive: true })
+    const packageDirectory = configPluginsRoot.slice(0, -'/package.json'.length)
+    await import('node:fs/promises').then(({ symlink }) =>
+      symlink(packageDirectory, join(scopedDirectory, 'config-plugins'), 'dir')
+    )
+
+    const config = withVxrn({
+      name: 'TestApp',
+      slug: 'test-app',
+      ios: { bundleIdentifier: 'dev.one.test' },
+      android: { package: 'dev.one.test' },
+      _internal: { projectRoot },
+    })
+    await config.mods.ios.dangerous({
+      ...config,
+      modRequest: {
+        platformProjectRoot: iosRoot,
+        projectRoot,
+        platform: 'ios',
+        modName: 'dangerous',
+        projectName: 'TestApp',
+        introspect: false,
+      },
+      modResults: {},
+    })
+
+    const result = readFileSync(join(iosRoot, 'Podfile'), 'utf8')
+    expect(result).toContain('[vxrn/one] fmt c++17 fix')
+    expect(result).toContain('[vxrn/one] minify iOS Hermes Release bundle input')
+    expect(result).toContain("ENV['RNS_GAMMA_ENABLED'] ||= '1'")
+  })
+})