Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/mobile/deps/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The Enriched Markdown tarball comes from `main` of [aislopware/enriched-markdown](https://github.com/aislopware/enriched-markdown). Its `oni-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)), and Android measuring text in the span order its view draws it, so code blocks nested in list items no longer make a reply overlap the next message ([#1145](https://github.com/software-mansion/enriched-markdown/pull/1145)). It also carries one fork-only change: a long-pressed iOS blockquote lifts on the background it sits on instead of drawing its text over the thread.
The Enriched Markdown tarball comes from `main` of [aislopware/enriched-markdown](https://github.com/aislopware/enriched-markdown). Its `oni-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)), and Android measuring text in the span order its view draws it, so code blocks nested in list items no longer make a reply overlap the next message ([#1145](https://github.com/software-mansion/enriched-markdown/pull/1145)). It also carries two fork-only changes, both from T3 Code's fork: iOS code blocks too big for one backing store draw through tiles, so a tall block with long lines no longer shows an empty pane ([pingdotgg/enriched-markdown#15](https://github.com/pingdotgg/enriched-markdown/pull/15)), and a long-pressed iOS blockquote lifts on the background it sits on instead of drawing its text over the thread.

To replace it, commit the fork changes on `main` with the next `1.2.0-oni.N` version, run `yarn install --immutable` and `yarn workspace react-native-enriched-markdown prepare` in the fork checkout, then `yarn workspace react-native-enriched-markdown pack:onicode /absolute/path/to/onicode/apps/mobile/deps`. Tag the source commit `oni-v<version>` and push `main` and the tag to the fork. Rename the archive to include the first eight characters of the source commit, as in `react-native-enriched-markdown-<version>-<commit>.tgz`, so each build has a distinct dependency path. Update the tarball path in `apps/mobile/package.json` and `pnpm-workspace.yaml`'s `allowBuilds`, and run `vp i` to update the lockfile. Native clients need rebuilding when this dependency changes.

Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"react": "catalog:",
"react-dom": "catalog:",
"react-native": "0.88.1",
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-oni.19-8f75ee5a.tgz",
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-oni.20-9c558b5c.tgz",
"react-native-gesture-handler": "~3.5.0",
"react-native-image-viewing": "^0.2.2",
"react-native-keyboard-controller": "1.23.0",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ allowBuilds:
objc-js: false
# Its postinstall only prints a banner.
react-native-pdf-jsi: false
"react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-oni.19-8f75ee5a.tgz": true
"react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-oni.20-9c558b5c.tgz": true
sharp: true
utf-8-validate: false
# Verifies the workerd binary for the push gateway's local dev server.
Expand Down
4 changes: 2 additions & 2 deletions scripts/upstream-sync.ledger.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ f59aa4eba0 take fix(server): reject PR watches when hosting dependencies are una
9fb4492329 take fix(chat): requeued steers no longer look delivered (#23420)
f6787e8537 take fix(web): reuse timeline rows while thinking and plans stream (#24121)
532bf2ee19 take fix(mobile): Back from a PR opened in a chat returns to the chat on Android (#27653)
0ca50a6f1e skip Swaps upstream's t3-built enriched-markdown tarball; Onicode ships its own oni.18 build, so the fix must be ported into aislopware/enriched-markdown and the oni tarball rebuilt (follow-up).
0ca50a6f1e take Ported into aislopware/enriched-markdown (pingdotgg/enriched-markdown#15 cherry-picked) and shipped as Onicode's own 1.2.0-oni.20 tarball instead of upstream's t3 build.
56b6c2a8bf take fix(mobile): refreshing a review diff keeps unfolded files open (#35682)
d76e06679b take fix(server): snooze no longer waits two minutes after a steered queued message (#35661)
f70e349eca take test(server): count leaked PR cache caller data without WeakRefs (#35694)
Expand Down Expand Up @@ -1347,7 +1347,7 @@ f5ae8088c3 take taken as is
99e10f05c8 skip T3 Connect client naming in CloudLink; Onicode removed T3 Connect
cbf0f0a83f take taken as is
42057b82d0 take reworded web+desktop to desktop-only (Onicode has no web app; only the desktop's local environment applies themes); measured MCP tool-list budget
e4f066da21 skip Swaps upstream's t3-built enriched-markdown tarball (iOS blockquote long-press fix); Onicode ships its own oni.18 build, so the fix must be ported into aislopware/enriched-markdown and the oni tarball rebuilt (follow-up).
e4f066da21 take Ported into aislopware/enriched-markdown (identical blockquote preview fix, shipped since 1.2.0-oni.19); Onicode keeps its own oni tarball instead of upstream's t3 build.
9a4ec171fc take taken as is
a2edd281df take Android dialog fix only (replaced alerts report dismissal); the T3 Connect device-approval feature, its migrations and contracts are skipped
ca1a0280da take taken as is
Expand Down
Loading