Skip to content

Commit 333c022

Browse files
Merge branch 'main' into fix/mobile-resume-usage-limit
2 parents 72f94b5 + 5ef5685 commit 333c022

207 files changed

Lines changed: 10279 additions & 1184 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
name: Mobile EAS Preview (Fork)
2+
3+
# EAS previews for fork PRs. This runs the PR's code with an Expo token: the
4+
# app config and plugins run on this runner, and native builds run on EAS
5+
# with preview signing credentials. The label is the maintainer's sign-off
6+
# that they reviewed that code, so it covers exactly the commit it was applied
7+
# to: this pins that commit and consumes the label before running anything. A
8+
# later push deploys nothing until the label is applied again.
9+
#
10+
# Same-repo PRs deploy on every push while labeled, via mobile-eas-preview.yml.
11+
12+
on:
13+
pull_request_target:
14+
types: [labeled]
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
preview:
21+
name: EAS Preview
22+
if: >-
23+
github.event.pull_request.head.repo.full_name != github.repository &&
24+
github.event.label.name == '🚀 Mobile Continuous Deployment'
25+
runs-on: blacksmith-8vcpu-ubuntu-2404
26+
concurrency:
27+
group: mobile-eas-preview-fork-${{ github.event.pull_request.number }}
28+
cancel-in-progress: true
29+
permissions:
30+
contents: read
31+
pull-requests: write
32+
env:
33+
APP_VARIANT: preview
34+
NODE_OPTIONS: --max-old-space-size=8192
35+
MOBILE_VERSION_POLICY: fingerprint
36+
steps:
37+
# If a maintainer removed the label first, that removal wins.
38+
- id: consume
39+
name: Consume the deployment label
40+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
41+
with:
42+
script: |
43+
try {
44+
await github.rest.issues.removeLabel({
45+
owner: context.repo.owner,
46+
repo: context.repo.repo,
47+
issue_number: context.payload.pull_request.number,
48+
name: context.payload.label.name,
49+
});
50+
core.setOutput("consumed", "true");
51+
} catch (error) {
52+
if (error.status !== 404) throw error;
53+
core.info("The label was removed before this run could consume it. Skipping.");
54+
core.setOutput("consumed", "false");
55+
}
56+
57+
- id: expo-token
58+
name: Check for EXPO_PREVIEW_TOKEN
59+
if: steps.consume.outputs.consumed == 'true'
60+
env:
61+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
62+
run: |
63+
if [ -n "$EXPO_TOKEN" ]; then
64+
echo "present=true" >> "$GITHUB_OUTPUT"
65+
else
66+
echo "present=false" >> "$GITHUB_OUTPUT"
67+
echo "EXPO_PREVIEW_TOKEN is not set; skipping EAS preview."
68+
fi
69+
70+
# The head SHA from the label event, not the branch, so a push after the
71+
# label cannot swap in unreviewed code. No credentials stay in .git for
72+
# the PR's scripts to read.
73+
- name: Checkout reviewed commit
74+
if: steps.expo-token.outputs.present == 'true'
75+
uses: actions/checkout@v6
76+
with:
77+
ref: ${{ github.event.pull_request.head.sha }}
78+
fetch-depth: 0
79+
persist-credentials: false
80+
# No sparse-checkout: see mobile-eas-preview.yml.
81+
82+
# No caches: pull_request_target saves them under main's scope, where
83+
# trusted workflows with other secrets would restore what PR code wrote.
84+
- name: Setup Vite+
85+
if: steps.expo-token.outputs.present == 'true'
86+
uses: voidzero-dev/setup-vp@v1
87+
with:
88+
node-version-file: package.json
89+
cache: false
90+
run-install: |
91+
args:
92+
- --filter=@t3tools/mobile...
93+
94+
- name: Expose pnpm
95+
if: steps.expo-token.outputs.present == 'true'
96+
run: |
97+
pnpm_version="$(node --print "require('./package.json').packageManager.split('@').pop()")"
98+
vp_pnpm_bin="$HOME/.vite-plus/package_manager/pnpm/$pnpm_version/pnpm/bin"
99+
echo "$vp_pnpm_bin" >> "$GITHUB_PATH"
100+
"$vp_pnpm_bin/pnpm" --version
101+
102+
- name: Setup EAS
103+
if: steps.expo-token.outputs.present == 'true'
104+
uses: expo/expo-github-action@v8
105+
with:
106+
# Pinned and installed with npm for the same reasons as mobile-eas-preview.yml.
107+
eas-version: 21.8.0
108+
eas-cache: false
109+
token: ${{ secrets.EXPO_PREVIEW_TOKEN }}
110+
packager: npm
111+
112+
- name: Pull preview environment variables
113+
if: steps.expo-token.outputs.present == 'true'
114+
working-directory: apps/mobile
115+
env:
116+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
117+
run: |
118+
eas env:pull preview --non-interactive
119+
# See mobile-eas-preview.yml: keeps Android build and OTA fingerprints matching.
120+
node --input-type=module <<'NODE'
121+
import { appendFileSync, readFileSync } from "node:fs";
122+
import { parseEnv } from "node:util";
123+
const env = parseEnv(readFileSync(".env.local", "utf8"));
124+
const googleServicesFile = env.T3CODE_ANDROID_GOOGLE_SERVICES_FILE;
125+
if (googleServicesFile) {
126+
appendFileSync(process.env.GITHUB_ENV, `T3CODE_ANDROID_GOOGLE_SERVICES_FILE=${googleServicesFile}\n`);
127+
}
128+
NODE
129+
130+
- name: Deploy with fingerprint check
131+
if: steps.expo-token.outputs.present == 'true'
132+
uses: expo/expo-github-action/continuous-deploy-fingerprint@main
133+
env:
134+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
135+
RUNNER_DEBUG: "1"
136+
# The action only comments for pull_request events; this hook gives
137+
# it the PR under pull_request_target. Without it, it skips the comment.
138+
EXPO_TEST_GITHUB_PULL: ${{ github.event.pull_request.number }}
139+
with:
140+
profile: preview:dev
141+
branch: pr-${{ github.event.pull_request.number }}
142+
platform: all
143+
environment: preview
144+
working-directory: apps/mobile
145+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/mobile-eas-preview.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77
jobs:
88
preview:
99
name: EAS Preview
10+
# Fork PRs deploy one reviewed commit per label through mobile-eas-preview-fork.yml.
1011
if: |
12+
github.event.pull_request.head.repo.full_name == github.repository &&
1113
contains(github.event.pull_request.labels.*.name, '🚀 Mobile Continuous Deployment') &&
1214
(github.event.action != 'labeled' || github.event.label.name == '🚀 Mobile Continuous Deployment')
1315
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -23,15 +25,15 @@ jobs:
2325
MOBILE_VERSION_POLICY: fingerprint
2426
steps:
2527
- id: expo-token
26-
name: Check for EXPO_TOKEN
28+
name: Check for EXPO_PREVIEW_TOKEN
2729
env:
28-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
30+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
2931
run: |
3032
if [ -n "$EXPO_TOKEN" ]; then
3133
echo "present=true" >> "$GITHUB_OUTPUT"
3234
else
3335
echo "present=false" >> "$GITHUB_OUTPUT"
34-
echo "EXPO_TOKEN is not available; skipping EAS preview."
36+
echo "EXPO_PREVIEW_TOKEN is not available; skipping EAS preview."
3537
fi
3638
3739
- name: Checkout
@@ -70,7 +72,7 @@ jobs:
7072
# continuous-deploy-fingerprint still reads `build.project.ownerAccount`.
7173
# Unpin once https://github.com/expo/expo-github-action/issues/358 is fixed.
7274
eas-version: 21.8.0
73-
token: ${{ secrets.EXPO_TOKEN }}
75+
token: ${{ secrets.EXPO_PREVIEW_TOKEN }}
7476
# npm, not pnpm: this only installs eas-cli into the action's own
7577
# tool dir, and pnpm 11 hard-fails that install on dtrace-provider's
7678
# ignored build script (no allowBuilds config outside the repo).
@@ -80,7 +82,7 @@ jobs:
8082
if: steps.expo-token.outputs.present == 'true'
8183
working-directory: apps/mobile
8284
env:
83-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
85+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
8486
run: |
8587
eas env:pull preview --non-interactive
8688
# EAS Update disables dotenv loading. Keep the downloaded native config
@@ -99,7 +101,7 @@ jobs:
99101
if: steps.expo-token.outputs.present == 'true'
100102
uses: expo/expo-github-action/continuous-deploy-fingerprint@main
101103
env:
102-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
104+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
103105
# The Expo action otherwise suppresses the EAS command's failure output.
104106
RUNNER_DEBUG: "1"
105107
with:

