@react-three/fiber 9.4.0 → 9.4.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 9.4.2
+
+### Patch Changes
+
+- 3d445fd158b25eb380cd27bd2e01304016aa23e3: fix: Expo SDK 54 compatibility through workaround
+
+## 9.4.1
+
+### Patch Changes
+
+- 4f8cec0d79003a9ef6d1ca1e56de94aec4158714: fix: pass DevTools config through createReconciler to fix React DevTools
+
 ## 9.4.0
 
 ### Minor Changes

package/dist/{events-f8cd670d.esm.js → events-1eccaf1c.esm.js}

@@ -1257,13 +1257,101 @@ useLoader.clear = function (loader, input) {
   return clear([loader, ...keys]);
 };
 
+var packageData = {
+	name: "@react-three/fiber",
+	version: "9.4.2",
+	description: "A React renderer for Threejs",
+	keywords: [
+		"react",
+		"renderer",
+		"fiber",
+		"three",
+		"threejs"
+	],
+	author: "Paul Henschel (https://github.com/drcmda)",
+	license: "MIT",
+	maintainers: [
+		"Josh Ellis (https://github.com/joshuaellis)",
+		"Cody Bennett (https://github.com/codyjasonbennett)",
+		"Kris Baumgarter (https://github.com/krispya)"
+	],
+	bugs: {
+		url: "https://github.com/pmndrs/react-three-fiber/issues"
+	},
+	homepage: "https://github.com/pmndrs/react-three-fiber#readme",
+	repository: {
+		type: "git",
+		url: "git+https://github.com/pmndrs/react-three-fiber.git"
+	},
+	collective: {
+		type: "opencollective",
+		url: "https://opencollective.com/react-three-fiber"
+	},
+	main: "dist/react-three-fiber.cjs.js",
+	module: "dist/react-three-fiber.esm.js",
+	types: "dist/react-three-fiber.cjs.d.ts",
+	"react-native": "native/dist/react-three-fiber-native.cjs.js",
+	sideEffects: false,
+	preconstruct: {
+		entrypoints: [
+			"index.tsx",
+			"native.tsx"
+		]
+	},
+	scripts: {
+		prebuild: "cp ../../readme.md readme.md"
+	},
+	dependencies: {
+		"@babel/runtime": "^7.17.8",
+		"@types/react-reconciler": "^0.32.0",
+		"@types/webxr": "*",
+		"base64-js": "^1.5.1",
+		buffer: "^6.0.3",
+		"its-fine": "^2.0.0",
+		"react-reconciler": "^0.31.0",
+		"react-use-measure": "^2.1.7",
+		scheduler: "^0.25.0",
+		"suspend-react": "^0.1.3",
+		"use-sync-external-store": "^1.4.0",
+		zustand: "^5.0.3"
+	},
+	peerDependencies: {
+		expo: ">=43.0",
+		"expo-asset": ">=8.4",
+		"expo-file-system": ">=11.0",
+		"expo-gl": ">=11.0",
+		react: "^19.0.0",
+		"react-dom": "^19.0.0",
+		"react-native": ">=0.78",
+		three: ">=0.156"
+	},
+	peerDependenciesMeta: {
+		"react-dom": {
+			optional: true
+		},
+		"react-native": {
+			optional: true
+		},
+		expo: {
+			optional: true
+		},
+		"expo-asset": {
+			optional: true
+		},
+		"expo-file-system": {
+			optional: true
+		},
+		"expo-gl": {
+			optional: true
+		}
+	}
+};
+
 function createReconciler(config) {
   const reconciler = Reconciler(config);
-  reconciler.injectIntoDevTools({
-    bundleType: typeof process !== 'undefined' && process.env.NODE_ENV !== 'production' ? 1 : 0,
-    rendererPackageName: '@react-three/fiber',
-    version: React.version
-  });
+
+  // @ts-ignore DefinitelyTyped is not up to date
+  reconciler.injectIntoDevTools();
   return reconciler;
 }
 const NoEventPriority = 0;
@@ -1685,7 +1773,10 @@ const reconciler = /* @__PURE__ */createReconciler({
         return DefaultEventPriority;
     }
   },
-  resetFormInstance() {}
+  resetFormInstance() {},
+  // @ts-ignore DefinitelyTyped is not up to date
+  rendererPackageName: '@react-three/fiber',
+  rendererVersion: packageData.version
 });
 
 const _roots = new Map();

package/dist/{events-3afec6fc.cjs.prod.js → events-5c8d1731.cjs.prod.js}

