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

Handle cases where config is exported after its declaration #16211

Merged
merged 5 commits into from
Aug 17, 2020

Conversation

kevva
Copy link
Contributor

@kevva kevva commented Aug 15, 2020

AMP will still not work correctly when switching between non-AMP and AMP pages in development mode because of https://github.com/vercel/next.js/blob/canary/packages/next/build/babel/plugins/next-page-config.ts#L116-L120.

Fixes #15704.

@ijjk
Copy link
Member

ijjk commented Aug 15, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 14.1s 14s -100ms
nodeModulesSize 57.3 MB 57.3 MB ⚠️ +980 B
Page Load Tests Overall increase ✓
vercel/next.js canary kevva/next.js config-var-before-export Change
/ failed reqs 0 0
/ total time (seconds) 2.566 2.53 -0.04
/ avg req/sec 974.36 988.15 +13.79
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.543 1.475 -0.07
/error-in-render avg req/sec 1619.75 1694.46 +74.71
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..c139.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
main-52b3964..e4b8.js gzip 6.74 kB 6.74 kB
webpack-ccf5..276a.js gzip 751 B 751 B
Overall change 56.9 kB 56.9 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.12 kB 6.12 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
main-af2596f..dule.js gzip 5.82 kB 5.82 kB
webpack-10c7..dule.js gzip 751 B 751 B
Overall change 51.8 kB 51.8 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-75..1629.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-874bd8a..0103.js gzip 1.28 kB 1.28 kB
_error-fa39c..ec40.js gzip 3.45 kB 3.45 kB
hooks-585f07..95a3.js gzip 887 B 887 B
index-c7b63f..fc02.js gzip 227 B 227 B
link-4c2bd9b..eadd.js gzip 1.29 kB 1.29 kB
routerDirect..ebc7.js gzip 284 B 284 B
withRouter-2..db68.js gzip 284 B 284 B
Overall change 7.71 kB 7.71 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-97e743e..dule.js gzip 626 B 626 B
_error-b4004..dule.js gzip 2.3 kB 2.3 kB
hooks-696209..dule.js gzip 387 B 387 B
index-a4dd74..dule.js gzip 226 B 226 B
link-236a801..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-1..dule.js gzip 282 B 282 B
Overall change 5.37 kB 5.37 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 321 B 321 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 650 B 650 B
Rendered Page Sizes
vercel/next.js canary kevva/next.js config-var-before-export Change
index.html gzip 947 B 947 B
link.html gzip 955 B 955 B
withRouter.html gzip 942 B 942 B
Overall change 2.84 kB 2.84 kB

Serverless Mode
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 16.1s 16s -123ms
nodeModulesSize 57.3 MB 57.3 MB ⚠️ +980 B
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..c139.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
main-52b3964..e4b8.js gzip 6.74 kB 6.74 kB
webpack-ccf5..276a.js gzip 751 B 751 B
Overall change 56.9 kB 56.9 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.12 kB 6.12 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
main-af2596f..dule.js gzip 5.82 kB 5.82 kB
webpack-10c7..dule.js gzip 751 B 751 B
Overall change 51.8 kB 51.8 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-75..1629.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-874bd8a..0103.js gzip 1.28 kB 1.28 kB
_error-fa39c..ec40.js gzip 3.45 kB 3.45 kB
hooks-585f07..95a3.js gzip 887 B 887 B
index-c7b63f..fc02.js gzip 227 B 227 B
link-4c2bd9b..eadd.js gzip 1.29 kB 1.29 kB
routerDirect..ebc7.js gzip 284 B 284 B
withRouter-2..db68.js gzip 284 B 284 B
Overall change 7.71 kB 7.71 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-97e743e..dule.js gzip 626 B 626 B
_error-b4004..dule.js gzip 2.3 kB 2.3 kB
hooks-696209..dule.js gzip 387 B 387 B
index-a4dd74..dule.js gzip 226 B 226 B
link-236a801..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-1..dule.js gzip 282 B 282 B
Overall change 5.37 kB 5.37 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 321 B 321 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 650 B 650 B
Serverless bundles
vercel/next.js canary kevva/next.js config-var-before-export Change
_error.js 1.03 MB 1.03 MB
404.html 4.18 kB 4.18 kB
hooks.html 3.82 kB 3.82 kB
index.js 1.03 MB 1.03 MB
link.js 1.07 MB 1.07 MB
routerDirect.js 1.06 MB 1.06 MB
withRouter.js 1.06 MB 1.06 MB
Overall change 5.27 MB 5.27 MB
Commit: 83a33e1

