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.

Sign up for GitHub

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

Jump to bottom

Remove EnvironmentIntention #5420

Merged
merged 2 commits into from
Jun 30, 2023
Merged

Remove EnvironmentIntention #5420

merged 2 commits into from
Jun 30, 2023

Conversation

alexkirsz
Copy link
Contributor

@alexkirsz alexkirsz commented Jun 29, 2023 •
edited

Description

This PR removes the EnvironmentIntention enum entirely. The enum wasn't being used anywhere and created artificial differences between environments that weren't useful (nor respected in some cases).

Next.js PR: vercel/next.js#51965

Testing Instructions

CI

@alexkirsz alexkirsz requested a review from a team as a code owner June 29, 2023 08:38
@vercel
Copy link

vercel bot commented Jun 29, 2023 •
edited

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

Name Status Preview Comments Updated (UTC)
examples-cra-web 🔄 Building (Inspect) Visit Preview 💬 Add feedback Jun 30, 2023 0:36am
10 Ignored Deployments
Name Status Preview Comments Updated (UTC)
examples-basic-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-designsystem-docs ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-gatsby-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-kitchensink-blog ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-native-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-nonmonorepo ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-svelte-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-tailwind-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
examples-vite-web ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am
turbo-site ⬜️ Ignored (Inspect) Visit Preview Jun 30, 2023 0:36am

@github-actions
Copy link
Contributor

github-actions bot commented Jun 29, 2023 •
edited

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

Logs 

