Skip to content
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

merge InProgressDirty into InProgress #8777

Merged
merged 3 commits into from
Jul 18, 2024
Merged

merge InProgressDirty into InProgress #8777

merged 3 commits into from
Jul 18, 2024

Conversation

sokra
Copy link
Member

@sokra sokra commented Jul 17, 2024

Description

This saves some memory and streamlines the behavior.

It also lazily removes collectibles, children and dependencies even when entering the previous InProgressDirty (now InProgress stale) state.

Testing Instructions

@sokra sokra requested a review from a team as a code owner July 17, 2024 15:58
Copy link

vercel bot commented Jul 17, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
examples-nonmonorepo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 18, 2024 6:51am
rust-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 18, 2024 6:51am
8 Skipped Deployments
Name Status Preview Comments Updated (UTC)
examples-basic-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-designsystem-docs ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-gatsby-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-kitchensink-blog ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-native-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-svelte-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-tailwind-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am
examples-vite-web ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2024 6:51am

Copy link
Contributor

github-actions bot commented Jul 17, 2024

🟢 Turbopack Benchmark CI successful 🟢

Thanks

@sokra sokra requested a review from bgw July 17, 2024 16:01
Copy link
Contributor

github-actions bot commented Jul 17, 2024

⚠️ This change may fail to build next-swc.

Logs

