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

fix(Text): downstream tree-shaking & *BufferGeometry deprecation #1145

Merged
merged 10 commits into from Dec 15, 2022
Merged

fix(Text): downstream tree-shaking & *BufferGeometry deprecation #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
08705de
fix: vendor troika-three-text, resolve tree-shaking & *BufferGeometry…
CodyJasonBennett Nov 13, 2022
986eb9b
fix: remove IIFE in SDFGenerator
CodyJasonBennett Nov 13, 2022
2aa8faa
chore(TextBuilder): remove assign polyfill
CodyJasonBennett Nov 13, 2022
86f98c1
chore: fix build
CodyJasonBennett Nov 13, 2022
a89ff72
fix(TextBuilder): export getTextRenderInfo
CodyJasonBennett Nov 13, 2022
d067239
chore(DerivedMaterial): disable erroneous lint rule
CodyJasonBennett Nov 13, 2022
ac0db58
chore: remove unused files
CodyJasonBennett Nov 13, 2022
589ea02
chore: add troika licensing, docs info
CodyJasonBennett Nov 13, 2022
f029279
chore: upgrade troika-three-text, remove vendor
CodyJasonBennett Dec 15, 2022
afcb8f3
Merge branch 'master' into fix/troika-text
CodyJasonBennett Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
"suspend-react": "^0.0.8",
"three-mesh-bvh": "^0.5.19",
"three-stdlib": "^2.20.4",
"troika-three-text": "^0.46.4",
"troika-three-text": "^0.47.1",
"utility-types": "^3.10.0",
"zustand": "^3.5.13"
},
Expand Down
1 change: 1 addition & 0 deletions src/core/Text.tsx
View file
Open in desktop
@@ -1,4 +1,5 @@
import * as React from 'react'
// @ts-ignore
import { Text as TextMeshImpl, preloadFont } from 'troika-three-text'
import { ReactThreeFiber, useThree } from '@react-three/fiber'
import { suspend } from 'suspend-react'
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -12021,25 +12021,25 @@ trim@0.0.1:
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=

troika-three-text@^0.46.4:
version "0.46.4"
resolved "https://registry.yarnpkg.com/troika-three-text/-/troika-three-text-0.46.4.tgz#77627ac2ac4765d5248c857a8b42f82c25f2d034"
integrity sha512-Qsv0HhUKTZgSmAJs5wvO7YlBoJSP9TGPLmrg+K9pbQq4lseQdcevbno/WI38bwJBZ/qS56hvfqEzY0zUEFzDIw==
troika-three-text@^0.47.1:
version "0.47.1"
resolved "https://registry.yarnpkg.com/troika-three-text/-/troika-three-text-0.47.1.tgz#4a239b122242d7ea93dbbf66a9f1863eca83d979"
integrity sha512-/fPRUmxCkXxyUT8k6REC/aWeFzKbNr37ivrkrplSJNb3JcBUXvVt8MT0Ac5wTUvFsYTviYWprYS4/8Laen08WA==
dependencies:
bidi-js "^1.0.2"
troika-three-utils "^0.46.0"
troika-worker-utils "^0.46.0"
troika-three-utils "^0.47.0"
troika-worker-utils "^0.47.0"
webgl-sdf-generator "1.1.1"

troika-three-utils@^0.46.0:
version "0.46.0"
resolved "https://registry.yarnpkg.com/troika-three-utils/-/troika-three-utils-0.46.0.tgz#6d97a9bf08f2260285edf2bb0be6328dd3d50eec"
integrity sha512-llHyrXAcwzr0bpg80GxsIp73N7FuImm4WCrKDJkAqcAsWmE5pfP9+Qzw+oMWK1P/AdHQ79eOrOl9NjyW4aOw0w==
troika-three-utils@^0.47.0:
version "0.47.0"
resolved "https://registry.yarnpkg.com/troika-three-utils/-/troika-three-utils-0.47.0.tgz#4749334ad2ae043767916f79bcc365cbb5ea64b5"
integrity sha512-yoVTQxVbpQX3a55giIwqwq6hyJA6oYvq7kaNGwFTeicoWmTZCqqTbytafx1gcuL5umrtw5MYgsxYUSOha+xp5w==

troika-worker-utils@^0.46.0:
version "0.46.0"
resolved "https://registry.yarnpkg.com/troika-worker-utils/-/troika-worker-utils-0.46.0.tgz#1b698090af78b51a27e03881c90237a2e648d6c4"
integrity sha512-bzOx5f2ZBxkFhXtIvDJlLn2AI3bzCkGVbCndl/2dL5QZrwHEKl45OEIilCxYQQWJG1rEbOD9O80tMjoYjw19OA==
troika-worker-utils@^0.47.0:
version "0.47.0"
resolved "https://registry.yarnpkg.com/troika-worker-utils/-/troika-worker-utils-0.47.0.tgz#bea382fee55333e177955e7ba6497d64b9d9388d"
integrity sha512-PSUc9vunDEkbE23jpgXD3PcF96jQHKjgMjS+4o5g6DEK/ZAPTnldb+FNddhppawfUcuraMFrslo0GmIC8UpEmA==

trough@^1.0.0:
version "1.0.5"
Expand Down