packages/next-swc/crates/next-core/src/app_source.rs:35:17: �[38;5;9merror[E0432]: unresolved import `turbopack_binding::turbopack::dev_server::source::specificity`
packages/next-swc/crates/next-core/src/manifest.rs:17:71: �[38;5;9merror[E0432]: unresolved import `turbopack_binding::turbopack::dev_server::source::ContentSourceResultVc`
packages/next-swc/crates/next-core/src/next_image/content_source.rs:17:13: �[38;5;9merror[E0432]: unresolved imports `turbopack_binding::turbopack::dev_server::source::wrapping_source::encode_pathname_to_url`, `turbopack_binding::turbopack::dev_server::source::wrapping_source::WrappedContentSourceVc`, `turbopack_binding::turbopack::dev_server::source::ContentSourceResultVc`, `turbopack_binding::turbopack::dev_server::source::NeededData`
packages/next-swc/crates/next-core/src/page_source.rs:29:17: �[38;5;9merror[E0432]: unresolved import `turbopack_binding::turbopack::dev_server::source::specificity`
packages/next-swc/crates/next-core/src/pages_structure.rs:5:36: �[38;5;9merror[E0432]: unresolved import `turbopack_binding::turbopack::dev_server::source::specificity`
packages/next-swc/crates/next-core/src/router_source.rs:12:9: �[38;5;9merror[E0432]: unresolved imports `turbopack_binding::turbopack::dev_server::source::ContentSourceResultVc`, `turbopack_binding::turbopack::dev_server::source::NeededData`
packages/next-swc/crates/next-core/src/manifest.rs:154:1: �[38;5;9merror[E0407]: method `get` is not a member of trait `ContentSource`
packages/next-swc/crates/next-core/src/next_image/content_source.rs:42:1: �[38;5;9merror[E0407]: method `get` is not a member of trait `ContentSource`
packages/next-swc/crates/next-core/src/router_source.rs:89:1: �[38;5;9merror[E0407]: method `get` is not a member of trait `ContentSource`
packages/next-swc/crates/next-core/src/app_source.rs:674:24: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextParamsMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:687:10: �[38;5;9merror[E0277]: the trait bound `StringVc: From<AppRendererVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:669:18: �[38;5;9merror[E0061]: this function takes 11 arguments but 10 arguments were supplied
packages/next-swc/crates/next-core/src/app_source.rs:718:38: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextFallbackMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:731:10: �[38;5;9merror[E0277]: the trait bound `StringVc: From<AppRendererVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:713:18: �[38;5;9merror[E0061]: this function takes 11 arguments but 10 arguments were supplied
packages/next-swc/crates/next-core/src/app_source.rs:763:24: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextParamsMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:776:10: �[38;5;9merror[E0277]: the trait bound `StringVc: From<AppRouteVc>` is not satisfied
packages/next-swc/crates/next-core/src/app_source.rs:758:18: �[38;5;9merror[E0061]: this function takes 10 arguments but 9 arguments were supplied
packages/next-swc/crates/next-core/src/manifest.rs:154:1: �[38;5;9merror[E0046]: not all trait items implemented, missing: `get_routes`
packages/next-swc/crates/next-core/src/next_image/content_source.rs:102:26: �[38;5;9merror[E0599]: no method named `content_source` found for struct `RewriteBuilder` in the current scope
packages/next-swc/crates/next-core/src/next_image/content_source.rs:42:1: �[38;5;9merror[E0046]: not all trait items implemented, missing: `get_routes`
packages/next-swc/crates/next-core/src/page_source.rs:411:27: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextParamsMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:424:14: �[38;5;9merror[E0277]: the trait bound `StringVc: From<SsrEntryVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:406:9: �[38;5;9merror[E0061]: this function takes 10 arguments but 9 arguments were supplied
packages/next-swc/crates/next-core/src/page_source.rs:465:31: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextParamsMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:444:10: �[38;5;9merror[E0277]: the trait bound `StringVc: From<SsrEntryVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:460:13: �[38;5;9merror[E0061]: this function takes 11 arguments but 10 arguments were supplied
packages/next-swc/crates/next-core/src/page_source.rs:477:36: �[38;5;9merror[E0277]: the trait bound `FileSystemPathVc: From<NextPrefixSuffixParamsMatcherVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:457:10: �[38;5;9merror[E0277]: the trait bound `StringVc: From<SsrEntryVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:472:13: �[38;5;9merror[E0061]: this function takes 11 arguments but 10 arguments were supplied
packages/next-swc/crates/next-core/src/page_source.rs:577:6: �[38;5;9merror[E0277]: the trait bound `StringVc: From<SsrEntryVc>` is not satisfied
packages/next-swc/crates/next-core/src/page_source.rs:588:9: �[38;5;9merror[E0061]: this function takes 11 arguments but 10 arguments were supplied
packages/next-swc/crates/next-core/src/router_source.rs:105:18: �[38;5;9merror[E0599]: no method named `get` found for struct `ContentSourceVc` in the current scope
packages/next-swc/crates/next-core/src/router_source.rs:156:18: �[38;5;9merror[E0599]: no method named `get` found for struct `ContentSourceVc` in the current scope
packages/next-swc/crates/next-core/src/router_source.rs:158:73: �[38;5;9merror[E0599]: no method named `content_source` found for struct `RewriteBuilder` in the current scope
packages/next-swc/crates/next-core/src/router_source.rs:89:1: �[38;5;9merror[E0046]: not all trait items implemented, missing: `get_routes`
error: could not compile `next-core` (lib) due to 36 previous errors

See job summary for details

@alexkirsz alexkirsz force-pushed the alexkirsz/web-1247-get-rid-of-environmentintention branch from 8d79473 to 24e6769 Compare June 29, 2023 08:44
@alexkirsz alexkirsz mentioned this pull request Jun 29, 2023
Merged
@github-actions
Copy link
Contributor

github-actions bot commented Jun 29, 2023 •
edited

🟢 CI successful 🟢

Thanks

@github-actions
Copy link
Contributor

Linux Benchmark for aafd59e

Click to view benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 5840.87µs ± 18.89µs 5770.46µs ± 33.49µs -1.21%
bench_hmr_to_eval/Turbopack CSR/1000 modules 5424.80µs ± 25.78µs 5574.42µs ± 139.74µs +2.76%
bench_startup/Turbopack CSR/1000 modules 904.39ms ± 2.90ms 902.87ms ± 3.38ms -0.17%

sokra
sokra approved these changes Jun 29, 2023
View reviewed changes
Copy link
Member

@sokra sokra left a comment

Choose a reason for hiding this comment

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

examples need some update, otherwise fine

@github-actions
Copy link
Contributor

Linux Benchmark for 765b073

Click to view benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 10.68ms ± 0.05ms 10.72ms ± 0.08ms +0.37%
bench_hmr_to_eval/Turbopack CSR/1000 modules 9701.42µs ± 76.38µs 9832.12µs ± 109.98µs +1.35%
bench_startup/Turbopack CSR/1000 modules 1103.09ms ± 0.69ms 1111.48ms ± 4.92ms +0.76%

@github-actions
Copy link
Contributor

MacOS Benchmark for 765b073

Test Base PR % Significant %
bench_startup/Turbopack CSR/1000 modules 3447.28ms ± 63.57ms 13.79s ± 2.95s +300.03% +120.76%
Click to view full benchmark
Test Base PR % Significant %
bench_hmr_to_commit/Turbopack CSR/1000 modules 28.22ms ± 0.08ms 28.31ms ± 0.10ms +0.32%
bench_hmr_to_eval/Turbopack CSR/1000 modules 27.64ms ± 0.14ms 27.39ms ± 0.10ms -0.92%
bench_startup/Turbopack CSR/1000 modules 3447.28ms ± 63.57ms 13.79s ± 2.95s +300.03% +120.76%

@alexkirsz alexkirsz merged commit dfffb3c into main Jun 30, 2023
47 of 48 checks passed
@alexkirsz alexkirsz deleted the alexkirsz/web-1247-get-rid-of-environmentintention branch June 30, 2023 14:01
kodiakhq bot pushed a commit to vercel/next.js that referenced this pull request Jul 3, 2023
@alexkirsz
Remove EnvironmentIntention (#51965)
805bfa4 
See vercel/turbo#5420

# Turbopack changes

* vercel/turbo#5420 
* vercel/turbo#5387
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sokra sokra sokra approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@alexkirsz @sokra