@react-three/fiber 8.13.7 → 8.13.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.13.9
+
+### Patch Changes
+
+- 44d57b3c: fix(native): TextureLoader should remain consistent with FileLoader
+
+## 8.13.8
+
+### Patch Changes
+
+- 5da26d52: fix(useLoader): dispose loaders
+
 ## 8.13.7
 
 ### Patch Changes

package/dist/{index-673ef987.esm.js → index-6662eaf2.esm.js}

@@ -1631,16 +1631,21 @@ function useFrame(callback, renderPriority = 0) {
 function useGraph(object) {
   return React.useMemo(() => buildGraph(object), [object]);
 }
+const memoizedLoaders = new WeakMap();
 function loadingFn(extensions, onProgress) {
   return function (Proto, ...input) {
     // Construct new loader and run extensions
-    const loader = new Proto();
+    let loader = memoizedLoaders.get(Proto);
+    if (!loader) {
+      loader = new Proto();
+      memoizedLoaders.set(Proto, loader);
+    }
     if (extensions) extensions(loader);
     // Go through the urls and load them
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`))))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
   };
 }
 

package/dist/{index-3bf7d7a3.cjs.dev.js → index-be1f7f7b.cjs.dev.js}

@@ -1658,16 +1658,21 @@ function useFrame(callback, renderPriority = 0) {
 function useGraph(object) {
   return React__namespace.useMemo(() => buildGraph(object), [object]);
 }
+const memoizedLoaders = new WeakMap();
 function loadingFn(extensions, onProgress) {
   return function (Proto, ...input) {
     // Construct new loader and run extensions
-    const loader = new Proto();
+    let loader = memoizedLoaders.get(Proto);
+    if (!loader) {
+      loader = new Proto();
+      memoizedLoaders.set(Proto, loader);
+    }
     if (extensions) extensions(loader);
     // Go through the urls and load them
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`))))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
   };
 }
 

package/dist/{index-e0fec69f.cjs.prod.js → index-dad7ba86.cjs.prod.js}

@@ -1658,16 +1658,21 @@ function useFrame(callback, renderPriority = 0) {
 function useGraph(object) {
   return React__namespace.useMemo(() => buildGraph(object), [object]);
 }
+const memoizedLoaders = new WeakMap();
 function loadingFn(extensions, onProgress) {
   return function (Proto, ...input) {
     // Construct new loader and run extensions
-    const loader = new Proto();
+    let loader = memoizedLoaders.get(Proto);
+    if (!loader) {
+      loader = new Proto();
+      memoizedLoaders.set(Proto, loader);
+    }
     if (extensions) extensions(loader);
     // Go through the urls and load them
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`))))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
   };
 }
 

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-3bf7d7a3.cjs.dev.js');
+var index = require('./index-be1f7f7b.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-e0fec69f.cjs.prod.js');
+var index = require('./index-dad7ba86.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-673ef987.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-673ef987.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-6662eaf2.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-6662eaf2.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-3bf7d7a3.cjs.dev.js');
+var index = require('../../dist/index-be1f7f7b.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -166,6 +166,7 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   const prevTextureLoad = THREE__namespace.TextureLoader.prototype.load;
   THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
+    if (this.path) url = this.path + url;
     const texture = new THREE__namespace.Texture();
 
     // @ts-ignore

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-e0fec69f.cjs.prod.js');
+var index = require('../../dist/index-dad7ba86.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -166,6 +166,7 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   const prevTextureLoad = THREE__namespace.TextureLoader.prototype.load;
   THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
+    if (this.path) url = this.path + url;
     const texture = new THREE__namespace.Texture();
 
     // @ts-ignore

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-673ef987.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-673ef987.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-6662eaf2.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-6662eaf2.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -139,6 +139,7 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   const prevTextureLoad = THREE.TextureLoader.prototype.load;
   THREE.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
+    if (this.path) url = this.path + url;
     const texture = new THREE.Texture();
 
     // @ts-ignore

package/package.json

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