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

Same as #61360 #61369

Merged
merged 11 commits into from
Jan 30, 2024
Merged

Same as #61360 #61369

merged 11 commits into from
Jan 30, 2024

Conversation

timneutkens
Copy link
Member

@timneutkens timneutkens commented Jan 30, 2024 •
edited by padmaia

What?

Same PR as #61360, somehow that branch could not be checked out / wasn't available in git.

Closes NEXT-2295

@timneutkens
Revert "Upgrade Turbopack"
12ac3b7 
This reverts commit fc5e4ee.
@timneutkens Graphite App
Copy link
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @timneutkens and the rest of your teammates on Graphite Graphite

timneutkens and others added 3 commits January 30, 2024 10:14
@timneutkens
Revert "Same as #61360"
cbc4e8f 
This reverts commit 18eed36.
@timneutkens @wbinnssmith
Revert "Revert "Same as #61360""
dfb020f 
This reverts commit cbc4e8f.

Co-authored-by: Will Binns-Smith <wbinnssmith@gmail.com>
@timneutkens
Revert "Revert "Upgrade Turbopack""
e63d976 
This reverts commit 12ac3b7.
This was referenced Jan 30, 2024
Closed
Merged
sokra pushed a commit to vercel/turbo that referenced this pull request Jan 30, 2024
@timneutkens
Fix sourcemap PR compile error (#7162)
eaea57c 
### Description

Fixes the error on vercel/next.js#61369

Test run:
https://github.com/vercel/turbo/blob/08e09624524425db1530381941d1fedbed27fe4f/crates/turbopack-dev/src/ecmascript/content_entry.rs#L44

Excerpt:

```
  error: type `turbopack_binding::turbopack::turbopack_dev::ecmascript::content_entry::EcmascriptDevChunkContentEntries` is private
     --> packages/next-swc/crates/napi/src/next_api/project.rs:856:35
      |
  856 |                     let entries = content.entries().await?;
      |                                   ^^^^^^^^^^^^^^^^^^^^^^^^ private type
  
  error: type `turbopack_binding::turbopack::turbopack_dev::ecmascript::content_entry::EcmascriptDevChunkContentEntry` is private
     --> packages/next-swc/crates/napi/src/next_api/project.rs:857:33
      |
  857 |                     let entry = entries.get(&ModuleId::String(module).cell().await?);
      |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ private type
  
  error: type `turbopack_binding::turbopack::turbopack_dev::ecmascript::content_entry::EcmascriptDevChunkContentEntry` is private
     --> packages/next-swc/crates/napi/src/next_api/project.rs:858:37
      |
  858 |                     let map = match entry {
      |                                     ^^^^^ private type
  
  error: could not compile `next-swc-napi` (lib) due to 3 previous errors

```

<!--
  ✍️ Write a short summary of your work.
  If necessary, include relevant screenshots.
-->

### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->
@ijjk
Copy link
Member

ijjk commented Jan 30, 2024 •
edited

Stats from current PR

Default Build
General Overall increase ⚠️
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
buildDuration 11.9s 11.9s N/A
buildDurationCached 6.3s 5.2s N/A
nodeModulesSize 200 MB 200 MB ⚠️ +156 B
nextStartRea..uration (ms) 429ms 422ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
3f784ff6-HASH.js gzip 53.4 kB 53.4 kB ✓
423.HASH.js gzip 185 B 181 B N/A
68-HASH.js gzip 29.9 kB 29.9 kB N/A
framework-HASH.js gzip 45.2 kB 45.2 kB ✓
main-app-HASH.js gzip 238 B 239 B N/A
main-HASH.js gzip 31.8 kB 31.8 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB ✓
Overall change 100 kB 100 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
_app-HASH.js gzip 194 B 195 B N/A
_error-HASH.js gzip 182 B 181 B N/A
amp-HASH.js gzip 502 B 502 B ✓
css-HASH.js gzip 320 B 322 B N/A
dynamic-HASH.js gzip 2.5 kB 2.5 kB N/A
edge-ssr-HASH.js gzip 255 B 256 B N/A
head-HASH.js gzip 350 B 349 B N/A
hooks-HASH.js gzip 368 B 369 B N/A
image-HASH.js gzip 4.18 kB 4.18 kB N/A
index-HASH.js gzip 257 B 256 B N/A
link-HASH.js gzip 2.61 kB 2.61 kB N/A
routerDirect..HASH.js gzip 310 B 311 B N/A
script-HASH.js gzip 384 B 383 B N/A
withRouter-HASH.js gzip 306 B 308 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B ✓
Overall change 608 B 608 B ✓
Client Build Manifests
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
_buildManifest.js gzip 484 B 484 B ✓
Overall change 484 B 484 B ✓
Rendered Page Sizes
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
index.html gzip 528 B 527 B N/A
link.html gzip 541 B 540 B N/A
withRouter.html gzip 523 B 522 B N/A
Overall change 0 B 0 B ✓
Edge SSR bundle Size
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
edge-ssr.js gzip 94 kB 94.1 kB N/A
page.js gzip 150 kB 150 kB N/A
Overall change 0 B 0 B ✓
Middleware size
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
middleware-b..fest.js gzip 624 B 624 B ✓
middleware-r..fest.js gzip 151 B 149 B N/A
middleware.js gzip 37.6 kB 37.6 kB N/A
edge-runtime..pack.js gzip 1.92 kB 1.92 kB ✓
Overall change 2.55 kB 2.55 kB ✓
Next Runtimes
vercel/next.js canary vercel/next.js 01-30-Same_as_61360 Change
app-page-exp...dev.js gzip 170 kB 170 kB ✓
app-page-exp..prod.js gzip 95.8 kB 95.8 kB ✓
app-page-tur..prod.js gzip 96.4 kB 96.4 kB ✓
app-page-tur..prod.js gzip 91 kB 91 kB ✓
app-page.run...dev.js gzip 142 kB 142 kB ✓
app-page.run..prod.js gzip 90.3 kB 90.3 kB ✓
app-route-ex...dev.js gzip 22.2 kB 22.2 kB ✓
app-route-ex..prod.js gzip 14.9 kB 14.9 kB ✓
app-route-tu..prod.js gzip 14.9 kB 14.9 kB ✓
app-route-tu..prod.js gzip 14.5 kB 14.5 kB ✓
app-route.ru...dev.js gzip 21.7 kB 21.7 kB ✓
app-route.ru..prod.js gzip 14.5 kB 14.5 kB ✓
pages-api-tu..prod.js gzip 9.43 kB 9.43 kB ✓
pages-api.ru...dev.js gzip 9.7 kB 9.7 kB ✓
pages-api.ru..prod.js gzip 9.43 kB 9.43 kB ✓
pages-turbo...prod.js gzip 22 kB 22 kB ✓
pages.runtim...dev.js gzip 22.7 kB 22.7 kB ✓
pages.runtim..prod.js gzip 22 kB 22 kB ✓
server.runti..prod.js gzip 49.7 kB 49.7 kB ✓
Overall change 933 kB 933 kB ✓
Commit: 79bf0ee

@ijjk
Copy link
Member

ijjk commented Jan 30, 2024 •
edited

Tests Passed

@timneutkens timneutkens merged commit e114229 into canary Jan 30, 2024
68 checks passed
@timneutkens timneutkens deleted the 01-30-Same_as_61360 branch January 30, 2024 14:13
@timneutkens timneutkens mentioned this pull request Jan 30, 2024
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ijjk ijjk Awaiting requested review from ijjk ijjk is a code owner

@shuding shuding Awaiting requested review from shuding shuding is a code owner

@huozhi huozhi Awaiting requested review from huozhi huozhi is a code owner

@feedthejim feedthejim Awaiting requested review from feedthejim feedthejim is a code owner

@ztanner ztanner Awaiting requested review from ztanner ztanner is a code owner

@wyattjoh wyattjoh Awaiting requested review from wyattjoh wyattjoh is a code owner

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team locked type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@timneutkens @ijjk