packages/next-swc/crates/next-core/src/util.rs:40:10: �[38;5;9merror[E0277]: the trait bound `PathType: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/app_structure.rs:104:10: �[38;5;9merror[E0277]: the trait bound `MetadataItem: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/app_structure.rs:477:10: �[38;5;9merror[E0277]: the trait bound `Entrypoint: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/util.rs:47:1: �[38;5;9merror[E0277]: the trait bound `PathType: Serialize` is not satisfied
packages/next-swc/crates/next-core/src/util.rs:47:1: �[38;5;9merror[E0277]: the trait bound `PathType: Deserialize<'_>` is not satisfied
packages/next-swc/crates/next-core/src/next_client/context.rs:133:13: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_client/context.rs:134:11: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_client/context.rs:133:13: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/app_structure.rs:475:89: �[38;5;9merror[E0277]: the trait bound `MetadataItem: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/next_client/context.rs:134:11: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_app/metadata/route.rs:33:1: �[38;5;9merror[E0277]: the trait bound `MetadataItem: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/next_app/metadata/route.rs:56:1: �[38;5;9merror[E0277]: the trait bound `MetadataItem: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:85:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:88:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:91:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:94:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:97:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:98:9: �[38;5;9merror[E0277]: can't compare `Vc<turbo_tasks::RcStr>` with `Vc<turbo_tasks::RcStr>`
packages/next-swc/crates/next-core/src/next_server/context.rs:99:9: �[38;5;9merror[E0277]: can't compare `Vc<Box<dyn Transition>>` with `Vc<Box<dyn Transition>>`
packages/next-swc/crates/next-core/src/next_server/context.rs:102:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:103:9: �[38;5;9merror[E0277]: can't compare `Vc<turbo_tasks::RcStr>` with `Vc<turbo_tasks::RcStr>`
packages/next-swc/crates/next-core/src/next_server/context.rs:106:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/app_structure.rs:109:1: �[38;5;9merror[E0277]: the trait bound `MetadataItem: std::hash::Hash` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:107:9: �[38;5;9merror[E0277]: can't compare `Vc<turbo_tasks::RcStr>` with `Vc<turbo_tasks::RcStr>`
packages/next-swc/crates/next-core/src/next_server/context.rs:110:9: �[38;5;9merror[E0277]: can't compare `Vc<FileSystemPath>` with `Vc<FileSystemPath>`
packages/next-swc/crates/next-core/src/next_server/context.rs:111:9: �[38;5;9merror[E0277]: can't compare `Vc<turbo_tasks::RcStr>` with `Vc<turbo_tasks::RcStr>`
packages/next-swc/crates/next-core/src/next_server/context.rs:85:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:88:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:91:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:94:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:97:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:98:9: �[38;5;9merror[E0277]: the trait bound `Vc<turbo_tasks::RcStr>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:99:9: �[38;5;9merror[E0277]: the trait bound `Vc<Box<dyn Transition>>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:102:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:103:9: �[38;5;9merror[E0277]: the trait bound `Vc<turbo_tasks::RcStr>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:106:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:107:9: �[38;5;9merror[E0277]: the trait bound `Vc<turbo_tasks::RcStr>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:110:9: �[38;5;9merror[E0277]: the trait bound `Vc<FileSystemPath>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/next_server/context.rs:111:9: �[38;5;9merror[E0277]: the trait bound `Vc<turbo_tasks::RcStr>: Ord` is not satisfied
packages/next-swc/crates/next-core/src/util.rs:47:1: �[38;5;9merror[E0277]: the trait bound `PathType: std::hash::Hash` is not satisfied
error: could not compile `next-core` (lib) due to 42 previous errors

See job summary for details

Copy link
Contributor

github-actions bot commented Jul 17, 2024

⚠️ CI failed ⚠️

The following steps have failed in CI:

  • Turbopack Rust tests (mac/win, non-blocking)

See workflow summary for details

@sokra sokra requested a review from arlyon July 18, 2024 00:23
@sokra sokra enabled auto-merge (squash) July 18, 2024 00:24
@sokra sokra disabled auto-merge July 18, 2024 00:33
Copy link
Member

@bgw bgw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is a net-overall simplification, and I appreciate the added unit test. LGTM!

@@ -310,14 +310,22 @@ impl MaybeCollectibles {
}

struct InProgressState {
/// Event is fired when the task is Done.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for improving the documentation!

@sokra sokra merged commit ab96fc6 into main Jul 18, 2024
52 of 54 checks passed
@sokra sokra deleted the sokra/in-progress-dirty branch July 18, 2024 06:57
sokra added a commit to vercel/next.js that referenced this pull request Jul 23, 2024
In larger apps, when compilation can take time and endpoints are often
build concurrently, `endpoint_server_changed_subscribe`’s subscription
to turbotasks can result in unnecessary calls of the JS callback even
when turbotasks input has not changed.

This wraps subscribing to issues and diagnostics in
`endpoint_server_changed_subscribe` within a turbotasks function that
ensures that inputs are properly consistent (e.g. diagnostics have been
sorted and are value-equal) so this callback is not called unnecessary.

Test Plan: Navigate within a large app and verify
`serverComponentChanges` messages are not sent through the web socket
connection and the browser does not perform unnecessary fetch requests
to rsc endpoints.

### Turbopack Changes

* vercel/turborepo#8777 <!-- Tobias Koppers - merge
InProgressDirty into InProgress -->
* vercel/turborepo#8785 <!-- Tobias Koppers - fix
watcher bug with file creation -->
* vercel/turborepo#8793 <!-- Tobias Koppers - get
rid of notify-debouncer in favor of our own debouncing -->
* vercel/turborepo#8805 <!-- Tobias Koppers - impl
Ord for Diagnostics and Issue so they are sorted correctly -->

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Jul 25, 2024
### Description

This saves some memory and streamlines the behavior.

It also lazily removes collectibles, children and dependencies even when
entering the previous InProgressDirty (now InProgress stale) state.


### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Jul 29, 2024
### Description

This saves some memory and streamlines the behavior.

It also lazily removes collectibles, children and dependencies even when
entering the previous InProgressDirty (now InProgress stale) state.


### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Jul 29, 2024
### Description

This saves some memory and streamlines the behavior.

It also lazily removes collectibles, children and dependencies even when
entering the previous InProgressDirty (now InProgress stale) state.


### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Aug 1, 2024
### Description

This saves some memory and streamlines the behavior.

It also lazily removes collectibles, children and dependencies even when
entering the previous InProgressDirty (now InProgress stale) state.


### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Aug 14, 2024
In larger apps, when compilation can take time and endpoints are often
build concurrently, `endpoint_server_changed_subscribe`’s subscription
to turbotasks can result in unnecessary calls of the JS callback even
when turbotasks input has not changed.

This wraps subscribing to issues and diagnostics in
`endpoint_server_changed_subscribe` within a turbotasks function that
ensures that inputs are properly consistent (e.g. diagnostics have been
sorted and are value-equal) so this callback is not called unnecessary.

Test Plan: Navigate within a large app and verify
`serverComponentChanges` messages are not sent through the web socket
connection and the browser does not perform unnecessary fetch requests
to rsc endpoints.

### Turbopack Changes

* vercel/turborepo#8777 <!-- Tobias Koppers - merge
InProgressDirty into InProgress -->
* vercel/turborepo#8785 <!-- Tobias Koppers - fix
watcher bug with file creation -->
* vercel/turborepo#8793 <!-- Tobias Koppers - get
rid of notify-debouncer in favor of our own debouncing -->
* vercel/turborepo#8805 <!-- Tobias Koppers - impl
Ord for Diagnostics and Issue so they are sorted correctly -->

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Aug 15, 2024
In larger apps, when compilation can take time and endpoints are often
build concurrently, `endpoint_server_changed_subscribe`’s subscription
to turbotasks can result in unnecessary calls of the JS callback even
when turbotasks input has not changed.

This wraps subscribing to issues and diagnostics in
`endpoint_server_changed_subscribe` within a turbotasks function that
ensures that inputs are properly consistent (e.g. diagnostics have been
sorted and are value-equal) so this callback is not called unnecessary.

Test Plan: Navigate within a large app and verify
`serverComponentChanges` messages are not sent through the web socket
connection and the browser does not perform unnecessary fetch requests
to rsc endpoints.

### Turbopack Changes

* vercel/turborepo#8777 <!-- Tobias Koppers - merge
InProgressDirty into InProgress -->
* vercel/turborepo#8785 <!-- Tobias Koppers - fix
watcher bug with file creation -->
* vercel/turborepo#8793 <!-- Tobias Koppers - get
rid of notify-debouncer in favor of our own debouncing -->
* vercel/turborepo#8805 <!-- Tobias Koppers - impl
Ord for Diagnostics and Issue so they are sorted correctly -->

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
ForsakenHarmony pushed a commit to vercel/next.js that referenced this pull request Aug 16, 2024
In larger apps, when compilation can take time and endpoints are often
build concurrently, `endpoint_server_changed_subscribe`’s subscription
to turbotasks can result in unnecessary calls of the JS callback even
when turbotasks input has not changed.

This wraps subscribing to issues and diagnostics in
`endpoint_server_changed_subscribe` within a turbotasks function that
ensures that inputs are properly consistent (e.g. diagnostics have been
sorted and are value-equal) so this callback is not called unnecessary.

Test Plan: Navigate within a large app and verify
`serverComponentChanges` messages are not sent through the web socket
connection and the browser does not perform unnecessary fetch requests
to rsc endpoints.

### Turbopack Changes

* vercel/turborepo#8777 <!-- Tobias Koppers - merge
InProgressDirty into InProgress -->
* vercel/turborepo#8785 <!-- Tobias Koppers - fix
watcher bug with file creation -->
* vercel/turborepo#8793 <!-- Tobias Koppers - get
rid of notify-debouncer in favor of our own debouncing -->
* vercel/turborepo#8805 <!-- Tobias Koppers - impl
Ord for Diagnostics and Issue so they are sorted correctly -->

---------

Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants