Skip to content

Commit 13e7da4

Browse files
CodyJasonBennettCodyJasonBennett
committed
chore: cleanup
1 parent 72d300c commit 13e7da4

File tree

6 files changed

+55
-21
lines changed

6 files changed

+55
-21
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"@eslint/eslintrc": "^3.2.0",
8484
"@eslint/js": "^9.15.0",
8585
"@playwright/test": "^1.45.2",
86-
"@react-three/fiber": "./react-three-fiber-v9.0.0-rc.2-drei-0.tgz",
86+
"@react-three/fiber": "9.0.0-rc.1",
8787
"@rollup/plugin-babel": "^5.3.0",
8888
"@rollup/plugin-commonjs": "^19.0.0",
8989
"@rollup/plugin-json": "^4.1.0",

‎react-three-fiber-v9.0.0-rc.2-drei-0.tgz

-94 KB
Binary file not shown.

‎src/core/Gltf.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ export const useGLTF = <T extends Path>(
3535
useMeshopt?: UseMeshopt,
3636
extendLoader?: ExtendLoader
3737
): T extends any[] ? (GLTF & ObjectMap)[] : GLTF & ObjectMap =>
38+
// @ts-expect-error
3839
useLoader(GLTFLoader, path, extensions(useDraco, useMeshopt, extendLoader))
3940

4041
useGLTF.preload = (path: Path, useDraco?: UseDraco, useMeshopt?: UseMeshopt, extendLoader?: ExtendLoader) =>
42+
// @ts-expect-error
4143
useLoader.preload(GLTFLoader, path, extensions(useDraco, useMeshopt, extendLoader))
4244

4345
useGLTF.clear = (path: Path) => useLoader.clear(GLTFLoader, path)

‎src/core/Splat.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import * as THREE from 'three'
88
import * as React from 'react'
9-
import { extend, useThree, useFrame, useLoader, ThreeElements } from '@react-three/fiber'
9+
import { extend, useThree, useFrame, useLoader, LoaderProto, ThreeElements } from '@react-three/fiber'
1010
import { shaderMaterial } from './shaderMaterial'
1111
import { version } from '../helpers/constants'
1212