‎.github/workflows/mobile-eas-production.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ jobs:
9797
- id: expo-token
9898
name: Check for EXPO_TOKEN
9999
env:
100-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
100+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
101101
run: |
102102
if [ -n "$EXPO_TOKEN" ]; then
103103
echo "present=true" >> "$GITHUB_OUTPUT"
104104
else
105105
echo "present=false" >> "$GITHUB_OUTPUT"
106-
echo "EXPO_TOKEN is not available; skipping EAS production job."
106+
echo "EXPO_PRODUCTION_TOKEN is not available; skipping EAS production job."
107107
fi
108108
109109
- id: version_app_token
@@ -149,7 +149,7 @@ jobs:
149149
uses: expo/expo-github-action@v8
150150
with:
151151
eas-version: latest
152-
token: ${{ secrets.EXPO_TOKEN }}
152+
token: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
153153
# npm, not pnpm: this only installs eas-cli into the action's own
154154
# tool dir, and pnpm 11 hard-fails that install on dtrace-provider's
155155
# ignored build script (no allowBuilds config outside the repo).
@@ -159,7 +159,7 @@ jobs:
159159
if: steps.expo-token.outputs.present == 'true'
160160
working-directory: apps/mobile
161161
env:
162-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
162+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
163163
run: |
164164
eas env:pull production --non-interactive
165165
# EAS commands skip dotenv, and the Android fingerprint hashes this
@@ -244,7 +244,7 @@ jobs:
244244
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'workflow_dispatch' && inputs.mode == 'build'
245245
working-directory: apps/mobile
246246
env:
247-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
247+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
248248
MOBILE_BUILD_PROFILE: ${{ inputs.profile || 'production' }}
249249
run: eas build --platform ${{ inputs.platform }} --profile "$MOBILE_BUILD_PROFILE" --auto-submit --non-interactive --no-wait
250250