@@ -1283,13 +1283,101 @@ useLoader.clear = function (loader, input) {
   return suspendReact.clear([loader, ...keys]);
 };
 
+var packageData = {
+	name: "@react-three/fiber",
+	version: "9.4.2",
+	description: "A React renderer for Threejs",
+	keywords: [
+		"react",
+		"renderer",
+		"fiber",
+		"three",
+		"threejs"
+	],
+	author: "Paul Henschel (https://github.com/drcmda)",
+	license: "MIT",
+	maintainers: [
+		"Josh Ellis (https://github.com/joshuaellis)",
+		"Cody Bennett (https://github.com/codyjasonbennett)",
+		"Kris Baumgarter (https://github.com/krispya)"
+	],
+	bugs: {
+		url: "https://github.com/pmndrs/react-three-fiber/issues"
+	},
+	homepage: "https://github.com/pmndrs/react-three-fiber#readme",
+	repository: {
+		type: "git",
+		url: "git+https://github.com/pmndrs/react-three-fiber.git"
+	},
+	collective: {
+		type: "opencollective",
+		url: "https://opencollective.com/react-three-fiber"
+	},
+	main: "dist/react-three-fiber.cjs.js",
+	module: "dist/react-three-fiber.esm.js",
+	types: "dist/react-three-fiber.cjs.d.ts",
+	"react-native": "native/dist/react-three-fiber-native.cjs.js",
+	sideEffects: false,
+	preconstruct: {
+		entrypoints: [
+			"index.tsx",
+			"native.tsx"
+		]
+	},
+	scripts: {
+		prebuild: "cp ../../readme.md readme.md"
+	},
+	dependencies: {
+		"@babel/runtime": "^7.17.8",
+		"@types/react-reconciler": "^0.32.0",
+		"@types/webxr": "*",
+		"base64-js": "^1.5.1",
+		buffer: "^6.0.3",
+		"its-fine": "^2.0.0",
+		"react-reconciler": "^0.31.0",
+		"react-use-measure": "^2.1.7",
+		scheduler: "^0.25.0",
+		"suspend-react": "^0.1.3",
+		"use-sync-external-store": "^1.4.0",
+		zustand: "^5.0.3"
+	},
+	peerDependencies: {
+		expo: ">=43.0",
+		"expo-asset": ">=8.4",
+		"expo-file-system": ">=11.0",
+		"expo-gl": ">=11.0",
+		react: "^19.0.0",
+		"react-dom": "^19.0.0",
+		"react-native": ">=0.78",
+		three: ">=0.156"
+	},
+	peerDependenciesMeta: {
+		"react-dom": {
+			optional: true
+		},
+		"react-native": {
+			optional: true
+		},
+		expo: {
+			optional: true
+		},
+		"expo-asset": {
+			optional: true
+		},
+		"expo-file-system": {
+			optional: true
+		},
+		"expo-gl": {
+			optional: true
+		}
+	}
+};
+
 function createReconciler(config) {
   const reconciler = Reconciler__default["default"](config);
-  reconciler.injectIntoDevTools({
-    bundleType: typeof process !== 'undefined' &&         "production" !== 'production' ? 1 : 0,
-    rendererPackageName: '@react-three/fiber',
-    version: React__namespace.version
-  });
+
+  // @ts-ignore DefinitelyTyped is not up to date
+  reconciler.injectIntoDevTools();
   return reconciler;
 }
 const NoEventPriority = 0;
@@ -1711,7 +1799,10 @@ const reconciler = /* @__PURE__ */createReconciler({
         return constants.DefaultEventPriority;
     }
   },
-  resetFormInstance() {}
+  resetFormInstance() {},
+  // @ts-ignore DefinitelyTyped is not up to date
+  rendererPackageName: '@react-three/fiber',
+  rendererVersion: packageData.version
 });
 
 const _roots = new Map();

package/dist/{events-6ab58ae5.cjs.dev.js → events-c80effae.cjs.dev.js}

@@ -1283,13 +1283,101 @@ useLoader.clear = function (loader, input) {
   return suspendReact.clear([loader, ...keys]);
 };
 
