Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/gh-pages-6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
naqvitalha authored Nov 15, 2024
2 parents e925f30 + ff816b4 commit 1db9c22
Show file tree
Hide file tree
Showing 25 changed files with 80 additions and 74 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-website-on-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
name: Deploy website
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Install dependencies
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/flash-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -30,9 +30,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -47,8 +47,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- run: |
Expand All @@ -60,9 +60,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -75,9 +75,9 @@ jobs:
runs-on: macos-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -89,7 +89,7 @@ jobs:
mkdir -p /tmp/artifacts
yarn react-native bundle --entry-file index.js --platform ios --bundle-output /tmp/artifacts/bundle.js --sourcemap-output /tmp/artifacts/output.map
- name: Archive iOS bundle artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ios-bundle-artifacts
path: /tmp/artifacts
Expand All @@ -99,9 +99,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -113,7 +113,7 @@ jobs:
mkdir -p /tmp/artifacts
yarn react-native bundle --entry-file index.js --platform android --bundle-output /tmp/artifacts/bundle.js --sourcemap-output /tmp/artifacts/output.map
- name: Archive Android bundle artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: android-bundle-artifacts
path: /tmp/artifacts
Expand All @@ -123,9 +123,9 @@ jobs:
runs-on: macos-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -152,9 +152,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand Down Expand Up @@ -182,9 +182,9 @@ jobs:
runs-on: macos-latest
steps:
- name: Repository checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Node setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: "yarn"
Expand All @@ -210,7 +210,7 @@ jobs:
yarn e2e:test:ios
- name: Archive iOS e2e artifacts
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ios-e2e-artifacts
path: fixture/react-native/e2e/artifacts/ios/diff/*.png
4 changes: 2 additions & 2 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
name: "Build documentation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- run: |
Expand Down
14 changes: 7 additions & 7 deletions documentation/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2801,7 +2801,7 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"

braces@^3.0.1, braces@~3.0.2:
braces@^3.0.3, braces@~3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
Expand Down Expand Up @@ -5585,12 +5585,12 @@ methods@~1.1.2:
integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

micromatch@^4.0.2, micromatch@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
dependencies:
braces "^3.0.1"
picomatch "^2.2.3"
braces "^3.0.3"
picomatch "^2.3.1"

mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
version "1.51.0"
Expand Down Expand Up @@ -6120,7 +6120,7 @@ picocolors@^1.0.1:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
Expand Down
2 changes: 1 addition & 1 deletion fixture/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@shopify/flash-list": "link:../../",
"expo": "~50.0.19",
"expo": "~50.0.21",
"expo-status-bar": "~1.12.1",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
52 changes: 26 additions & 26 deletions fixture/expo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1471,10 +1471,10 @@
mv "~2"
safe-json-stringify "~1"

"@expo/cli@0.17.12":
version "0.17.12"
resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.17.12.tgz#e0d7c2477d889d118a195c8c2789298c6a43a914"
integrity sha512-HIv55FSSRFk53hdwxt+JKGMSCCMABhpakm1BSxGm0ymWa7nIM6llV/0gUWbHNXGkvmRPNWJqMNqVlV/vcPa8oA==
"@expo/cli@0.17.13":
version "0.17.13"
resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.17.13.tgz#ab6acbd1b15a25a0fcc86a6c4f4ed7e60cfda457"
integrity sha512-n13yxOmI3I0JidzMdFCH68tYKGDtK4XlDFk1vysZX7AIRKeDVRsSbHhma5jCla2bDt25RKmJBHA9KtzielwzAA==
dependencies:
"@babel/runtime" "^7.20.0"
"@expo/code-signing-certificates" "0.0.5"
Expand All @@ -1484,7 +1484,7 @@
"@expo/env" "~0.2.2"
"@expo/image-utils" "^0.4.0"
"@expo/json-file" "^8.2.37"
"@expo/metro-config" "~0.17.0"
"@expo/metro-config" "0.17.8"
"@expo/osascript" "^2.0.31"
"@expo/package-manager" "^1.1.1"
"@expo/plist" "^0.1.0"
Expand Down Expand Up @@ -1700,10 +1700,10 @@
json5 "^2.2.2"
write-file-atomic "^2.3.0"

"@expo/metro-config@0.17.7", "@expo/metro-config@~0.17.0":
version "0.17.7"
resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.17.7.tgz#c877a9558f3b97447cc9cf382971403834d84b46"
integrity sha512-3vAdinAjMeRwdhGWWLX6PziZdAPvnyJ6KVYqnJErHHqH0cA6dgAENT3Vq6PEM1H2HgczKr2d5yG9AMgwy848ow==
"@expo/metro-config@0.17.8":
version "0.17.8"
resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.17.8.tgz#8a5b46af0bef3397eac17607fc249670fdbbab9a"
integrity sha512-XNjI5Q5bW3k2ieNtQBSX9BnIysRxG4UyNsaWcysv3AzY+rahay6fAp5xzJey8xBOlzs9u7H4AdMoeJsUje3lcQ==
dependencies:
"@babel/core" "^7.20.0"
"@babel/generator" "^7.20.5"
Expand Down Expand Up @@ -2353,10 +2353,10 @@
join-component "^1.1.0"

"@shopify/flash-list@link:../..":
version "1.6.4"
version "1.7.1"
dependencies:
recyclerlistview "4.2.1"
tslib "2.4.0"
tslib "2.6.3"

"@sideway/address@^4.1.5":
version "4.1.5"
Expand Down Expand Up @@ -4436,10 +4436,10 @@ expo-modules-autolinking@1.10.3:
find-up "^5.0.0"
fs-extra "^9.1.0"

expo-modules-core@1.11.13:
version "1.11.13"
resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-1.11.13.tgz#a8e63ad844e966dce78dea40b50839af6c3bc518"
integrity sha512-2H5qrGUvmLzmJNPDOnovH1Pfk5H/S/V0BifBmOQyDc9aUh9LaDwkqnChZGIXv8ZHDW8JRlUW0QqyWxTggkbw1A==
expo-modules-core@1.11.14:
version "1.11.14"
resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-1.11.14.tgz#e1291661f2b73040382bd9f57c0dd73a98e4f757"
integrity sha512-+W+A/jYJdWzA43KEAixhoArEb0EzTsS6T3tObYkZ1EHk8LaBT3hnFant52CnFTeVY4pqv4mgutBua2UQQMAWFA==
dependencies:
invariant "^2.2.4"

Expand All @@ -4458,24 +4458,24 @@ expo-status-bar@~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@~50.0.19:
version "50.0.19"
resolved "https://registry.yarnpkg.com/expo/-/expo-50.0.19.tgz#c44369919a078f46a92f64106a94b6c37957bfd1"
integrity sha512-9weIVMGylJhNVN41mId1c1Kog3VmGA28oY0RpJKdJNrKGt5NKQAXV26TIwxw/PyDG1J4q2T/wZZoK+F1C64aIw==
expo@~50.0.21:
version "50.0.21"
resolved "https://registry.yarnpkg.com/expo/-/expo-50.0.21.tgz#bcfc4c73264cc96b82ef7cb6875e05e1089b2cba"
integrity sha512-lY+HJdQcsTUbEtPhgT3Y2+WwKZdJiYN0Zq5yAOT9293N1TbdLbHCNkOUtFfTmK0JjwgSKbbH4kRlue7a4MJflg==
dependencies:
"@babel/runtime" "^7.20.0"
"@expo/cli" "0.17.12"
"@expo/cli" "0.17.13"
"@expo/config" "8.5.6"
"@expo/config-plugins" "7.9.2"
"@expo/metro-config" "0.17.7"
"@expo/metro-config" "0.17.8"
"@expo/vector-icons" "^14.0.0"
babel-preset-expo "~10.0.2"
expo-asset "~9.0.2"
expo-file-system "~16.0.9"
expo-font "~11.10.3"
expo-keep-awake "~12.8.2"
expo-modules-autolinking "1.10.3"
expo-modules-core "1.11.13"
expo-modules-core "1.11.14"
fbemitter "^3.0.0"
whatwg-url-without-unicode "8.0.0-3"

Expand Down Expand Up @@ -8443,10 +8443,10 @@ ts-object-utils@0.0.5:
resolved "https://registry.yarnpkg.com/ts-object-utils/-/ts-object-utils-0.0.5.tgz#95361cdecd7e52167cfc5e634c76345e90a26077"
integrity sha512-iV0GvHqOmilbIKJsfyfJY9/dNHCs969z3so90dQWsO1eMMozvTpnB1MEaUbb3FYtZTGjv5sIy/xmslEz0Rg2TA==

tslib@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
tslib@2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
version "2.6.2"
Expand Down
2 changes: 1 addition & 1 deletion fixture/react-native/.detoxrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = {
simulator: {
type: "ios.simulator",
device: {
type: "iPhone 14",
type: "iPhone 15",
},
},
emulator: {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD = "";
Expand Down Expand Up @@ -560,6 +563,9 @@
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD = "";
Expand Down
12 changes: 6 additions & 6 deletions fixture/react-native/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ PODS:
- React-Mapbuffer (0.74.3):
- glog
- React-debug
- react-native-safe-area-context (4.10.8):
- react-native-safe-area-context (4.11.0):
- React-Core
- React-nativeconfig (0.74.3)
- React-NativeModulesApple (0.74.3):
Expand Down Expand Up @@ -1182,7 +1182,7 @@ PODS:
- React-Core
- SDWebImage (~> 5.11.1)
- SDWebImageWebPCoder (~> 0.8.4)
- RNFlashList (1.7.0):
- RNFlashList (1.7.2):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1203,7 +1203,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNFlashList/Tests (1.7.0):
- RNFlashList/Tests (1.7.2):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1524,7 +1524,7 @@ SPEC CHECKSUMS:
React-jsitracing: 1aa5681c353b41573b03e0e480a5adf5fa1c56d8
React-logger: fa92ba4d3a5d39ac450f59be2a3cec7b099f0304
React-Mapbuffer: 70da5955150a58732e9336a0c7e71cd49e909f25
react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
react-native-safe-area-context: 851c62c48dce80ccaa5637b6aa5991a1bc36eca9
React-nativeconfig: 84806b820491db30175afbf027e99e8415dc63f0
React-NativeModulesApple: 7b79212f8cf496ab554e0b7b09acbd4aa4690260
React-perflogger: 7bb9ba49435ff66b666e7966ee10082508a203e8
Expand All @@ -1549,7 +1549,7 @@ SPEC CHECKSUMS:
React-utils: 6f7ac39d9a0de447d4334bb25d144a28c0c5d8c9
ReactCommon: 4a09c7d8a06e93c1e2e988a3b9f3db3d2449f2fc
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
RNFlashList: 06ac066ee3c7adcecc5725c6be7cee41b3696347
RNFlashList: b0cacef411c97a4a284be5a7303c58a715258523
RNGestureHandler: 20a4307fd21cbff339abfcfa68192f3f0a6a518b
RNReanimated: f6b214732ff303cb815ac81b26bbfd2070b69f43
RNScreens: fd2722bcc59f36a629205af8cc7b48e4bc0d09f5
Expand All @@ -1558,6 +1558,6 @@ SPEC CHECKSUMS:
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Yoga: bd92064a0d558be92786820514d74fc4dddd1233

PODFILE CHECKSUM: 97709fb7ed955ffb60d46eed98609c97cd830d50
PODFILE CHECKSUM: 3e0219846197f8e0fe68b4be4fc1317aa0b52831

COCOAPODS: 1.15.2
Loading

0 comments on commit 1db9c22

Please sign in to comment.