react-native-webgpu 0.12.0 → 0.13.0

package/Package.swift

@@ -1,6 +1,4 @@
 // swift-tools-version: 6.0
-// Generated by scripts/generate-package-swift.ts — do not edit by hand.
-// Re-run that script after a new Dawn release to update the URL/checksum below.
 //
 // SwiftPM manifest for react-native-webgpu. iOS only.
 // Additive: the CocoaPods podspec remains the supported default.
@@ -21,49 +19,94 @@ let packageRoot = URL(fileURLWithPath: Context.packageDirectory)
 let sibling = { (relative: String) -> String in
   URL(fileURLWithPath: "\(packageRoot)/\(relative)").standardized.path
 }
+// A node package next to this one: a sibling in the consumer's node_modules,
+// or under this monorepo's root.
+let nodePackage = { (name: String) -> String? in
+  ["../\(name)", "../../node_modules/\(name)"]
+    .map(sibling)
+    .first { FileManager.default.fileExists(atPath: "\($0)/package.json") }
+}
+let readJSON = { (path: String) -> [String: Any]? in
+  guard let data = FileManager.default.contents(atPath: path) else { return nil }
+  return try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+}
+
+// Dawn, the WebGPU implementation, comes from the react-native-webgpu-dawn npm
+// package this package depends on: an xcframework with the `webgpu/` and
+// `dawn/` headers embedded in every slice, which SwiftPM exposes to dependents
+// without any search path. react-native-skia's Graphite backend links the
+// same package, so an app installing both contains exactly one Dawn.
+guard let dawnPath = nodePackage("react-native-webgpu-dawn") else {
+  // Reached when the dependency was skipped at install time, which SwiftPM
+  // would otherwise report as an unresolvable dependency path.
+  fatalError(
+    """
+    react-native-webgpu-dawn was not found next to react-native-webgpu. It ships \
+    the Dawn binaries this package links against. Reinstall dependencies.
+    """)
+}
+let ownPackage = readJSON("\(packageRoot)/package.json") ?? [:]
+let dawnVersion =
+  (readJSON("\(dawnPath)/package.json")?["version"] as? String) ?? "unknown"
 
 // Skia Graphite and WebGPU must link the exact same Dawn, or the pair links
 // fine and crashes at runtime. react-native-skia's podspec enforces this at
