Skip to content

Commit 4f205b7

Browse files
committed
Merge branch 'main' into @HubertBer/local-modules
2 parents 4cb0ae0 + a4629f6 commit 4f205b7

File tree

2,479 files changed

+57894
-45238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,479 files changed

+57894
-45238
lines changed

.github/codemention.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ rules:
55
- patterns: ['.github/workflows/**']
66
mentions: ['brentvatne', 'kudo']
77
- patterns: ['.github/workflows/cli.yml/**']
8-
mentions: ['EvanBacon', 'bycedric']
8+
mentions: ['EvanBacon', 'bycedric', 'kitten']
99
- patterns: ['docs/**']
1010
mentions: ['amandeepmittal']
1111
- patterns: ['packages/@expo/cli/**']
12-
mentions: ['EvanBacon', 'bycedric']
12+
mentions: ['EvanBacon', 'bycedric', 'kitten']
1313
- patterns: ['packages/@expo/config/**']
1414
mentions: ['EvanBacon']
1515
- patterns: ['packages/@expo/config-plugins/**']
@@ -21,31 +21,33 @@ rules:
2121
- patterns: ['packages/@expo/devtools/**']
2222
mentions: ['chrfalch', 'kudo']
2323
- patterns: ['packages/@expo/env/**']
24-
mentions: ['EvanBacon', 'bycedric']
24+
mentions: ['EvanBacon', 'bycedric', 'kitten']
2525
- patterns: ['packages/@expo/fingerprint/**']
2626
mentions: ['kudo']
2727
- patterns: ['packages/@expo/image-utils/**']
2828
mentions: ['bycedric', 'EvanBacon']
2929
- patterns: ['packages/@expo/json-file/**']
3030
mentions: ['EvanBacon', 'bycedric']
3131
- patterns: ['packages/@expo/metro-config/**']
32-
mentions: ['EvanBacon', 'bycedric', 'krystofwoldrich']
32+
mentions: ['EvanBacon', 'bycedric', 'krystofwoldrich', 'kitten']
3333
- patterns: ['packages/@expo/metro-runtime/**']
34-
mentions: ['EvanBacon', 'bycedric']
34+
mentions: ['EvanBacon', 'bycedric', 'kitten']
3535
- patterns: ['packages/@expo/osascript/**']
3636
mentions: ['EvanBacon']
3737
- patterns: ['packages/@expo/package-manager/**']
38-
mentions: ['EvanBacon', 'bycedric']
38+
mentions: ['EvanBacon', 'bycedric', 'kitten']
3939
- patterns: ['packages/@expo/pkcs12/**']
4040
mentions: ['bycedric', 'quinlanj']
4141
- patterns: ['packages/@expo/plist/**']
4242
mentions: ['EvanBacon', 'bycedric']
4343
- patterns: ['packages/@expo/prebuild-config/**']
4444
mentions: ['EvanBacon']
4545
- patterns: ['packages/@expo/schemer/**']
46-
mentions: ['bycedric']
46+
mentions: ['bycedric', 'kitten']
47+
- patterns: ['packages/@expo/schema-utils/**']
48+
mentions: ['kitten']
4749
- patterns: ['packages/@expo/server/**']
48-
mentions: ['bycedric']
50+
mentions: ['bycedric', 'kitten']
4951
- patterns: ['packages/babel-preset-expo/**']
5052
mentions: ['brentvatne', 'ide', 'EvanBacon']
5153
- patterns: ['packages/create-expo/**']
@@ -79,7 +81,7 @@ rules:
7981
- patterns: ['packages/expo-build-properties/**']
8082
mentions: ['kudo', 'gabrieldonadel']
8183
- patterns: ['packages/expo-calendar/**']
82-
mentions: ['lukmccall', 'alanjhughes']
84+
mentions: ['jakex7', 'alanjhughes']
8385
- patterns: ['packages/expo-camera/**']
8486
mentions: ['lukmccall', 'alanjhughes']
8587
- patterns: ['packages/expo-cellular/**']
@@ -125,9 +127,9 @@ rules:
125127
- patterns: ['packages/expo-image-picker/**']
126128
mentions: ['lukmccall', 'alanjhughes']
127129
- patterns: ['packages/expo-insights/**']
128-
mentions: ['lukmccall']
130+
mentions: ['lukmccall', 'jakex7']
129131
- patterns: ['packages/expo-intent-launcher/**']
130-
mentions: ['kudo', 'alanjhughes']
132+
mentions: ['kudo', 'jakex7']
131133
- patterns: ['packages/expo-keep-awake/**']
132134
mentions: ['brentvatne', 'kudo']
133135
- patterns: ['packages/expo-linear-gradient/**']
@@ -141,19 +143,21 @@ rules:
141143
- patterns: ['packages/expo-mail-composer/**']
142144
mentions: ['brentvatne', 'alanjhughes']
143145
- patterns: ['packages/expo-maps/**']
144-
mentions: ['lukmccall', 'alanjhughes']
146+
mentions: ['jakex7', 'alanjhughes']
145147
- patterns: ['packages/expo-manifests/**']
146148
mentions: ['wschurman']
147149
- patterns: ['packages/expo-media-library/**']
148150
mentions: ['behenate', 'alanjhughes']
151+
- patterns: ['packages/expo-mesh-gradient/**']
152+
mentions: ['jakex7']
149153
- patterns: ['packages/expo-module-scripts/**']
150154
mentions: ['ide']
151155
- patterns: ['packages/expo-module-template/**']
152156
mentions: ['aleqsio', 'EvanBacon']
153157
- patterns: ['packages/expo-module-template-local/**']
154158
mentions: ['aleqsio']
155159
- patterns: ['packages/expo-modules-autolinking/**']
156-
mentions: ['kudo', 'lukmccall']
160+
mentions: ['kudo', 'lukmccall', 'kitten']
157161
- patterns: ['packages/expo-modules-core/**']
158162
mentions: ['kudo', 'lukmccall']
159163
- patterns: ['packages/expo-modules-test-core/**']
@@ -207,7 +211,7 @@ rules:
207211
- patterns: ['packages/expo-tracking-transparency/**']
208212
mentions: ['alanjhughes']
209213
- patterns: ['packages/expo-ui/**']
210-
mentions: ['aleqsio', 'behenate']
214+
mentions: ['aleqsio', 'behenate', 'douglowder']
211215
- patterns: ['packages/expo-updates/**']
212216
mentions: ['wschurman', 'kudo', 'douglowder']
213217
- patterns: ['packages/expo-updates-interface/**']

