Merge branch 'main' into dependabot/npm_and_yarn/fixture/react-native…

…/react-native-screens-4.3.0
Shopify · Dec 19, 2024 · dad9fc7 · dad9fc7
2 parents 9aa6419 + 7c2e2fb
commit dad9fc7
Show file tree

Hide file tree

Showing 10 changed files with 834 additions and 884 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -86,10 +86,8 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     ruby-macho (2.5.1)
-    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)

diff --git a/README.md b/README.md
@@ -16,6 +16,10 @@ Swap from FlatList in seconds. Get instant performance.
 
 </div>
 
+## React Native's new architecture support
+
+FlashList is compatible with React Native's new architecture however, it's not fully optimized for it yet. You will still gain performance benefits from using FlashList over FlatList. Stayed tuned for more improvements.
+
 ## Installation
 
 Add the package to your project via `yarn add @shopify/flash-list` and run `pod install` in the `ios` directory.

diff --git a/documentation/yarn.lock b/documentation/yarn.lock
@@ -3301,9 +3301,9 @@ cross-fetch@^3.0.4:
     node-fetch "2.6.7"
 
 cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

diff --git a/fixture/expo/package.json b/fixture/expo/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@shopify/flash-list": "link:../../",
     "expo": "~50.0.21",
-    "expo-status-bar": "~1.12.1",
+    "expo-status-bar": "~2.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-native": "0.72.10",

diff --git a/fixture/expo/yarn.lock b/fixture/expo/yarn.lock
@@ -2353,7 +2353,7 @@
     join-component "^1.1.0"
 
 "@shopify/flash-list@link:../..":
-  version "1.7.1"
+  version "1.7.2"
   dependencies:
     recyclerlistview "4.2.1"
     tslib "2.6.3"
@@ -4442,10 +4442,10 @@ [email protected]:
     commander "2.20.0"
     update-check "1.5.3"
 
-expo-status-bar@~1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.12.1.tgz#52ce594aab5064a0511d14375364d718ab78aa66"
-  integrity sha512-/t3xdbS8KB0prj5KG5w7z+wZPFlPtkgs95BsmrP/E7Q0xHXTcDcQ6Cu2FkFuRM+PKTb17cJDnLkawyS5vDLxMA==
+expo-status-bar@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-2.0.0.tgz#dd99adc2ace12a24c92718cd0f97b93347103393"
+  integrity sha512-vxxdpvpNDMTEc5uTiIrbTvySKKUsOACmfl8OZuUdjNle05oGqwtq3v5YObwym/njSByjoyuZX8UpXBZnxvarwQ==
 
 expo@~50.0.21:
   version "50.0.21"
@@ -5096,9 +5096,9 @@ http-parser-js@>=0.5.1:
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
 http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"

diff --git a/fixture/react-native/package.json b/fixture/react-native/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
-    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.20.0",
     "@react-native/metro-config": "^0.74.85",
     "@types/jest": "^27.5.0",

diff --git a/fixture/react-native/yarn.lock b/fixture/react-native/yarn.lock
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
   ],
   "dependencies": {
     "recyclerlistview": "4.2.1",
-    "tslib": "2.6.3"
+    "tslib": "2.8.1"
   },
   "codegenConfig": {
     "name": "rnflashlist",

diff --git a/website/Gemfile.lock b/website/Gemfile.lock
@@ -57,13 +57,11 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (3.28.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    strscan (3.1.0)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.8.0)