@@ -255,7 +255,7 @@ jobs:
255255
if: steps.expo-token.outputs.present == 'true' && (github.event_name == 'push' || inputs.mode == 'update')
256256
working-directory: apps/mobile
257257
env:
258-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
258+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
259259
PLATFORM: ${{ inputs.platform || 'all' }}
260260
run: |
261261
if [ "$PLATFORM" = "all" ]; then platforms="ios android"; else platforms="$PLATFORM"; fi
@@ -275,7 +275,7 @@ jobs:
275275
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'workflow_dispatch' && inputs.mode == 'update'
276276
working-directory: apps/mobile
277277
env:
278-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
278+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
279279
MOBILE_BUILD_PROFILE: ${{ inputs.profile || 'production' }}
280280
OTA_MESSAGE: ${{ inputs.message || format('Production OTA ({0})', github.sha) }}
281281
run: |
@@ -299,7 +299,7 @@ jobs:
299299
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'push'
300300
working-directory: apps/mobile
301301
env:
302-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
302+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
303303
run: |
304304
failed=0
305305
message="$(git log -1 --pretty=%s | head -c 120) ($(git rev-parse --short=9 HEAD))"

‎apps/desktop/src/ipc/channels.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const SNAP_SHOT_EVENT_CHANNEL = "desktop:snap-shot-event";
1414
export const WEB_LINK_OPEN_CHANNEL = "desktop:web-link-open";
1515
export const WEB_LINK_READY_CHANNEL = "desktop:web-link-ready";
1616
export const QUIT_SHORTCUT_CHANNEL = "desktop:quit-shortcut";
17+
export const TRACKPAD_SCROLL_BEGIN_CHANNEL = "desktop:trackpad-scroll-begin";
1718
export const TRACKPAD_SCROLL_END_CHANNEL = "desktop:trackpad-scroll-end";
1819
export const GET_WINDOW_FULLSCREEN_STATE_CHANNEL = "desktop:get-window-fullscreen-state";
1920
export const WINDOW_FULLSCREEN_STATE_CHANNEL = "desktop:window-fullscreen-state";