.github/workflows/test-suite-nightly.yml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ jobs:
2323
runs-on: macos-15
2424
steps:
2525
- name: 👀 Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
submodules: true
29+
- name: 🏗️ Setup Bun
30+
uses: oven-sh/setup-bun@v2
31+
with:
32+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
33+
# TODO(cedric): swap `latest` back once the issue is resolved
34+
bun-version: latest
2935
- name: 🔨 Switch to Xcode 16.0
3036
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
3137
- name: 🍺 Install required tools
@@ -55,7 +61,7 @@ jobs:
5561
run: pod update RCT-Folly SocketRocket --no-repo-update
5662
working-directory: apps/bare-expo/ios
5763
- name: 🍏 Build iOS Project
58-
run: ./scripts/start-ios-e2e-test.js --build
64+
run: ./scripts/start-ios-e2e-test.ts --build
5965
working-directory: apps/bare-expo
6066
env:
6167
EXPO_DEBUG: 1
@@ -82,9 +88,15 @@ jobs:
8288
runs-on: macos-15
8389
steps:
8490
- name: 👀 Checkout
85-
uses: actions/checkout@v4
91+
uses: actions/checkout@v5
8692
with:
8793
submodules: true
94+
- name: 🏗️ Setup Bun
95+
uses: oven-sh/setup-bun@v2
96+
with:
97+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
98+
# TODO(cedric): swap `latest` back once the issue is resolved
99+
bun-version: latest
88100
- name: ➕ Add `bin` to GITHUB_PATH
89101
run: echo "$(pwd)/bin" >> $GITHUB_PATH
90102
- name: 🌠 Download builds
@@ -107,7 +119,7 @@ jobs:
107119
if: steps.expo-caches.outputs.yarn-workspace-hit != 'true'
108120
run: yarn install --frozen-lockfile
109121
- name: 🍏 Run iOS tests
110-
run: ./scripts/start-ios-e2e-test.js --test
122+
run: ./scripts/start-ios-e2e-test.ts --test
111123
working-directory: apps/bare-expo
112124
- name: 📸 Store testing artifacts
113125
if: always()
@@ -137,15 +149,17 @@ jobs:
137149
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:MaxMetaspaceSize=4096m"
138150
steps:
139151
- name: 👀 Checkout
140-
uses: actions/checkout@v4
152+
uses: actions/checkout@v5
141153
with:
142154
submodules: true
143155
- name: 🧹 Cleanup GitHub Linux runner disk space
144156
uses: ./.github/actions/cleanup-linux-disk-space
145-
- name: Setup Node
146-
uses: actions/setup-node@v4
157+
- name: 🏗️ Setup Bun
158+
uses: oven-sh/setup-bun@v2
147159
with:
148-
node-version: 22
160+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
161+
# TODO(cedric): swap `latest` back once the issue is resolved
162+
bun-version: latest
149163
- name: 🔨 Use JDK 17
150164
uses: actions/setup-java@v4
151165
with:
@@ -168,7 +182,7 @@ jobs:
168182
run: ./gradlew preBuild
169183
working-directory: apps/bare-expo/android
170184
- name: 🤖 Build Android project
171-
run: ./scripts/start-android-e2e-test.js --build
185+
run: ./scripts/start-android-e2e-test.ts --build
172186
working-directory: apps/bare-expo
173187
- name: 📸 Upload builds
174188
uses: actions/upload-artifact@v4
@@ -197,6 +211,12 @@ jobs:
197211
steps:
198212
- name: 👀 Checkout
199213
uses: actions/checkout@v4
214+
- name: 🏗️ Setup Bun
215+
uses: oven-sh/setup-bun@v2
216+
with:
217+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
218+
# TODO(cedric): swap `latest` back once the issue is resolved
219+
bun-version: latest
200220
- name: 🌠 Download builds
201221
uses: actions/download-artifact@v4
202222
with:
@@ -219,7 +239,7 @@ jobs:
219239
with:
220240
avd-api: ${{ matrix.api-level }}
221241
avd-name: avd-${{ matrix.api-level }}
222-
script: ./scripts/start-android-e2e-test.js --test
242+
script: ./scripts/start-android-e2e-test.ts --test
223243
working-directory: ./apps/bare-expo
224244
- name: 📸 Store testing artifacts
225245
if: always()