@@ -636,7 +636,9 @@ export function Splat({
636636

637637
// Shared state, globally memoized, the same url re-uses the same daza
638638
const shared = useLoader(SplatLoader, src, (loader) => {
639+
// @ts-expect-error
639640
loader.gl = gl
641+
// @ts-expect-error
640642
loader.chunkSize = chunkSize
641643
}) as SharedState
642644

‎test/e2e/e2e.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ tmp=$(mktemp -d)
88
# Build the package
99
(cd $DIST; npm pack)
1010
TGZ=$(realpath "$DIST/react-three-drei-0.0.0-semantic-release.tgz")
11-
R3FT=../react-three-fiber-v9.0.0-rc.2-drei-0.tgz
1211

1312
snapshot() {
1413
local UPDATE_SNAPSHOTS=""
@@ -40,7 +39,7 @@ appdir="$tmp/$appname"
4039
(cd $tmp; npm create -y vite@latest $appname -- --template react-ts)
4140

4241
# drei
43-
(cd $appdir; npm i @types/react@latest @types/react-dom@latest react@latest react-dom@latest $R3FT $TGZ --legacy-peer-deps)
42+
(cd $appdir; npm i @types/react@latest @types/react-dom@latest react@latest react-dom@latest @react-three/fiber@rc $TGZ --legacy-peer-deps)
4443

4544
# App.tsx
4645
cp App.tsx $appdir/src/App.tsx

‎yarn.lock

+48-17
Original file line numberDiff line numberDiff line change
@@ -1734,9 +1734,10 @@
17341734
resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.5.tgz#e5dd180f3ed985b44fd2cd2f32aa9203752ef3e8"
17351735
integrity sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==
17361736

1737-
"@react-three/fiber@./react-three-fiber-v9.0.0-rc.2-drei-0.tgz":
1738-
version "9.0.0-rc.2-drei-0"
1739-
resolved "./react-three-fiber-v9.0.0-rc.2-drei-0.tgz#f5f83c807afe2beda8d5334d4ad55003ae9ac697"
1737+
"@react-three/[email protected]":
1738+
version "9.0.0-rc.1"
1739+
resolved "https://registry.yarnpkg.com/@react-three/fiber/-/fiber-9.0.0-rc.1.tgz#d0e386e89790d47ad1bdb69acbeb9befdac7b59c"
1740+
integrity sha512-3x/y/ZmW6PPC3yb7/pZBEmAT957xhkVGUplO1ez5qKOFw9hNGL2xkBszkiNsCTJ2/stSnTSHuD68yy0xBYwu/Q==
17401741
dependencies:
17411742
"@babel/runtime" "^7.17.8"
17421743
"@types/debounce" "^1.2.1"
@@ -1746,8 +1747,8 @@
17461747
buffer "^6.0.3"
17471748
debounce "^1.2.1"
17481749
its-fine "^1.2.5"
1749-
react-reconciler "0.31.0"
1750-
scheduler "0.25.0"
1750+
react-reconciler "0.31.0-rc.1"
1751+
scheduler "0.25.0-rc.1"
17511752
suspend-react "^0.1.3"
17521753
zustand "^4.1.2"
17531754

@@ -6881,12 +6882,12 @@ react-is@^16.13.1:
68816882
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
68826883
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
68836884

6884-
[email protected]:
6885-
version "0.31.0"
6886-
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.31.0.tgz#6b7390fe8fab59210daf523d7400943973de1458"
6887-
integrity sha512-7Ob7Z+URmesIsIVRjnLoDGwBEG/tVitidU0nMsqX/eeJaLY89RISO/10ERe0MqmzuKUUB1rmY+h1itMbUHg9BQ==
6885+
[email protected]-rc.1:
6886+
version "0.31.0-rc.1"
6887+
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.31.0-rc.1.tgz#39e9fdbe57dfb0a9310f48720b8a5180756ed3a1"
6888+
integrity sha512-00zcXpgYtum76DyrmzDWyg6MeyWWputWTHQUQO22P3rbtUfK1fWll4aZhS9jp215aCicM98TANJ88ITeyh8aZQ==
68886889
dependencies:
6889-
scheduler "^0.25.0"
6890+
scheduler "0.25.0-rc.1"
68906891

68916892
react-refresh@^0.14.2:
68926893
version "0.14.2"
@@ -7258,10 +7259,10 @@ safe-regex-test@^1.1.0:
72587259
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
72597260
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
72607261

7261-
[email protected], scheduler@^0.25.0:
7262-
version "0.25.0"
7263-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0.tgz#336cd9768e8cceebf52d3c80e3dcf5de23e7e015"
7264-
integrity sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==
7262+
[email protected]-rc.1:
7263+
version "0.25.0-rc.1"
7264+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0-rc.1.tgz#93cce5f24d1c4e7193fb21d953bbc05aad5bfab2"
7265+
integrity sha512-fVinv2lXqYpKConAMdergOl5owd0rY1O4P/QTe0aWKCqGtu7VsCt1iqQFxSJtqK4Lci/upVSBpGwVC7eWcuS9Q==
72657266

72667267
scheduler@^0.23.2:
72677268
version "0.23.2"
@@ -7270,6 +7271,11 @@ scheduler@^0.23.2:
72707271
dependencies:
72717272
loose-envify "^1.1.0"
72727273

7274+
scheduler@^0.25.0:
7275+
version "0.25.0"
7276+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0.tgz#336cd9768e8cceebf52d3c80e3dcf5de23e7e015"
7277+
integrity sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==
7278+
72737279
schema-utils@^4.0.0:
72747280
version "4.3.0"
72757281
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0"
@@ -7644,7 +7650,16 @@ stream-shift@^1.0.0:
76447650
resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
76457651
integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
76467652

7647-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
7653+
"string-width-cjs@npm:string-width@^4.2.0":
7654+
version "4.2.3"
7655+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
7656+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
7657+
dependencies:
7658+
emoji-regex "^8.0.0"
7659+
is-fullwidth-code-point "^3.0.0"
7660+
strip-ansi "^6.0.1"
7661+
7662+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
76487663
version "4.2.3"
76497664
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
76507665
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7733,7 +7748,14 @@ string_decoder@~1.1.1:
77337748
dependencies:
77347749
safe-buffer "~5.1.0"
77357750

7736-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
7751+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
7752+
version "6.0.1"
7753+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
7754+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
7755+
dependencies:
7756+
ansi-regex "^5.0.1"
7757+
7758+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
77377759
version "6.0.1"
77387760
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
77397761
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8449,7 +8471,16 @@ wordwrap@^1.0.0:
84498471
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
84508472
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
84518473

8452-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
8474+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
8475+
version "7.0.0"
8476+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
8477+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
8478+
dependencies:
8479+
ansi-styles "^4.0.0"
8480+
string-width "^4.1.0"
8481+
strip-ansi "^6.0.0"
8482+
8483+
wrap-ansi@^7.0.0:
84538484
version "7.0.0"
84548485
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
84558486
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)