diff options
| author | Eric Bailey <git@esb.lol> | 2024-09-18 20:22:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 20:22:03 -0500 |
| commit | bda355fd58a06b5fe7cf58a12d32769f75112a4f (patch) | |
| tree | da95b1de575c0f7579c465bd9307b1edc8e6f5f9 | |
| parent | cbc7cd080889bbb8af052717d2831880ccd10475 (diff) | |
| download | voidsky-bda355fd58a06b5fe7cf58a12d32769f75112a4f.tar.zst | |
Fix font loading on web (#5412)
* Copy font files during build * Fall back if error loading fonts
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/App.web.tsx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index ba7882902..09985de02 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "web": "expo start --web", "use-build-number": "./scripts/useBuildNumberEnv.sh", "use-build-number-with-bump": "./scripts/useBuildNumberEnvWithBump.sh", - "build-web": "expo export:web && node ./scripts/post-web-build.js && cp -v ./web-build/static/js/*.* ./bskyweb/static/js/ && cp -v ./web-build/static/media/*.png ./bskyweb/static/media/", + "build-web": "expo export:web && node ./scripts/post-web-build.js && cp -v ./web-build/static/js/*.* ./bskyweb/static/js/ && cp -v ./web-build/static/media/* ./bskyweb/static/media/", "build-all": "yarn intl:build && yarn use-build-number-with-bump eas build --platform all", "build-ios": "yarn use-build-number-with-bump eas build -p ios", "build-android": "yarn use-build-number-with-bump eas build -p android", diff --git a/src/App.web.tsx b/src/App.web.tsx index 1c6650733..846d178f9 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -144,13 +144,13 @@ function InnerApp() { function App() { const [isReady, setReady] = useState(false) - const [loaded] = useFonts() + const [loaded, error] = useFonts() React.useEffect(() => { initPersistedState().then(() => setReady(true)) }, []) - if (!isReady || !loaded) { + if (!isReady || (!loaded && !error)) { return null } |