-
Notifications
You must be signed in to change notification settings - Fork 111
feat: live-markdown working in both Bundle Mode and Legacy Eval Mode #769
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tjzel
wants to merge
3
commits into
Expensify:main
Choose a base branch
from
tjzel:@tjzel/both-worklet-modes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,3 +82,6 @@ lib/ | |
|
|
||
| # jest | ||
| coverage/ | ||
|
|
||
| # Claude | ||
| .claude/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,8 @@ | |
| "android": "react-native run-android", | ||
| "ios": "react-native run-ios", | ||
| "lint": "eslint .", | ||
| "start": "react-native start --client-logs" | ||
| "start": "react-native start --client-logs", | ||
| "bundle-mode-start": "BUNDLE_MODE=1 react-native start --reset-cache --client-logs" | ||
|
Comment on lines
-9
to
+10
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if we shouldn't make it the default 🤔 Are there any drawbacks to always enabling bundle mode? |
||
| }, | ||
| "dependencies": { | ||
| "expensify-common": "2.0.148", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/node_modules/metro/src/node-haste/DependencyGraph.js b/node_modules/metro/src/node-haste/DependencyGraph.js | ||
| index 8222d8c..e36770d 100644 | ||
| --- a/node_modules/metro/src/node-haste/DependencyGraph.js | ||
| +++ b/node_modules/metro/src/node-haste/DependencyGraph.js | ||
| @@ -32,6 +32,11 @@ function getOrCreateMap(map, field) { | ||
| } | ||
| return subMap; | ||
| } | ||
| + | ||
| +const workletsDirPath = _path.default.join( | ||
| + "react-native-worklets", | ||
| + ".worklets", | ||
| +); | ||
| class DependencyGraph extends _events.default { | ||
| #packageCache; | ||
| #dependencyPlugin; | ||
| @@ -197,6 +202,14 @@ class DependencyGraph extends _events.default { | ||
| return (0, _nullthrows.default)(this._fileSystem).getAllFiles(); | ||
| } | ||
| async getOrComputeSha1(mixedPath) { | ||
| + if (mixedPath.includes(workletsDirPath)) { | ||
| + const createHash = require("crypto").createHash; | ||
| + return { | ||
| + sha1: createHash("sha1") | ||
| + .update(performance.now().toString()) | ||
| + .digest("hex"), | ||
| + }; | ||
| + } | ||
| const result = await this._fileSystem.getOrComputeSha1(mixedPath); | ||
| if (!result || !result.sha1) { | ||
| throw new Error(`Failed to get the SHA-1 for: ${mixedPath}. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/node_modules/react-native/node_modules/metro-runtime/src/modules/HMRClient.js b/node_modules/react-native/node_modules/metro-runtime/src/modules/HMRClient.js | ||
| index 534ac87..5773985 100644 | ||
| --- a/node_modules/react-native/node_modules/metro-runtime/src/modules/HMRClient.js | ||
| +++ b/node_modules/react-native/node_modules/metro-runtime/src/modules/HMRClient.js | ||
| @@ -3,6 +3,9 @@ | ||
| const EventEmitter = require("./vendor/eventemitter3"); | ||
| const HEARTBEAT_INTERVAL_MS = 20_000; | ||
| const inject = ({ module: [id, code], sourceURL }) => { | ||
| + if (global.__workletsModuleProxy?.propagateModuleUpdate) { | ||
| + global.__workletsModuleProxy.propagateModuleUpdate(code, sourceURL); | ||
| + } | ||
| if (global.globalEvalWithSourceUrl) { | ||
| global.globalEvalWithSourceUrl(code, sourceURL); | ||
| } else { |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's also redirect users to the correct section of the Worklets docs about their metro setup (metro.config.js, and the patches). The current note suggests that they only have to configure import forwarding