@ijjk
Copy link
Member

ijjk commented Aug 15, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 12.4s 12.2s -266ms
nodeModulesSize 57.3 MB 57.3 MB ⚠️ +919 B
Page Load Tests Overall increase ✓
vercel/next.js canary kevva/next.js config-var-before-export Change
/ failed reqs 0 0
/ total time (seconds) 2.257 2.337 ⚠️ +0.08
/ avg req/sec 1107.86 1069.83 ⚠️ -38.03
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.418 1.359 -0.06
/error-in-render avg req/sec 1763.02 1839.48 +76.46
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..c139.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
main-52b3964..e4b8.js gzip 6.74 kB 6.74 kB
webpack-ccf5..276a.js gzip 751 B 751 B
Overall change 56.9 kB 56.9 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.12 kB 6.12 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
main-af2596f..dule.js gzip 5.82 kB 5.82 kB
webpack-10c7..dule.js gzip 751 B 751 B
Overall change 51.8 kB 51.8 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-75..1629.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-874bd8a..0103.js gzip 1.28 kB 1.28 kB
_error-fa39c..ec40.js gzip 3.45 kB 3.45 kB
hooks-585f07..95a3.js gzip 887 B 887 B
index-c7b63f..fc02.js gzip 227 B 227 B
link-4c2bd9b..eadd.js gzip 1.29 kB 1.29 kB
routerDirect..ebc7.js gzip 284 B 284 B
withRouter-2..db68.js gzip 284 B 284 B
Overall change 7.71 kB 7.71 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-97e743e..dule.js gzip 626 B 626 B
_error-b4004..dule.js gzip 2.3 kB 2.3 kB
hooks-696209..dule.js gzip 387 B 387 B
index-a4dd74..dule.js gzip 226 B 226 B
link-236a801..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-1..dule.js gzip 282 B 282 B
Overall change 5.37 kB 5.37 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 321 B 321 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 650 B 650 B
Rendered Page Sizes
vercel/next.js canary kevva/next.js config-var-before-export Change
index.html gzip 947 B 947 B
link.html gzip 955 B 955 B
withRouter.html gzip 942 B 942 B
Overall change 2.84 kB 2.84 kB

Serverless Mode
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 13.8s 13.5s -298ms
nodeModulesSize 57.3 MB 57.3 MB ⚠️ +919 B
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..c139.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
main-52b3964..e4b8.js gzip 6.74 kB 6.74 kB
webpack-ccf5..276a.js gzip 751 B 751 B
Overall change 56.9 kB 56.9 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.12 kB 6.12 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
main-af2596f..dule.js gzip 5.82 kB 5.82 kB
webpack-10c7..dule.js gzip 751 B 751 B
Overall change 51.8 kB 51.8 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-75..1629.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-874bd8a..0103.js gzip 1.28 kB 1.28 kB
_error-fa39c..ec40.js gzip 3.45 kB 3.45 kB
hooks-585f07..95a3.js gzip 887 B 887 B
index-c7b63f..fc02.js gzip 227 B 227 B
link-4c2bd9b..eadd.js gzip 1.29 kB 1.29 kB
routerDirect..ebc7.js gzip 284 B 284 B
withRouter-2..db68.js gzip 284 B 284 B
Overall change 7.71 kB 7.71 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-97e743e..dule.js gzip 626 B 626 B
_error-b4004..dule.js gzip 2.3 kB 2.3 kB
hooks-696209..dule.js gzip 387 B 387 B
index-a4dd74..dule.js gzip 226 B 226 B
link-236a801..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-1..dule.js gzip 282 B 282 B
Overall change 5.37 kB 5.37 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 321 B 321 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 650 B 650 B
Serverless bundles
vercel/next.js canary kevva/next.js config-var-before-export Change
_error.js 1.03 MB 1.03 MB
404.html 4.18 kB 4.18 kB
hooks.html 3.82 kB 3.82 kB
index.js 1.03 MB 1.03 MB
link.js 1.07 MB 1.07 MB
routerDirect.js 1.06 MB 1.06 MB
withRouter.js 1.06 MB 1.06 MB
Overall change 5.27 MB 5.27 MB
Commit: 48501a9

