refactor: move denort to separate crate #27688
Merged
Conversation
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
bartlomieju
reviewed
Jan 17, 2025
Comment on lines
-392
to
-402
| println!("cargo:rustc-env=GIT_COMMIT_HASH={}", git_commit_hash()); | ||
| println!("cargo:rerun-if-env-changed=GIT_COMMIT_HASH"); | ||
| println!( | ||
| "cargo:rustc-env=GIT_COMMIT_HASH_SHORT={}", | ||
| &git_commit_hash()[..7] | ||
| ); | ||
|
|
||
| let ts_version = ts::version(); | ||
| debug_assert_eq!(ts_version, "5.6.2"); // bump this assertion when it changes | ||
| println!("cargo:rustc-env=TS_VERSION={}", ts_version); | ||
| println!("cargo:rerun-if-env-changed=TS_VERSION"); |
cli/lib/build.rs
Outdated
Comment on lines
5
to
12
| println!("cargo:rustc-env=GIT_COMMIT_HASH={}", commit_hash); | ||
| println!("cargo:rerun-if-env-changed=GIT_COMMIT_HASH"); | ||
| println!( | ||
| "cargo:rustc-env=GIT_COMMIT_HASH_SHORT={}", | ||
| &commit_hash[..7] | ||
| ); | ||
| let ts_version = "5.6.2"; | ||
| println!("cargo:rustc-env=TS_VERSION={}", ts_version); |
There was a problem hiding this comment.
Nvm, it's here. It's strange that TS_VERSION is emitted by cli/lib/ - I thought the idea was that TS shouldn't be available for denort
There was a problem hiding this comment.
I'm going to inline this and fix it
There was a problem hiding this comment.
Also, yeah it's unfortunate, but we need the typescript version in denort still for the Deno.versions.typescript property. That property should have ideally never been exposed, but not a big deal.
cli/snapshot/build.rs
Outdated
Comment on lines
19
to
21
| // todo(THIS PR): include the typescript version in this crate | ||
| // so that it can be asserted when building the CLI | ||
| let snapshot_options = SnapshotOptions { |
There was a problem hiding this comment.
Flagging that this should be addressed
There was a problem hiding this comment.
Thanks! I just forgot to remove this. It's already asserted in the CLI crate.
bartlomieju
approved these changes
Jan 17, 2025
bartlomieju
pushed a commit
to bartlomieju/deno
that referenced
this pull request
Jan 17, 2025
This slightly degrades the performance of CJS export analysis on subsequent runs because I changed it to no longer cache in the DENO_DIR with this PR (denort now properly has no idea about the DENO_DIR). We'll have to change it to embed this data in the binary and that will also allow us to get rid of swc in denort (will do that in a follow-up PR).
crowlKats
pushed a commit
that referenced
this pull request
Jan 21, 2025
This slightly degrades the performance of CJS export analysis on subsequent runs because I changed it to no longer cache in the DENO_DIR with this PR (denort now properly has no idea about the DENO_DIR). We'll have to change it to embed this data in the binary and that will also allow us to get rid of swc in denort (will do that in a follow-up PR). (cherry picked from commit 57dd66e)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This slightly degrades the performance of CJS export analysis on subsequent runs because I changed it to no longer cache in the DENO_DIR with this PR (denort now properly has no idea about the DENO_DIR). We'll have to change it to embed this data in the binary and that will also allow us to get rid of swc in denort (will do that in a follow-up PR).
Closes #27326
Closes #26982