expo-font 58.0.8 → 58.0.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 58.0.10
+
+### Patch Changes
+
+- On web, loading several fonts no longer fails with a timeout after 12 seconds in WebKit (Safari). Each `@font-face` rule now goes into the same `<style>` element through `insertRule`, so the browser does not parse the style sheet again for every font. ([#52093](https://github.com/expo/expo/pull/52093) by [@fixfon](https://github.com/fixfon))
+
+## 58.0.9
+
+### Patch Changes
+
+- Bump precompiled artifacts due to ABI breakage in expo-modules-core@58.0.23. ([#51823](https://github.com/expo/expo/pull/51823) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 58.0.8
 
 ### Patch Changes

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.8'
+version = '58.0.10'
 
 android {
   namespace "expo.modules.font"
   defaultConfig {
     versionCode 29
-    versionName "58.0.8"
+    versionName "58.0.10"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 }

package/build/ExpoFontLoader.web.js

@@ -171,7 +171,9 @@ const ExpoFontLoader = {
             throw new CodedError('ERR_WEB_ENVIRONMENT', `The browser's \`document.head\` element doesn't support injecting fonts.`);
         }
         const style = getStyleElement();
-        document.head.appendChild(style);
+        if (!style.isConnected) {
+            document.head.appendChild(style);
+        }
         const alreadyLoaded = getFontFaceRulesMatchingResource(fontFamilyName, resource).some(({ rule })=>_fontFaceRuleSrcMatches(rule, resource.uri));
         if (!alreadyLoaded) {
             _createWebStyle(fontFamilyName, resource);
@@ -253,6 +255,8 @@ function _createWebStyle(fontFamily, resource) {
     if (styleElement.styleSheet) {
         const styleElementIE = styleElement;
         styleElementIE.styleSheet.cssText = styleElementIE.styleSheet.cssText ? styleElementIE.styleSheet.cssText + fontStyle : fontStyle;
+    } else if (styleElement.sheet) {
+        styleElement.sheet.insertRule(fontStyle, styleElement.sheet.cssRules.length);
     } else {
         const textNode = document.createTextNode(fontStyle);
         styleElement.appendChild(textNode);

package/build/ExpoFontLoader.web.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ExpoFontLoader.web.ts"],"sourcesContent":[null],"names":["CodedError","registerWebModule","addServerFont","getLoadedServerFonts","getServerResourceDescriptors","readServerResourceDescriptors","isServerFontLoaded","getFontFaceStyleSheet","window","styleSheet","getStyleElement","sheet","getFontFaceRules","rules","cssRules","items","i","length","rule","CSSFontFaceRule","push","index","normalizeFontFamilyName","fontFamily","trimmed","trim","quote","endsWith","slice","replace","canonicalCssWeight","weight","undefined","Number","isFinite","lower","toLowerCase","numeric","_matchesFontFaceOptions","fontFamilyName","options","style","display","fontDisplay","fontWeight","fontStyle","getFontFaceRulesMatchingResource","filter","_fontFaceRuleSrcMatches","uri","src","getPropertyValue","match","ruleUri","decodeURIComponent","String","ExpoFontLoader","unloadAllAsync","element","document","getElementById","ID","HTMLStyleElement","removeChild","unloadAsync","descending","sort","a","b","item","deleteRule","getServerResources","elements","map","type","id","css","rel","href","as","crossOrigin","Boolean","getLoadedFonts","seen","Set","families","name","has","add","isLoaded","resource","loadAsync","__DEV__","_createWebFontTemplate","resourceId","Promise","resolve","canInjectStyle","head","appendChild","alreadyLoaded","some","_createWebStyle","fonts","load","shorthand","CSS_IDENT_RE","test","CSS_WEIGHT_NUMERIC_RE","includes","withLoadTimeout","JSON","stringify","FONT_LOAD_TIMEOUT_MS","loading","timer","timingOut","_resolve","reject","setTimeout","race","finally","clearTimeout","then","isServer","process","env","EXPO_OS","createExpoFontLoader","toExport","styleElement","createElement","declarations","join","styleElementIE","cssText","textNode","createTextNode"],"mappings":"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"}
+{"version":3,"sources":["ExpoFontLoader.web.ts"],"sourcesContent":[null],"names":["CodedError","registerWebModule","addServerFont","getLoadedServerFonts","getServerResourceDescriptors","readServerResourceDescriptors","isServerFontLoaded","getFontFaceStyleSheet","window","styleSheet","getStyleElement","sheet","getFontFaceRules","rules","cssRules","items","i","length","rule","CSSFontFaceRule","push","index","normalizeFontFamilyName","fontFamily","trimmed","trim","quote","endsWith","slice","replace","canonicalCssWeight","weight","undefined","Number","isFinite","lower","toLowerCase","numeric","_matchesFontFaceOptions","fontFamilyName","options","style","display","fontDisplay","fontWeight","fontStyle","getFontFaceRulesMatchingResource","filter","_fontFaceRuleSrcMatches","uri","src","getPropertyValue","match","ruleUri","decodeURIComponent","String","ExpoFontLoader","unloadAllAsync","element","document","getElementById","ID","HTMLStyleElement","removeChild","unloadAsync","descending","sort","a","b","item","deleteRule","getServerResources","elements","map","type","id","css","rel","href","as","crossOrigin","Boolean","getLoadedFonts","seen","Set","families","name","has","add","isLoaded","resource","loadAsync","__DEV__","_createWebFontTemplate","resourceId","Promise","resolve","canInjectStyle","head","appendChild","isConnected","alreadyLoaded","some","_createWebStyle","fonts","load","shorthand","CSS_IDENT_RE","test","CSS_WEIGHT_NUMERIC_RE","includes","withLoadTimeout","JSON","stringify","FONT_LOAD_TIMEOUT_MS","loading","timer","timingOut","_resolve","reject","setTimeout","race","finally","clearTimeout","then","isServer","process","env","EXPO_OS","createExpoFontLoader","toExport","styleElement","createElement","declarations","join","styleElementIE","cssText","insertRule","textNode","createTextNode"],"mappings":"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"}

package/local-maven-repo/host/exp/exponent/expo.modules.font/{58.0.8/expo.modules.font-58.0.8.module → 58.0.10/expo.modules.font-58.0.10.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.font",
-    "version": "58.0.8",
+    "version": "58.0.10",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.font-58.0.8.aar",
-          "url": "expo.modules.font-58.0.8.aar",
+          "name": "expo.modules.font-58.0.10.aar",
+          "url": "expo.modules.font-58.0.10.aar",
           "size": 64556,
           "sha512": "8591c57117e3177c3a053e800dc508828438eed1f339f6a599b8864b7b6a1b5813d942a9a29931884f50b81be31131c08d30613687124681c6b19805b9c75631",
           "sha256": "8722bab1c001def6d5f57762b550c8520065b9def4951f15fa9118a310d4cd41",
@@ -71,8 +71,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.font-58.0.8.aar",
-          "url": "expo.modules.font-58.0.8.aar",
+          "name": "expo.modules.font-58.0.10.aar",
+          "url": "expo.modules.font-58.0.10.aar",
           "size": 64556,
           "sha512": "8591c57117e3177c3a053e800dc508828438eed1f339f6a599b8864b7b6a1b5813d942a9a29931884f50b81be31131c08d30613687124681c6b19805b9c75631",
           "sha256": "8722bab1c001def6d5f57762b550c8520065b9def4951f15fa9118a310d4cd41",
@@ -91,8 +91,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.font-58.0.8-sources.jar",
-          "url": "expo.modules.font-58.0.8-sources.jar",
+          "name": "expo.modules.font-58.0.10-sources.jar",
+          "url": "expo.modules.font-58.0.10-sources.jar",
           "size": 14466,
           "sha512": "f99360bf9eae6ab976f15247cf515fba25247efcea552801e86db36c962325d363fd7626fbc1fc380b1c2ae5a58022a4560c424afdc9baeac85f0ccf7cd991dd",
           "sha256": "61ebcaeb6c5fc41c0843587efb274daa97d97e3d998d005d3cde29f6f992590f",

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.module.md5

@@ -0,0 +1 @@
+0de0953757fd83a12ae87859c9c3a33d

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.module.sha1

@@ -0,0 +1 @@
+4af099729f38160893881f607ca0c153aace8d59

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.module.sha256

@@ -0,0 +1 @@
+88109939ffc487344a52125b3feacfbb9a2a589b78ea9c74317d7706c7a45424

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.module.sha512

@@ -0,0 +1 @@
+88b031daf5b1d5d2145a6a5d8f7e4318d841403c6a28c83130992b220a447be9cbe6fb63e965e4fe78e92cd757ebb146bc30cfcefa736b1f499c76c3868ed9e2

package/local-maven-repo/host/exp/exponent/expo.modules.font/{58.0.8/expo.modules.font-58.0.8.pom → 58.0.10/expo.modules.font-58.0.10.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.font</artifactId>
-  <version>58.0.8</version>
+  <version>58.0.10</version>
   <packaging>aar</packaging>
   <name>expo.modules.font</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.pom.md5

@@ -0,0 +1 @@
+10f3cf580da135f250883c7b181a3319

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.pom.sha1

@@ -0,0 +1 @@
+c6dd2d7e0a5390fe50c6b47d20a64816ced96e58

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.pom.sha256

@@ -0,0 +1 @@
+99aade406ed82c6eb9582d605f16c2512abf6f77d8d55a65314d887c7d31f4ae

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.10/expo.modules.font-58.0.10.pom.sha512

@@ -0,0 +1 @@
+045a560b3ee59793932916fc96359212c48e12e7313bd4c39ae6c0bf44a845da8b5306c23bcdba965d82a9929f7f8e25f169611cbaede1eec77afb3b9fc28efb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-font",
-  "version": "58.0.8",
+  "version": "58.0.10",
   "description": "Load fonts at runtime and use them in React Native components.",
   "keywords": [
     "expo",
@@ -52,7 +52,7 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@expo/internal-scripts": "58.0.1",
+    "@expo/internal-scripts": "58.0.4",
     "@testing-library/react-native": "^14.0.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.14.0",

package/src/ExpoFontLoader.web.ts

@@ -220,7 +220,9 @@ const ExpoFontLoader: Required<Omit<ExpoFontLoaderModule, 'loadFontFamilyAsync'>
     }
 
     const style = getStyleElement();
-    document.head!.appendChild(style);
+    if (!style.isConnected) {
+      document.head!.appendChild(style);
+    }
 
     const alreadyLoaded = getFontFaceRulesMatchingResource(fontFamilyName, resource).some(
       ({ rule }) => _fontFaceRuleSrcMatches(rule, resource.uri)
@@ -345,6 +347,8 @@ function _createWebStyle(fontFamily: string, resource: FontResource): HTMLStyleE
     styleElementIE.styleSheet.cssText = styleElementIE.styleSheet.cssText
       ? styleElementIE.styleSheet.cssText + fontStyle
       : fontStyle;
+  } else if (styleElement.sheet) {
+    styleElement.sheet.insertRule(fontStyle, styleElement.sheet.cssRules.length);
   } else {
     const textNode = document.createTextNode(fontStyle);
     styleElement.appendChild(textNode);

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.module.md5

@@ -1 +0,0 @@
-c10624675b40f80752be6d3dfbd35bcb

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.module.sha1

@@ -1 +0,0 @@
-92f06e4ea8283361bf5139ed821df25129540506

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.module.sha256

@@ -1 +0,0 @@
-24055aac82a7fa22174ef4d24c6d9db9e7f0400efd9e8e3d347e9e1147691dfb

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.module.sha512

@@ -1 +0,0 @@
-58527266c854148675ad619a969b884303edcc343d377bd4166f2b59843fd31345355e22e0dd21294efe9a6e465c45e6b2e1a67a67b4ebd3a7038612436dba52

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.pom.md5

@@ -1 +0,0 @@
-6e3da09a284ed286dc23b80b46e0994c

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.pom.sha1

@@ -1 +0,0 @@
-fedc7b95e7fa5410f79ec73ec77261de0bd9c938

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.pom.sha256

@@ -1 +0,0 @@
-afd4f7140e6a36173ae2514d95395f128d072956824600fb2f50016df3633e93

package/local-maven-repo/host/exp/exponent/expo.modules.font/58.0.8/expo.modules.font-58.0.8.pom.sha512

@@ -1 +0,0 @@
-da0c468ad4850a00e107e7db0d9c11e90aa283ff3a2e142843bf09a0430a18ee89c44287c023933cb64c8046b8a5df1fae5592f59a4c30577518d2303952c8b5