.github/workflows/test-suite.yml

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Suite
1+
name: Test Suite e2e
22

33
on:
44
workflow_dispatch: {}
@@ -29,10 +29,16 @@ jobs:
2929
runs-on: macos-15
3030
steps:
3131
- name: 👀 Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
with:
3434
submodules: true
35-
- name: 🔨 Switch to Xcode 16.0
35+
- name: 🏗️ Setup Bun
36+
uses: oven-sh/setup-bun@v2
37+
with:
38+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
39+
# TODO(cedric): swap `latest` back once the issue is resolved
40+
bun-version: latest
41+
- name: 🔨 Switch to Xcode 16.4
3642
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
3743
- name: 🍺 Install required tools
3844
run: |
@@ -71,8 +77,8 @@ jobs:
7177
RCT_USE_PREBUILT_RNCORE: 1
7278
RCT_USE_RN_DEP: 1
7379
working-directory: apps/bare-expo/ios
74-
- name: 🏗️ Build iOS project
75-
run: ./scripts/start-ios-e2e-test.js --build
80+
- name: 🏗️ Build iOS project (bare-expo)
81+
run: ./scripts/start-ios-e2e-test.ts --build
7682
working-directory: apps/bare-expo
7783
timeout-minutes: 55
7884
env:
@@ -93,16 +99,22 @@ jobs:
9399
channel: '#expo-ios'
94100
status: ${{ job.status }}
95101
fields: job,message,ref,eventName,author,took
96-
author_name: Test Suite (iOS)
102+
author_name: Test Suite e2e (iOS)
97103

98-
ios-test:
104+
ios-test-e2e:
99105
needs: ios-build
100106
runs-on: macos-15
101107
steps:
102108
- name: 👀 Checkout
103-
uses: actions/checkout@v4
109+
uses: actions/checkout@v5
104110
with:
105111
submodules: true
112+
- name: 🏗️ Setup Bun
113+
uses: oven-sh/setup-bun@v2
114+
with:
115+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
116+
# TODO(cedric): swap `latest` back once the issue is resolved
117+
bun-version: latest
106118
- name: ➕ Add `bin` to GITHUB_PATH
107119
run: echo "$(pwd)/bin" >> $GITHUB_PATH
108120
- name: 🌠 Download builds
@@ -124,8 +136,8 @@ jobs:
124136
- name: 🧶 Install node modules in root dir
125137
if: steps.expo-caches.outputs.yarn-workspace-hit != 'true'
126138
run: yarn install --frozen-lockfile
127-
- name: 🧪 Run tests
128-
run: ./scripts/start-ios-e2e-test.js --test
139+
- name: 🧪 Run e2e tests (bare-expo)
140+
run: ./scripts/start-ios-e2e-test.ts --test
129141
working-directory: apps/bare-expo
130142
timeout-minutes: 30
131143
- name: 📸 Store testing artifacts
@@ -147,7 +159,7 @@ jobs:
147159
channel: '#expo-ios'
148160
status: ${{ job.status }}
149161
fields: job,message,ref,eventName,author,took
150-
author_name: Test Suite (iOS)
162+
author_name: Test Suite e2e (iOS)
151163