+var packageData = {
+	name: "@react-three/fiber",
+	version: "9.4.2",
+	description: "A React renderer for Threejs",
+	keywords: [
+		"react",
+		"renderer",
+		"fiber",
+		"three",
+		"threejs"
+	],
+	author: "Paul Henschel (https://github.com/drcmda)",
+	license: "MIT",
+	maintainers: [
+		"Josh Ellis (https://github.com/joshuaellis)",
+		"Cody Bennett (https://github.com/codyjasonbennett)",
+		"Kris Baumgarter (https://github.com/krispya)"
+	],
+	bugs: {
+		url: "https://github.com/pmndrs/react-three-fiber/issues"
+	},
+	homepage: "https://github.com/pmndrs/react-three-fiber#readme",
+	repository: {
+		type: "git",
+		url: "git+https://github.com/pmndrs/react-three-fiber.git"
+	},
+	collective: {
+		type: "opencollective",
+		url: "https://opencollective.com/react-three-fiber"
+	},
+	main: "dist/react-three-fiber.cjs.js",
+	module: "dist/react-three-fiber.esm.js",
+	types: "dist/react-three-fiber.cjs.d.ts",
+	"react-native": "native/dist/react-three-fiber-native.cjs.js",
+	sideEffects: false,
+	preconstruct: {
+		entrypoints: [
+			"index.tsx",
+			"native.tsx"
+		]
+	},
+	scripts: {
+		prebuild: "cp ../../readme.md readme.md"
+	},
+	dependencies: {
+		"@babel/runtime": "^7.17.8",
+		"@types/react-reconciler": "^0.32.0",
+		"@types/webxr": "*",
+		"base64-js": "^1.5.1",
+		buffer: "^6.0.3",
+		"its-fine": "^2.0.0",
+		"react-reconciler": "^0.31.0",
+		"react-use-measure": "^2.1.7",
+		scheduler: "^0.25.0",
+		"suspend-react": "^0.1.3",
+		"use-sync-external-store": "^1.4.0",
+		zustand: "^5.0.3"
+	},
+	peerDependencies: {
+		expo: ">=43.0",
+		"expo-asset": ">=8.4",
+		"expo-file-system": ">=11.0",
+		"expo-gl": ">=11.0",
+		react: "^19.0.0",
+		"react-dom": "^19.0.0",
+		"react-native": ">=0.78",
+		three: ">=0.156"
+	},
+	peerDependenciesMeta: {
+		"react-dom": {
+			optional: true
+		},
+		"react-native": {
+			optional: true
+		},
+		expo: {
+			optional: true
+		},
+		"expo-asset": {
+			optional: true
+		},
+		"expo-file-system": {
+			optional: true
+		},
+		"expo-gl": {
+			optional: true
+		}
+	}
+};
+
 function createReconciler(config) {
   const reconciler = Reconciler__default["default"](config);
-  reconciler.injectIntoDevTools({
-    bundleType: typeof process !== 'undefined' && process.env.NODE_ENV !== 'production' ? 1 : 0,
-    rendererPackageName: '@react-three/fiber',
-    version: React__namespace.version
-  });
+
+  // @ts-ignore DefinitelyTyped is not up to date
+  reconciler.injectIntoDevTools();
   return reconciler;
 }
 const NoEventPriority = 0;
@@ -1711,7 +1799,10 @@ const reconciler = /* @__PURE__ */createReconciler({
         return constants.DefaultEventPriority;
     }
   },
-  resetFormInstance() {}
+  resetFormInstance() {},
+  // @ts-ignore DefinitelyTyped is not up to date
+  rendererPackageName: '@react-three/fiber',
+  rendererVersion: packageData.version
 });
 
 const _roots = new Map();

package/dist/react-three-fiber.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var events = require('./events-6ab58ae5.cjs.dev.js');
+var events = require('./events-c80effae.cjs.dev.js');
 var React = require('react');
 var THREE = require('three');
 var useMeasure = require('react-use-measure');

package/dist/react-three-fiber.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var events = require('./events-3afec6fc.cjs.prod.js');
+var events = require('./events-5c8d1731.cjs.prod.js');
 var React = require('react');
 var THREE = require('three');
 var useMeasure = require('react-use-measure');

package/dist/react-three-fiber.esm.js

