vxrn 2.11.1 → 2.11.2

package/expo-plugin.cjs

@@ -924,6 +924,7 @@ extern void OneSwiftRegisterPackage(const char *name, int (*entry)(int, char **)
           let podfile = fs.readFileSync(podfilePath, 'utf8')
           podfile = nativeProjectPatches.injectFmtCxx17FixIntoPodfile(podfile)
           podfile = nativeProjectPatches.injectWebGPUHeaderPathsIntoPodfile(podfile)
+          podfile = nativeProjectPatches.injectSkiaDawnVendoringIntoPodfile(podfile)
           podfile = nativeProjectPatches.injectHermesMinificationPatchIntoPodfile(podfile)
           podfile = nativeProjectPatches.injectReactNativeScreensGammaIntoPodfile(podfile)
           if (nativeProjectPatches.hasNitroWebImage(projectRoot)) {

package/native-project-patches.cjs

@@ -68,6 +68,46 @@ function injectNitroWebImageModularHeaderIntoPodfile(podfile) {
  */
 const FMT_CXX17_MARKER = '# [vxrn/one] fmt c++17 fix'
 
+const SKIA_DAWN_MARKER = '# [vxrn/one] react-native-skia dawn'
+
+/**
+ * react-native-skia 3 takes dawn from react-native-webgpu whenever node
+ * resolution finds that package instead of vendoring its own. a hoisted
+ * workspace install finds it even for an app that never links webgpu, which
+ * then fails on a dawn version mismatch or links no dawn at all. autolinking
+ * evaluates the skia podspec inside use_native_modules!, so the Podfile reads
+ * the modules its config command links first, and has skia vendor dawn
+ * through the RNSKIA_VENDOR_DAWN switch its podspec reads when webgpu is not
+ * among them.
+ */
+function injectSkiaDawnVendoringIntoPodfile(podfile) {
+  if (podfile.includes(SKIA_DAWN_MARKER)) return podfile
+  // a bare call runs autolinking's own default command
+  const anchor = /^(\s*config = use_native_modules!)(?:\((.*)\))?$/m
+  if (!anchor.test(podfile))
+    throw new Error('[vxrn] Podfile lost its use_native_modules! anchor')
+  const helper = [
+    SKIA_DAWN_MARKER,
+    "require 'json'",
+    'def vxrn_skia_dawn_config(config_command)',
+    '  json, _, status = Pod::Executable.capture_command(config_command[0], config_command[1..], capture: :both)',
+    '  if status.success?',
+    "    linked = JSON.parse(json)['dependencies'] || {}",
+    "    ENV['RNSKIA_VENDOR_DAWN'] ||= '1' unless linked.key?('react-native-webgpu')",
+    '  end',
+    '  config_command',
+    'end',
+    '',
+  ].join('\n')
+  return (
+    helper +
+    podfile.replace(
+      anchor,
+      (_, call, command = '$default_command') => `${call}(vxrn_skia_dawn_config(${command}))`
+    )
+  )
+}
+
 const WEBGPU_HEADERS_MARKER = '# [vxrn/one] webgpu isolated package headers'
 
 function injectWebGPUHeaderPathsIntoPodfile(podfile) {
@@ -788,6 +828,7 @@ function holdLaunchScreenInMainActivity(mainActivity) {
 }
 
 module.exports = {
+  injectSkiaDawnVendoringIntoPodfile,
   injectWebGPUHeaderPathsIntoPodfile,
   holdLaunchScreenInMainActivity,
   ONE_NOTIFICATIONS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -80,14 +80,14 @@
     "@react-native-community/cli": "^20.2.0",
     "@react-native-community/cli-config": "^20.2.0",
     "@react-native/dev-middleware": "^0.88.0",
-    "@vxrn/compiler": "2.11.1",
-    "@vxrn/debug": "2.11.1",
-    "@vxrn/query-string": "2.11.1",
-    "@vxrn/resolve": "2.11.1",
-    "@vxrn/url-parse": "2.11.1",
-    "@vxrn/utils": "2.11.1",
-    "@vxrn/vendor": "2.11.1",
-    "@vxrn/vite-flow": "2.11.1",
+    "@vxrn/compiler": "2.11.2",
+    "@vxrn/debug": "2.11.2",
+    "@vxrn/query-string": "2.11.2",
+    "@vxrn/resolve": "2.11.2",
+    "@vxrn/url-parse": "2.11.2",
+    "@vxrn/utils": "2.11.2",
+    "@vxrn/vendor": "2.11.2",
+    "@vxrn/vite-flow": "2.11.2",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
@@ -127,20 +127,20 @@
     "react-native": "0.88.0",
     "typescript": "7.0.2",
     "vitest": "^4.1.0",
-    "@vxrn/vite-plugin-metro": "2.11.1"
+    "@vxrn/vite-plugin-metro": "2.11.2"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@vxrn/vite-plugin-metro": "2.11.1"
+    "@vxrn/vite-plugin-metro": "2.11.2"
   },
   "peerDependenciesMeta": {
     "@vxrn/vite-plugin-metro": {
       "optional": true
     }
   },
-  "releaseSourceCommit": "e1b9792594f4ea0a7db81e95e4e0652f820e1a4a",
+  "releaseSourceCommit": "6c1420ae008fbd7ddcf7c4d36df8eeb10b27f0cb",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onejs/one.git",

package/src/exports/prebuildWithoutExpo.test.ts

@@ -235,7 +235,7 @@ ${APP_DELEGATE_PBXPROJ}`,
     })
     expect(podfile.content).toContain("platform :ios, '17.0'")
     expect(podfile.content).toContain(
-      `config = use_native_modules!(['node', '-e', "process.argv=['', '', 'config'];require(require('module').createRequire(require.resolve('vxrn/package.json')).resolve('@react-native-community/cli')).run()"])`
+      `config = use_native_modules!(vxrn_skia_dawn_config(['node', '-e', "process.argv=['', '', 'config'];require(require('module').createRequire(require.resolve('vxrn/package.json')).resolve('@react-native-community/cli')).run()"]))`
     )
     expect(podfile.content).toContain(
       "  # [vxrn/one] nitro web image modular header\n  pod 'SDWebImage', :modular_headers => true\n  # [vxrn/one] swift packages\n  Dir[File.join(__dir__, 'OneSwiftPackages'"
@@ -1086,7 +1086,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
       app,
     })
     const podScript = podfile.content?.match(
-      /use_native_modules!\(\['node', '-e', "([^"\n]+)"\]\)/
+      /use_native_modules!\(vxrn_skia_dawn_config\(\['node', '-e', "([^"\n]+)"\]\)\)/
     )?.[1]
     if (!podScript) throw new Error('expected iOS pod discovery command')
     expect(

package/src/exports/prebuildWithoutExpo.ts

@@ -45,6 +45,7 @@ type NativeProjectPatches = {
   ): string
   injectFmtCxx17FixIntoPodfile(input: string): string
   injectWebGPUHeaderPathsIntoPodfile(input: string): string
+  injectSkiaDawnVendoringIntoPodfile(input: string): string
   injectOneSwiftPackagesIntoPodfile(input: string): string
   injectHermesMinificationPatchIntoPodfile(input: string): string
   injectReactNativeScreensGammaIntoPodfile(input: string): string
@@ -2942,6 +2943,7 @@ end`
         nativeModulesCall,
         `config = use_native_modules!(['node', '-e', "process.argv=['', '', 'config'];require(require('module').createRequire(require.resolve('vxrn/package.json')).resolve('@react-native-community/cli')).run()"])`
       )
+      rendered = nativeProjectPatches.injectSkiaDawnVendoringIntoPodfile(rendered)
       if (
         !rendered.includes('[vxrn/one] fmt c++17 fix') ||
         !rendered.includes('[vxrn/one] minify iOS Hermes Release bundle input')

package/types/exports/prebuildWithoutExpo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prebuildWithoutExpo.d.ts","sourceRoot":"","sources":["../../src/exports/prebuildWithoutExpo.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,iBAAiB,EAEjB,KAAK,iBAAiB,EAEvB,MAAM,+BAA+B,CAAA;AAsEtC,YAAY,EAAE,iBAAiB,IAAI,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAE3F,eAAO,MAAM,mBAAmB,0BAAoB,CAAA;AA6EpD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAwChE;AAyJD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CA8CrI;AAg8BD,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB;AA6sBD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,iBAAiB,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,GAAG,oBAAoB,CAw8BvB;AAED,eAAO,MAAM,mBAAmB,SACxB,MAAM,YACF,KAAK,GAAG,SAAS,OACtB,iBAAiB,WACd,MAAM,kBAuEf,CAAA;AAgCD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,QA6EvD;AAID,wBAAsB,qBAAqB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,iBAsDzF;AAyFD,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,iBAAiB,CAAA;IACtB,SAAS,EAAE,SAAS,yBAAyB,EAAE,CAAA;CAChD,GAAG,IAAI,CA8BP;AAID,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,yBAAyB,EAAE,CAAC,CA+BtC;AAKD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;CACtC,GAAG,IAAI,CAaP"}
+{"version":3,"file":"prebuildWithoutExpo.d.ts","sourceRoot":"","sources":["../../src/exports/prebuildWithoutExpo.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,iBAAiB,EAEjB,KAAK,iBAAiB,EAEvB,MAAM,+BAA+B,CAAA;AAuEtC,YAAY,EAAE,iBAAiB,IAAI,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAE3F,eAAO,MAAM,mBAAmB,0BAAoB,CAAA;AA6EpD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAwChE;AAyJD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CA8CrI;AAg8BD,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB;AA6sBD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,iBAAiB,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,GAAG,oBAAoB,CAy8BvB;AAED,eAAO,MAAM,mBAAmB,SACxB,MAAM,YACF,KAAK,GAAG,SAAS,OACtB,iBAAiB,WACd,MAAM,kBAuEf,CAAA;AAgCD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,QA6EvD;AAID,wBAAsB,qBAAqB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,iBAsDzF;AAyFD,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,iBAAiB,CAAA;IACtB,SAAS,EAAE,SAAS,yBAAyB,EAAE,CAAA;CAChD,GAAG,IAAI,CA8BP;AAID,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,yBAAyB,EAAE,CAAC,CA+BtC;AAKD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;CACtC,GAAG,IAAI,CAaP"}