-// `pod install` time by comparing its libs/.dawn-version against this
-// package's `dawn` field. A Swift package has no install hook, so the same
-// check runs here, at manifest evaluation. SwiftPM caches evaluations, so
-// after changing either package's Dawn version reset the package caches
-// (File > Packages > Reset Package Caches) if this does not re-run.
-let dawnReleaseTag = "dawn-chrome-m154"
-// Only Graphite builds of react-native-skia carry this marker (Ganesh builds
-// do not link Dawn and impose no constraint). From v3 the Skia binaries ship
-// in react-native-skia-graphite-apple-ios, which records the tag at
-// libs/.dawn-version; react-native-skia's podspec copies it into its own
-// libs/ at `pod install`, which never runs here. The v2 Graphite previews
-// (e.g. @shopify/react-native-skia@2.12.0-next.1) keep it in their own libs/.
-// The graphite packages are normally hoisted next to this package, but may
-// be nested under react-native-skia when the package manager cannot hoist
-// them. Every marker found is checked.
-let skiaDawnMarkers = [
-  "react-native-skia-graphite-apple-ios/libs/.dawn-version",
-  "react-native-skia-graphite-apple-macos/libs/.dawn-version",
-  "react-native-skia/node_modules/react-native-skia-graphite-apple-ios/libs/.dawn-version",
-  "react-native-skia/node_modules/react-native-skia-graphite-apple-macos/libs/.dawn-version",
-  "@shopify/react-native-skia/libs/.dawn-version",
-].flatMap { marker in
-  [
-    sibling("../\(marker)"), // consumer: sibling in node_modules
-    sibling("../../node_modules/\(marker)"), // this monorepo
-  ]
-}
-for marker in skiaDawnMarkers {
-  guard let data = FileManager.default.contents(atPath: marker),
-    let skiaDawn = String(data: data, encoding: .utf8)?
-      .trimmingCharacters(in: .whitespacesAndNewlines)
-  else { continue }
-  if skiaDawn != dawnReleaseTag {
+// `pod install` time; a Swift package has no install hook, so the same check
+// runs here, at manifest evaluation. SwiftPM caches evaluations, so after
+// changing either package's Dawn reset the package caches (File > Packages >
+// Reset Package Caches) if this does not re-run.
+//
+// A react-native-skia that depends on react-native-webgpu-dawn itself must pin
+// the same version as this package. Older Graphite builds (react-native-skia
+// 3.0.x) vendor their own Dawn and record its release tag at
+// libs/.dawn-version in their binary packages; this package's `dawn` field
+// names the release that Dawn is interchangeable with.
+if let skiaPath = nodePackage("react-native-skia"),
+  let skiaPackage = readJSON("\(skiaPath)/package.json"),
+  let skiaDawn = (skiaPackage["dependencies"] as? [String: String])?["react-native-webgpu-dawn"]
+{
+  if skiaDawn != dawnVersion {
     fatalError(
       """
-      react-native-webgpu: Dawn version mismatch. This package links \(dawnReleaseTag) \
-      but the react-native-skia Graphite binaries (\(marker)) link \(skiaDawn). \
-      Align the two packages so the app contains exactly one Dawn.
+      react-native-webgpu: Dawn version mismatch. This package links \
+      react-native-webgpu-dawn \(dawnVersion) but react-native-skia depends on \
+      \(skiaDawn). Align the two packages so the app contains exactly one Dawn.
       """)
   }
+} else {
+  let dawnReleaseTag =
+    "dawn-\((ownPackage["dawn"] as? String ?? "").replacingOccurrences(of: "/", with: "-"))"
+  // The graphite packages are normally hoisted next to this package, but may
+  // be nested under react-native-skia when the package manager cannot hoist
+  // them. The v2 Graphite previews (e.g. @shopify/react-native-skia@2.12.0-next.1)
+  // keep the marker in their own libs/. Every marker found is checked.
+  let skiaDawnMarkers = [
+    "react-native-skia-graphite-apple-ios/libs/.dawn-version",
+    "react-native-skia-graphite-apple-macos/libs/.dawn-version",
+    "react-native-skia/node_modules/react-native-skia-graphite-apple-ios/libs/.dawn-version",
+    "react-native-skia/node_modules/react-native-skia-graphite-apple-macos/libs/.dawn-version",
+    "@shopify/react-native-skia/libs/.dawn-version",
+  ].flatMap { marker in
+    [
+      sibling("../\(marker)"), // consumer: sibling in node_modules
+      sibling("../../node_modules/\(marker)"), // this monorepo
+    ]
+  }
+  for marker in skiaDawnMarkers {
+    guard let data = FileManager.default.contents(atPath: marker),
+      let skiaDawn = String(data: data, encoding: .utf8)?
+        .trimmingCharacters(in: .whitespacesAndNewlines)
+    else { continue }
+    if skiaDawn != dawnReleaseTag {
+      fatalError(
+        """
+        react-native-webgpu: Dawn version mismatch. This package links \
+        react-native-webgpu-dawn \(dawnVersion) (\(dawnReleaseTag)) but the \
+        react-native-skia Graphite binaries (\(marker)) link \(skiaDawn). Align \
+        the two packages so the app contains exactly one Dawn.
+        """)
+    }
+  }
 }
 
 // Unlike a native Xcode target, SwiftPM doesn't generate an implicit
@@ -71,15 +114,10 @@ for marker in skiaDawnMarkers {
 // including file's own directory. The sources use bare cross-directory
 // includes (e.g. apple/WebGPUModule.h includes "RNWebGPUManager.h" from
 // cpp/rnwgpu), so every directory that's the target of one of those bare
-// includes has to be listed explicitly here.
+// includes has to be listed explicitly here. The "webgpu/..." and "dawn/..."
+// includes resolve through the Dawn xcframework's embedded headers.
 let internalHeaderDirs = [
   "apple",
-  // "cpp" itself resolves the "webgpu/..." and "dawn/..." namespaced
-  // includes. Those two directories are only present locally when built via
-  // `yarn install-dawn` (without the xcframework's embedded headers); a
-  // remote binaryTarget's xcframework embeds them instead (see
-  // build-dawn.yml's `-headers` flag), so "cpp" not containing them there
-  // is fine — the xcframework's own headers cover it.
   "cpp",
   "cpp/jsi",
   "cpp/rnwgpu",
@@ -102,16 +140,9 @@ let package = Package(
   dependencies: [
     .package(name: "React-GeneratedCode", path: "../../../ios"),
     .package(name: "ReactNative", path: "../../../../xcframeworks"),
+    .package(path: dawnPath),
   ],
   targets: [
-    // Dawn's compiled WebGPU implementation. The xcframework embeds the
-    // `webgpu/` and `dawn/` C headers per-slice (built via `-headers` in
-    // build-dawn.yml), so SPM exposes them to dependents automatically.
-    .binaryTarget(
-      name: "WebGPUDawn",
-      url: "https://github.com/wcandillon/react-native-webgpu/releases/download/dawn-chrome-m154/dawn-apple-dawn-chrome-m154.xcframework.zip",
-      checksum: "896575ffbc99610198a83d061f8c5a2789139b7f16c669fbf3a9f7a7ac9be123"
-    ),
     .target(
       name: "ReactNativeWebGPU",
       dependencies: [
@@ -120,13 +151,12 @@ let package = Package(
         .product(name: "ReactNativeDependenciesHeaders", package: "ReactNative"),
         // RNWgpuViewSpec, generated by the app's codegen run.
         .product(name: "ReactAppHeaders", package: "React-GeneratedCode"),
-        "WebGPUDawn",
+        .product(name: "react-native-webgpu-dawn", package: "react-native-webgpu-dawn"),
       ],
       // apple/ and cpp/ have no common ancestor below the package root, and
       // .headerSearchPath cannot escape the target path.
       path: ".",
-      // Explicit, so SwiftPM never walks node_modules, lib, android, or the
-      // headers-only cpp/webgpu and cpp/dawn trees.
+      // Explicit, so SwiftPM never walks node_modules, lib or android.
       sources: ["apple", "cpp/jsi", "cpp/rnwgpu"],
       // SwiftPM requires a public headers directory inside the target and
       // defaults to "include", which this package does not have.

package/android/CMakeLists.txt

@@ -7,8 +7,6 @@ set (CMAKE_CXX_STANDARD_REQUIRED True)
 
 set (PACKAGE_NAME "react-native-webgpu")
 
-#link_directories(../libs/android/${ANDROID_ABI}/)
-
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_definitions(-DDEBUG=1)
 endif()
@@ -19,7 +17,15 @@ else()
     add_definitions(-DRNF_ENABLE_LOGS=0)
 endif()
 
-set (WEBGPU_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
+# Dawn comes from the react-native-webgpu-dawn npm package (DAWN_DIR is passed
+# by build.gradle): the shared library per ABI and the headers.
+if(NOT DAWN_DIR)
+    message(FATAL_ERROR "react-native-webgpu: DAWN_DIR is not set (the react-native-webgpu-dawn package directory)")
+endif()
+set (WEBGPU_LIBS_PATH "${DAWN_DIR}/libs/android/${ANDROID_ABI}")
+if(NOT EXISTS "${WEBGPU_LIBS_PATH}/libwebgpu_dawn.so")
+    message(FATAL_ERROR "react-native-webgpu: libwebgpu_dawn.so not found at ${WEBGPU_LIBS_PATH}. Reinstall dependencies (yarn install / npm install).")
+endif()
 
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
@@ -72,8 +78,8 @@ target_include_directories(
         ../cpp/rnwgpu/api
         ../cpp/rnwgpu/api/descriptors
         ../cpp/jsi
-        ../cpp/webgpu
         ../cpp/platform
+        "${DAWN_DIR}/include"
 
         ${libfbjni_include_DIRS}
 )

package/android/build.gradle

@@ -45,6 +45,28 @@ static def findNodeModules(baseDir) {
 
 def nodeModules = findNodeModules(projectDir)
 
+// Resolve a node package directory using Node's own module resolution
+// (mirrors `require.resolve(pkg/package.json)`).
+static def resolveNodePackage(packageName, baseDir) {
+  def script = "process.stdout.write(require('path').dirname(require.resolve('${packageName}/package.json')))"
+  def proc = ["node", "-e", script].execute(null, baseDir)
+  proc.waitFor()
+  if (proc.exitValue() != 0) {
+    throw new GradleException(
+      "react-native-webgpu: Could not resolve the '${packageName}' package. " +
+      "Make sure dependencies are installed (yarn install / npm install).\n" + proc.err.text
+    )
+  }
+  return proc.text.trim()
+}
+
+// Dawn, the WebGPU implementation, ships in the react-native-webgpu-dawn npm
+// package this package depends on: libs/android/<abi>/libwebgpu_dawn.so and
+// the headers under include/. react-native-skia's Graphite backend links the
+// same package, so an app installing both contains exactly one Dawn.
+def dawnDir = resolveNodePackage('react-native-webgpu-dawn', projectDir)
+logger.warn("react-native-webgpu: Dawn from ${dawnDir}")
+
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Wgpu_" + name]
 }
@@ -75,6 +97,7 @@ android {
         abiFilters (*reactNativeArchitectures())
         arguments '-DANDROID_STL=c++_shared',
           "-DNODE_MODULES_DIR=${nodeModules}",
+          "-DDAWN_DIR=${dawnDir}",
           "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
       }
     }

package/cpp/rnwgpu/SurfaceRegistry.h

@@ -401,8 +401,8 @@ public:
   // not touch the device, and this must not change behaviour there.
   //
   // Remove once the pinned Dawn contains the upstream fix; the check in
-  // scripts/install-dawn.ts fails the install when the Dawn pin changes so
-  // that decision is not forgotten.
+  // scripts/check-dawn.ts fails when the Dawn the react-native-webgpu-dawn
+  // package was built from changes, so that decision is not forgotten.
   void releaseSurfaceForDevice(const wgpu::Device &device) {
 #if defined(__ANDROID__)
     std::unique_lock<std::shared_mutex> lock(_mutex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-webgpu",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "React Native WebGPU",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -18,15 +18,13 @@
     "android/src/**",
     "cpp/**/*.{h,cpp}",
     "apple/**",
-    "libs/**",
     "*.podspec",
     "Package.swift",
     "react-native.config.js",
     "app.plugin.js",
     "plugin/build/**"
   ],
-  "dawn": "chrome-m154",
-  "dawnCommit": "3d786993a7ded64c4ebb4884b9b079db9ad0e580",
+  "dawn": "chrome-m154a",
   "scripts": {
     "test": "NODE_OPTIONS='--experimental-require-module' jest -i",
     "test:ref": "REFERENCE=true NODE_OPTIONS='--experimental-require-module' jest -i",
@@ -37,15 +35,12 @@
     "build": "bob build && yarn build:plugin",
     "build:plugin": "tsc -p plugin/tsconfig.build.json",
     "release": "semantic-release",
-    "build-dawn": "tsx scripts/build/dawn.ts",
-    "clean-dawn": "rimraf ./libs && rimraf ../../externals/dawn/out",
     "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
     "clang-format-ios": "find apple/ -iname \"*.h\" -o -iname \"*.mm\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "clang-format-android": "find android/cpp/ -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "clang-format-common": "find cpp/rnwgpu -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=example --exclude=android/.cxx --exclude=cpp/webgpu --exclude=cpp/dawn --exclude=ios --exclude=android/build --exclude=node_modules --recursive .",
-    "install-dawn": "tsx scripts/install-dawn.ts",
-    "generate-package-swift": "tsx scripts/generate-package-swift.ts"
+    "check-dawn": "tsx scripts/check-dawn.ts"
   },
   "keywords": [
     "react-native",
@@ -114,6 +109,9 @@
     "ws": "^8.18.0",
     "yargs": "^17.7.2"
   },
+  "dependencies": {
+    "react-native-webgpu-dawn": "154.2.0"
+  },
   "peerDependencies": {
     "react": "*",
     "react-native": ">=0.81.0",

package/react-native-webgpu.podspec

@@ -1,8 +1,44 @@
 require "json"
+require "fileutils"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
+# Resolve a node package directory using Node's own module resolution
+# (mirrors `require.resolve(pkg/package.json)`). A lambda rather than a `def`:
+# CocoaPods evaluates the podspec inside the `Pod` module, where top-level
+# methods are not reachable at the call site.
+resolve_node_package = lambda do |name, base_dir|
+  script = "process.stdout.write(require('path').dirname(require.resolve('#{name}/package.json')))"
+  dir = Dir.chdir(base_dir) { `node -e "#{script}" 2>/dev/null`.strip }
+  dir.empty? ? nil : dir
+end
+
+# Dawn, the WebGPU implementation, ships in the react-native-webgpu-dawn npm
+# package this package depends on (react-native-skia's Graphite backend links
+# the same one, so an app installing both contains exactly one Dawn). Its
+# headers are used in place, but CocoaPods only vendors frameworks from inside
+# the pod, so the xcframework is copied into libs/apple at `pod install` time.
+# The copy is stamped with the package version and skipped when it already
+# matches, which keeps CocoaPods' cache intact across installs.
+dawn_dir = resolve_node_package.call('react-native-webgpu-dawn', __dir__)
+if dawn_dir.nil?
+  raise "react-native-webgpu: the react-native-webgpu-dawn package was not found. " \
+        "It ships the Dawn binaries this package links against; make sure " \
+        "dependencies are installed (yarn install / npm install), then run `pod install` again."
+end
+dawn_version = JSON.parse(File.read(File.join(dawn_dir, 'package.json')))['version'].to_s
+dawn_include = File.join(dawn_dir, 'include')
+dawn_libs = File.join(__dir__, 'libs', 'apple')
+dawn_marker = File.join(dawn_libs, '.version')
+unless File.exist?(dawn_marker) && File.read(dawn_marker).strip == dawn_version
+  Pod::UI.puts "react-native-webgpu: installing Dawn (react-native-webgpu-dawn #{dawn_version})"
+  FileUtils.rm_rf(dawn_libs)
+  FileUtils.mkdir_p(dawn_libs)
+  FileUtils.cp_r(File.join(dawn_dir, 'libs', 'apple', 'libwebgpu_dawn.xcframework'), dawn_libs)
+  File.write(dawn_marker, dawn_version)
+end
+
 Pod::Spec.new do |s|
   s.name         = "react-native-webgpu"
   s.version      = package["version"]
@@ -50,7 +86,7 @@ Pod::Spec.new do |s|
   end
 
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '$(PODS_TARGET_SRCROOT)/cpp',
+    'HEADER_SEARCH_PATHS' => "$(PODS_TARGET_SRCROOT)/cpp \"#{dawn_include}\"",
     # Xcode's all-target headermaps let same-named headers leak across pods
     # (e.g. @shopify/react-native-skia keeps a jsi/ helper layer with
     # identical relative header paths). Resolve includes strictly through our
@@ -66,7 +102,7 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
     s.compiler_flags = folly_compiler_flags
     s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/cpp\"",
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/cpp\" \"#{dawn_include}\"",
         "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
     }