@@ -1,5 +1,5 @@
-import { e as extend, u as useBridge, a as useMutableCallback, b as useIsomorphicLayoutEffect, c as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode, f as createPointerEvents } from './events-f8cd670d.esm.js';
-export { t as ReactThreeFiber, _ as _roots, x as act, k as addAfterEffect, j as addEffect, l as addTail, n as advance, s as applyProps, y as buildGraph, q as context, g as createEvents, o as createPortal, c as createRoot, w as dispose, f as events, e as extend, h as flushGlobalEffects, p as flushSync, v as getRootState, m as invalidate, r as reconciler, d as unmountComponentAtNode, D as useFrame, F as useGraph, z as useInstanceHandle, G as useLoader, A as useStore, C as useThree } from './events-f8cd670d.esm.js';
+import { e as extend, u as useBridge, a as useMutableCallback, b as useIsomorphicLayoutEffect, c as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode, f as createPointerEvents } from './events-1eccaf1c.esm.js';
+export { t as ReactThreeFiber, _ as _roots, x as act, k as addAfterEffect, j as addEffect, l as addTail, n as advance, s as applyProps, y as buildGraph, q as context, g as createEvents, o as createPortal, c as createRoot, w as dispose, f as events, e as extend, h as flushGlobalEffects, p as flushSync, v as getRootState, m as invalidate, r as reconciler, d as unmountComponentAtNode, D as useFrame, F as useGraph, z as useInstanceHandle, G as useLoader, A as useStore, C as useThree } from './events-1eccaf1c.esm.js';
 import * as React from 'react';
 import * as THREE from 'three';
 import useMeasure from 'react-use-measure';

package/native/dist/react-three-fiber-native.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var events = require('../../dist/events-6ab58ae5.cjs.dev.js');
+var events = require('../../dist/events-c80effae.cjs.dev.js');
 var React = require('react');
 var THREE = require('three');
 var reactNative = require('react-native');
@@ -10,7 +10,6 @@ var expoGl = require('expo-gl');
 var itsFine = require('its-fine');
 var jsxRuntime = require('react/jsx-runtime');
 var expoAsset = require('expo-asset');
-var fs = require('expo-file-system');
 var base64Js = require('base64-js');
 var buffer = require('buffer');
 require('react-reconciler/constants');
@@ -39,7 +38,6 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
-var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
 // TODO: React 19 needs support from react-native
 const _View = reactNative.View;
@@ -367,6 +365,16 @@ function createTouchEvents(store) {
   };
 }
 
+// Conditionally import expo-file-system/legacy to support Expo 54
+const getFileSystem = () => {
+  try {
+    return require('expo-file-system/legacy');
+  } catch {
+    return require('expo-file-system');
+  }
+};
+const fs = getFileSystem();
+
 // http://stackoverflow.com/questions/105034
 function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
