Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove types not part of THREE namespace anymore #1981

Merged
merged 2 commits into from
Jan 12, 2022
Merged

Remove types not part of THREE namespace anymore #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f13f29
Remove types not part of THREE namespace
Dig-Doug Jan 11, 2022
feb66f0
chore(fiber): bump three peer dep
CodyJasonBennett Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@types/react-reconciler": "^0.26.2",
"@types/react-test-renderer": "^17.0.1",
"@types/scheduler": "^0.16.2",
"@types/three": "^0.130.0",
"@types/three": "^0.133.0",
"@typescript-eslint/eslint-plugin": "^4.28.4",
"@typescript-eslint/parser": "^4.28.4",
"eslint": "^7.31.0",
Expand All @@ -71,7 +71,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"regenerator-runtime": "^0.13.7",
"three": "^0.130.1",
"three": "^0.133.0",
"three-stdlib": "^2.3.1",
"ts-jest": "^27.0.3",
"typescript": "^4.3.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/fiber/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"peerDependencies": {
"react": ">=17.0",
"react-dom": ">=17.0",
"three": ">=0.126"
"three": ">=0.133"
},
"peerDependenciesMeta": {
"react-dom": {
Expand Down
11 changes: 0 additions & 11 deletions packages/fiber/src/three-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ export type OctahedronBufferGeometryProps = BufferGeometryNode<
THREE.OctahedronBufferGeometry,
typeof THREE.OctahedronBufferGeometry
>
export type ParametricBufferGeometryProps = BufferGeometryNode<
THREE.ParametricBufferGeometry,
typeof THREE.ParametricBufferGeometry
>
export type PlaneBufferGeometryProps = BufferGeometryNode<THREE.PlaneBufferGeometry, typeof THREE.PlaneBufferGeometry>
export type PolyhedronBufferGeometryProps = BufferGeometryNode<
THREE.PolyhedronBufferGeometry,
Expand All @@ -138,15 +134,13 @@ export type TetrahedronBufferGeometryProps = BufferGeometryNode<
THREE.TetrahedronBufferGeometry,
typeof THREE.TetrahedronBufferGeometry
>
export type TextBufferGeometryProps = BufferGeometryNode<THREE.TextBufferGeometry, typeof THREE.TextBufferGeometry>
export type TorusBufferGeometryProps = BufferGeometryNode<THREE.TorusBufferGeometry, typeof THREE.TorusBufferGeometry>
export type TorusKnotBufferGeometryProps = BufferGeometryNode<
THREE.TorusKnotBufferGeometry,
typeof THREE.TorusKnotBufferGeometry
>
export type TubeBufferGeometryProps = BufferGeometryNode<THREE.TubeBufferGeometry, typeof THREE.TubeBufferGeometry>
export type WireframeGeometryProps = BufferGeometryNode<THREE.WireframeGeometry, typeof THREE.WireframeGeometry>
export type ParametricGeometryProps = BufferGeometryNode<THREE.ParametricGeometry, typeof THREE.ParametricGeometry>
export type TetrahedronGeometryProps = BufferGeometryNode<THREE.TetrahedronGeometry, typeof THREE.TetrahedronGeometry>
export type OctahedronGeometryProps = BufferGeometryNode<THREE.OctahedronGeometry, typeof THREE.OctahedronGeometry>
export type IcosahedronGeometryProps = BufferGeometryNode<THREE.IcosahedronGeometry, typeof THREE.IcosahedronGeometry>
Expand All @@ -158,7 +152,6 @@ export type PolyhedronGeometryProps = BufferGeometryNode<THREE.PolyhedronGeometr
export type TubeGeometryProps = BufferGeometryNode<THREE.TubeGeometry, typeof THREE.TubeGeometry>
export type TorusKnotGeometryProps = BufferGeometryNode<THREE.TorusKnotGeometry, typeof THREE.TorusKnotGeometry>
export type TorusGeometryProps = BufferGeometryNode<THREE.TorusGeometry, typeof THREE.TorusGeometry>
export type TextGeometryProps = BufferGeometryNode<THREE.TextGeometry, typeof THREE.TextGeometry>
export type SphereGeometryProps = BufferGeometryNode<THREE.SphereGeometry, typeof THREE.SphereGeometry>
export type RingGeometryProps = BufferGeometryNode<THREE.RingGeometry, typeof THREE.RingGeometry>
export type PlaneGeometryProps = BufferGeometryNode<THREE.PlaneGeometry, typeof THREE.PlaneGeometry>
Expand Down Expand Up @@ -290,19 +283,16 @@ declare global {
icosahedronBufferGeometry: IcosahedronBufferGeometryProps
latheBufferGeometry: LatheBufferGeometryProps
octahedronBufferGeometry: OctahedronBufferGeometryProps
parametricBufferGeometry: ParametricBufferGeometryProps
planeBufferGeometry: PlaneBufferGeometryProps
polyhedronBufferGeometry: PolyhedronBufferGeometryProps
ringBufferGeometry: RingBufferGeometryProps
shapeBufferGeometry: ShapeBufferGeometryProps
sphereBufferGeometry: SphereBufferGeometryProps
tetrahedronBufferGeometry: TetrahedronBufferGeometryProps
textBufferGeometry: TextBufferGeometryProps
torusBufferGeometry: TorusBufferGeometryProps
torusKnotBufferGeometry: TorusKnotBufferGeometryProps
tubeBufferGeometry: TubeBufferGeometryProps
wireframeGeometry: WireframeGeometryProps
parametricGeometry: ParametricGeometryProps
tetrahedronGeometry: TetrahedronGeometryProps
octahedronGeometry: OctahedronGeometryProps
icosahedronGeometry: IcosahedronGeometryProps
Expand All @@ -311,7 +301,6 @@ declare global {
tubeGeometry: TubeGeometryProps
torusKnotGeometry: TorusKnotGeometryProps
torusGeometry: TorusGeometryProps
textGeometry: TextGeometryProps
sphereGeometry: SphereGeometryProps
ringGeometry: RingGeometryProps
planeGeometry: PlaneGeometryProps
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,10 +1881,10 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==

"@types/three@^0.130.0":
version "0.130.0"
resolved "https://registry.yarnpkg.com/@types/three/-/three-0.130.0.tgz#f048f1fb73e789a2c0dfcc66a45ffcbf259a75f6"
integrity sha512-7MKKxlEjHoAGTBRxEcDOjO4OvOrvUM6xtyjPiubNcU6bRPNmjNaV/PI9tiaXkk8cauZ9FuRbdCV4g0rQod+FkQ==
"@types/three@^0.133.0":
version "0.133.1"
resolved "https://registry.yarnpkg.com/@types/three/-/three-0.133.1.tgz#6007faaf7f6b53339150a2a1fe57121e4c6607c1"
integrity sha512-XqBrP/+kbs+o0CYRhCVVE95v7FaL2bO5Z7+3VQJE0nEyjo+9LoLfeNgZITOnndKHxM+7ltEciAIR7uE0SZlsOg==

"@types/yargs-parser@*":
version "20.2.1"
Expand Down Expand Up @@ -6089,10 +6089,10 @@ three-stdlib@^2.3.1:
potpack "^1.0.1"
zstddec "^0.0.2"

three@^0.130.1:
version "0.130.1"
resolved "https://registry.yarnpkg.com/three/-/three-0.130.1.tgz#797588b2877ace31603bbbc864eb2e3022f0b3b4"
integrity sha512-OSPPKcGvFSiGkG3jFrwwC76PBV/ZSrGxpBbg28bW8s9GU8r/y2spNGtEXHEb/CVqo0Ctf5Lx2rVaxQZB6OasaA==
three@^0.133.0:
version "0.133.1"
resolved "https://registry.yarnpkg.com/three/-/three-0.133.1.tgz#5606f4817d67a09d9212d4ccbd6826564774f8f4"
integrity sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw==

throat@^6.0.1:
version "6.0.1"
Expand Down