@ijjk
Copy link
Member

ijjk commented Aug 17, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 12.4s 11.8s -532ms
nodeModulesSize 57.6 MB 57.6 MB ⚠️ +3.05 kB
Page Load Tests Overall increase ✓
vercel/next.js canary kevva/next.js config-var-before-export Change
/ failed reqs 0 0
/ total time (seconds) 2.14 1.979 -0.16
/ avg req/sec 1168.13 1263.08 +94.95
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.176 1.061 -0.11
/error-in-render avg req/sec 2125.96 2357.03 +231.07
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..b4e6.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-8c9d3f7..4367.js gzip 6.72 kB 6.72 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 56.7 kB 56.7 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.08 kB 6.08 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-e89c24f..dule.js gzip 5.79 kB 5.79 kB
webpack-07c5..dule.js gzip 751 B 751 B
Overall change 51.6 kB 51.6 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-1464c..a26f.js gzip 3.44 kB 3.44 kB
hooks-89731c..c609.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-00b8972..6e4e.js gzip 1.3 kB 1.3 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 7.7 kB 7.7 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-e550f..dule.js gzip 2.29 kB 2.29 kB
hooks-cbf13f..dule.js gzip 387 B 387 B
index-b9a643..dule.js gzip 226 B 226 B
link-72c64d9..dule.js gzip 1.27 kB 1.27 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-f..dule.js gzip 282 B 282 B
Overall change 5.36 kB 5.36 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 330 B 330 B
Overall change 652 B 652 B
Rendered Page Sizes
vercel/next.js canary kevva/next.js config-var-before-export Change
index.html gzip 948 B 948 B
link.html gzip 953 B 953 B
withRouter.html gzip 941 B 941 B
Overall change 2.84 kB 2.84 kB

Serverless Mode
General Overall increase ⚠️
vercel/next.js canary kevva/next.js config-var-before-export Change
buildDuration 12.9s 12.7s -233ms
nodeModulesSize 57.6 MB 57.6 MB ⚠️ +3.05 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..b4e6.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-8c9d3f7..4367.js gzip 6.72 kB 6.72 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 56.7 kB 56.7 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
677f882d2ed8..dule.js gzip 6.08 kB 6.08 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-e89c24f..dule.js gzip 5.79 kB 5.79 kB
webpack-07c5..dule.js gzip 751 B 751 B
Overall change 51.6 kB 51.6 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary kevva/next.js config-var-before-export Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-1464c..a26f.js gzip 3.44 kB 3.44 kB
hooks-89731c..c609.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-00b8972..6e4e.js gzip 1.3 kB 1.3 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 7.7 kB 7.7 kB
Client Pages Modern
vercel/next.js canary kevva/next.js config-var-before-export Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-e550f..dule.js gzip 2.29 kB 2.29 kB
hooks-cbf13f..dule.js gzip 387 B 387 B
index-b9a643..dule.js gzip 226 B 226 B
link-72c64d9..dule.js gzip 1.27 kB 1.27 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-f..dule.js gzip 282 B 282 B
Overall change 5.36 kB 5.36 kB
Client Build Manifests
vercel/next.js canary kevva/next.js config-var-before-export Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 330 B 330 B
Overall change 652 B 652 B
Serverless bundles
vercel/next.js canary kevva/next.js config-var-before-export Change
_error.js 1.03 MB 1.03 MB
404.html 4.18 kB 4.18 kB
hooks.html 3.82 kB 3.82 kB
index.js 1.03 MB 1.03 MB
link.js 1.07 MB 1.07 MB
routerDirect.js 1.06 MB 1.06 MB
withRouter.js 1.06 MB 1.06 MB
Overall change 5.27 MB 5.27 MB
Commit: 58ce67b

Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

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

The changes and updated tests look good to me, thanks for the PR!

@kodiakhq kodiakhq bot merged commit aa4b87e into vercel:canary Aug 17, 2020
m-lautenbach pushed a commit to m-lautenbach/next.js that referenced this pull request Aug 20, 2020
@vercel vercel locked as resolved and limited conversation to collaborators Jan 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Links from non-AMP pages to AMP pages causes broken pages
2 participants