152164
android-build:
153165
runs-on: ubuntu-24.04
@@ -156,15 +168,17 @@ jobs:
156168
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:MaxMetaspaceSize=4096m"
157169
steps:
158170
- name: 👀 Checkout
159-
uses: actions/checkout@v4
171+
uses: actions/checkout@v5
160172
with:
161173
submodules: true
162174
- name: 🧹 Cleanup GitHub Linux runner disk space
163175
uses: ./.github/actions/cleanup-linux-disk-space
164-
- name: Setup Node
165-
uses: actions/setup-node@v4
176+
- name: 🏗️ Setup Bun
177+
uses: oven-sh/setup-bun@v2
166178
with:
167-
node-version: 22
179+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
180+
# TODO(cedric): swap `latest` back once the issue is resolved
181+
bun-version: latest
168182
- name: 🔨 Use JDK 17
169183
uses: actions/setup-java@v4
170184
with:
@@ -189,8 +203,8 @@ jobs:
189203
- name: 🏗️ Gradle prebuild for Android project (workaround to fix build error)
190204
run: ./gradlew preBuild
191205
working-directory: apps/bare-expo/android
192-
- name: 🏗️ Build Android project
193-
run: ./scripts/start-android-e2e-test.js --build
206+
- name: 🏗️ Build Android project (bare-expo)
207+
run: ./scripts/start-android-e2e-test.ts --build
194208
working-directory: apps/bare-expo
195209
timeout-minutes: 35
196210
env:
@@ -212,17 +226,23 @@ jobs:
212226
channel: '#expo-android'
213227
status: ${{ job.status }}
214228
fields: job,message,ref,eventName,author,took
215-
author_name: Test Suite (Android)
229+
author_name: Test Suite e2e (Android)
216230

217-
android-test:
231+
android-test-e2e:
218232
needs: android-build
219233
runs-on: ubuntu-24.04
220234
strategy:
221235
matrix:
222236
api-level: [34]
223237
steps:
224238
- name: 👀 Checkout
225-
uses: actions/checkout@v4
239+
uses: actions/checkout@v5
240+
- name: 🏗️ Setup Bun
241+
uses: oven-sh/setup-bun@v2
242+
with:
243+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
244+
# TODO(cedric): swap `latest` back once the issue is resolved
245+
bun-version: latest
226246
- name: 🌠 Download builds
227247
uses: actions/download-artifact@v4
228248
with:
@@ -240,12 +260,12 @@ jobs:
240260
- name: 🧶 Install node modules in root dir
241261
if: steps.expo-caches.outputs.yarn-workspace-hit != 'true'
242262
run: yarn install --frozen-lockfile
243-
- name: 🧪 Run tests
263+
- name: 🧪 Run e2e tests (bare-expo)
244264
uses: ./.github/actions/use-android-emulator
245265
with:
246266
avd-api: ${{ matrix.api-level }}
247267
avd-name: avd-${{ matrix.api-level }}
248-
script: ./scripts/start-android-e2e-test.js --test
268+
script: ./scripts/start-android-e2e-test.ts --test
249269
working-directory: ./apps/bare-expo
250270
- name: 📸 Store testing artifacts
251271
if: always()
@@ -267,4 +287,4 @@ jobs:
267287
channel: '#expo-android'
268288
status: ${{ job.status }}
269289
fields: job,message,ref,eventName,author,took
270-
author_name: Test Suite (Android)
290+
author_name: Test Suite e2e (Android)

.swiftlint.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ opt_in_rules:
3737
- closure_spacing
3838
- collection_alignment
3939
- comma_inheritance
40-
- conditional_returns_on_newline
4140
- direct_return
4241
- discouraged_object_literal
4342
- empty_collection_literal
@@ -410,3 +409,10 @@ void_return: warning
410409

411410
# The variable should be placed on the left, the constant on the right of a comparison operator.
412411
yoda_condition: warning
412+
413+
custom_rules:
414+
no_trailing_comma_in_function_calls:
415+
name: 'No trailing comma in function calls'
416+
regex: ',\s*(\n\s*)?\)'
417+
message: 'Remove trailing comma before closing parenthesis'
418+
severity: error

0 commit comments

Comments
 (0)