‎apps/desktop/src/preload.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ contextBridge.exposeInMainWorld("desktopBridge", {
9191
ipcRenderer.on(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, handler);
9292
return () => ipcRenderer.removeListener(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, handler);
9393
},
94+
onTrackpadScrollBegin: (listener) => {
95+
const handler = () => listener();
96+
ipcRenderer.on(IpcChannels.TRACKPAD_SCROLL_BEGIN_CHANNEL, handler);
97+
return () => ipcRenderer.removeListener(IpcChannels.TRACKPAD_SCROLL_BEGIN_CHANNEL, handler);
98+
},
9499
onTrackpadScrollEnd: (listener) => {
95100
const handler = () => listener();
96101
ipcRenderer.on(IpcChannels.TRACKPAD_SCROLL_END_CHANNEL, handler);

‎apps/desktop/src/window/DesktopWindow.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
MENU_ACTION_CHANNEL,
2424
QUIT_SHORTCUT_CHANNEL,
2525
SNAP_SHOT_EVENT_CHANNEL,
26+
TRACKPAD_SCROLL_BEGIN_CHANNEL,
2627
TRACKPAD_SCROLL_END_CHANNEL,
2728
WINDOW_FULLSCREEN_STATE_CHANNEL,
2829
} from "../ipc/channels.ts";
@@ -652,7 +653,11 @@ export const make = Effect.gen(function* () {
652653
}
653654
});
654655
window.webContents.on("input-event", (_event, input) => {
655-
if (input.type === "gestureScrollEnd") window.webContents.send(TRACKPAD_SCROLL_END_CHANNEL);
656+
if (input.type === "gestureScrollBegin") {
657+
window.webContents.send(TRACKPAD_SCROLL_BEGIN_CHANNEL);
658+
} else if (input.type === "gestureScrollEnd") {
659+
window.webContents.send(TRACKPAD_SCROLL_END_CHANNEL);
660+
}
656661
});
657662
// Ctrl+wheel bypasses menus; guest contents emit their own zoom-changed event.
658663
window.webContents.on("zoom-changed", (_event, direction) => {

‎apps/mobile/src/features/review/reviewModel.ts‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -534,17 +534,22 @@ export function buildReviewSectionItems(input: {
534534
},
535535
);
536536

537-
const gitItems = input.gitSections.map<ReviewSectionItem>((section) => ({
538-
id: `git:${section.kind}`,
539-
kind: section.kind,
540-
title: section.title,
541-
subtitle: gitSubtitle(section),
542-
diff: section.diff,
543-
source: section,
544-
...(section.files ? { files: section.files } : {}),
545-
truncated: section.truncated,
546-
isLoading: false,
547-
}));
537+
const gitItems = input.gitSections
538+
.filter(
539+
(section): section is typeof section & { kind: ReviewSectionKind } =>
540+
section.kind !== "commit",
541+
)
542+
.map<ReviewSectionItem>((section) => ({
543+
id: `git:${section.kind}`,
544+
kind: section.kind,
545+
title: section.title,
546+
subtitle: gitSubtitle(section),
547+
diff: section.diff,
548+
source: section,
549+
...(section.files ? { files: section.files } : {}),
550+
truncated: section.truncated,
551+
isLoading: false,
552+
}));
548553
const hasChangesItem = gitItems.some((item) => item.id === CHANGES_SECTION_ID);
549554
const visibleGitItems =
550555
input.loadingGitSections && !hasChangesItem

‎apps/mobile/src/features/settings/SettingsEnvironmentDetailRouteScreen.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,10 @@ function EnvironmentDetail({ environmentId }: { readonly environmentId: Environm
294294
void run("refresh", async () => {
295295
if (!readEnvironmentScope(environmentId, AuthOrchestrationReadScope))
296296
return;
297-
const result = await refreshProviders({ environmentId, input: {} });
297+
const result = await refreshProviders({
298+
environmentId,
299+
input: { reloadSecrets: true },
300+
});
298301
if (AsyncResult.isFailure(result)) throw squashAtomCommandFailure(result);
299302
setNotice("Provider status refreshed.");
300303
});

0 commit comments

Comments
 (0)