@@ -405,9 +413,9 @@ async function getAsset(input) {
     if (input.startsWith('data:')) {
       const [header, data] = input.split(';base64,');
       const [, type] = header.split('/');
-      const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
-      await fs__namespace.writeAsStringAsync(uri, data, {
-        encoding: fs__namespace.EncodingType.Base64
+      const uri = fs.cacheDirectory + uuidv4() + `.${type}`;
+      await fs.writeAsStringAsync(uri, data, {
+        encoding: fs.EncodingType.Base64
       });
       return uri;
     }
@@ -419,8 +427,8 @@ async function getAsset(input) {
 
   // Unpack assets in Android Release Mode
   if (!uri.includes(':')) {
-    const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
-    await fs__namespace.copyAsync({
+    const file = `${fs.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
+    await fs.copyAsync({
       from: uri,
       to: file
     });
@@ -514,8 +522,8 @@ function polyfills() {
     if (this.path && typeof url === 'string') url = this.path + url;
     this.manager.itemStart(url);
     getAsset(url).then(async uri => {
-      const base64 = await fs__namespace.readAsStringAsync(uri, {
-        encoding: fs__namespace.EncodingType.Base64
+      const base64 = await fs.readAsStringAsync(uri, {
+        encoding: fs.EncodingType.Base64
       });
       const data = buffer.Buffer.from(base64, 'base64');
       onLoad == null ? void 0 : onLoad(data.buffer);

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var events = require('../../dist/events-3afec6fc.cjs.prod.js');
+var events = require('../../dist/events-5c8d1731.cjs.prod.js');
 var React = require('react');
 var THREE = require('three');
 var reactNative = require('react-native');
@@ -10,7 +10,6 @@ var expoGl = require('expo-gl');
 var itsFine = require('its-fine');
 var jsxRuntime = require('react/jsx-runtime');
 var expoAsset = require('expo-asset');
-var fs = require('expo-file-system');
 var base64Js = require('base64-js');
 var buffer = require('buffer');
 require('react-reconciler/constants');
@@ -39,7 +38,6 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
-var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
 // TODO: React 19 needs support from react-native
 const _View = reactNative.View;
@@ -367,6 +365,16 @@ function createTouchEvents(store) {
   };
 }
 
+// Conditionally import expo-file-system/legacy to support Expo 54
+const getFileSystem = () => {
+  try {
+    return require('expo-file-system/legacy');
+  } catch {
+    return require('expo-file-system');
+  }
+};
+const fs = getFileSystem();
+
 // http://stackoverflow.com/questions/105034
 function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
@@ -405,9 +413,9 @@ async function getAsset(input) {
     if (input.startsWith('data:')) {
       const [header, data] = input.split(';base64,');
       const [, type] = header.split('/');
-      const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
-      await fs__namespace.writeAsStringAsync(uri, data, {
-        encoding: fs__namespace.EncodingType.Base64
+      const uri = fs.cacheDirectory + uuidv4() + `.${type}`;
+      await fs.writeAsStringAsync(uri, data, {
+        encoding: fs.EncodingType.Base64
       });
       return uri;
     }
@@ -419,8 +427,8 @@ async function getAsset(input) {
 
   // Unpack assets in Android Release Mode
   if (!uri.includes(':')) {
-    const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
-    await fs__namespace.copyAsync({
+    const file = `${fs.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
+    await fs.copyAsync({
       from: uri,
       to: file
     });
@@ -514,8 +522,8 @@ function polyfills() {
     if (this.path && typeof url === 'string') url = this.path + url;
     this.manager.itemStart(url);
     getAsset(url).then(async uri => {
-      const base64 = await fs__namespace.readAsStringAsync(uri, {
-        encoding: fs__namespace.EncodingType.Base64
+      const base64 = await fs.readAsStringAsync(uri, {
+        encoding: fs.EncodingType.Base64
       });
       const data = buffer.Buffer.from(base64, 'base64');
       onLoad == null ? void 0 : onLoad(data.buffer);

package/native/dist/react-three-fiber-native.esm.js

@@ -1,5 +1,5 @@
-import { e as extend, u as useBridge, a as useMutableCallback, c as createRoot, b as useIsomorphicLayoutEffect, E as ErrorBoundary, B as Block, d as unmountComponentAtNode, f as createPointerEvents, g as createEvents } from '../../dist/events-f8cd670d.esm.js';
-export { t as ReactThreeFiber, _ as _roots, x as act, k as addAfterEffect, j as addEffect, l as addTail, n as advance, s as applyProps, y as buildGraph, q as context, g as createEvents, o as createPortal, c as createRoot, w as dispose, e as extend, h as flushGlobalEffects, p as flushSync, v as getRootState, m as invalidate, r as reconciler, d as unmountComponentAtNode, D as useFrame, F as useGraph, z as useInstanceHandle, G as useLoader, A as useStore, C as useThree } from '../../dist/events-f8cd670d.esm.js';
+import { e as extend, u as useBridge, a as useMutableCallback, c as createRoot, b as useIsomorphicLayoutEffect, E as ErrorBoundary, B as Block, d as unmountComponentAtNode, f as createPointerEvents, g as createEvents } from '../../dist/events-1eccaf1c.esm.js';
+export { t as ReactThreeFiber, _ as _roots, x as act, k as addAfterEffect, j as addEffect, l as addTail, n as advance, s as applyProps, y as buildGraph, q as context, g as createEvents, o as createPortal, c as createRoot, w as dispose, e as extend, h as flushGlobalEffects, p as flushSync, v as getRootState, m as invalidate, r as reconciler, d as unmountComponentAtNode, D as useFrame, F as useGraph, z as useInstanceHandle, G as useLoader, A as useStore, C as useThree } from '../../dist/events-1eccaf1c.esm.js';
 import * as React from 'react';
 import * as THREE from 'three';
 import { PanResponder, PixelRatio, StyleSheet, View, Platform, Image, NativeModules } from 'react-native';
@@ -7,7 +7,6 @@ import { GLView } from 'expo-gl';
 import { FiberProvider } from 'its-fine';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Asset } from 'expo-asset';
-import * as fs from 'expo-file-system';
 import { fromByteArray } from 'base64-js';
 import { Buffer } from 'buffer';
 import 'react-reconciler/constants';
@@ -342,6 +341,16 @@ function createTouchEvents(store) {
   };
 }
 
+// Conditionally import expo-file-system/legacy to support Expo 54
+const getFileSystem = () => {
+  try {
+    return require('expo-file-system/legacy');
+  } catch {
+    return require('expo-file-system');
+  }
+};
+const fs = getFileSystem();
+
 // http://stackoverflow.com/questions/105034
 function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "9.4.0",
+  "version": "9.4.2",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",