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

Update to use existing util to de-dupe path check #10431

Merged
merged 5 commits into from
Feb 5, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Feb 5, 2020

While working on #10424 noticed we duplicate the page === '/' ? '/index' : page check in a lot of places even though we have a util for it. This updates to re-use the existing util which also caught an error in on-demand-entry-handler prefixing the pageUrl with double-slashes on windows and also updates the error message in the util to show the mismatch

@ijjk ijjk added this to the 9.2.2 milestone Feb 5, 2020
@ijjk
Copy link
Member Author

ijjk commented Feb 5, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
buildDuration 12.1s 12.1s ⚠️ +1ms
nodeModulesSize 52.6 MB 52.6 MB ⚠️ +793 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
main-HASH.js gzip 5.12 kB 5.12 kB
webpack-HASH.js gzip 746 B 746 B
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB
commons.HASH.js gzip 4.06 kB 4.06 kB
de003c3a9d30..b50f.js gzip 13.6 kB 13.6 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
Overall change 67.3 kB 67.3 kB
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
main-HASH.module.js gzip 4.12 kB 4.12 kB
webpack-HASH..dule.js gzip 746 B 746 B
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB
de003c3a9d30..dule.js gzip 12.4 kB 12.4 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
Overall change 61.9 kB 61.9 kB
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB
Overall change 4.76 kB 4.76 kB
Client Pages
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_app.js gzip 1.15 kB 1.15 kB
_error.js gzip 4.07 kB 4.07 kB
hooks.js gzip 779 B 779 B
index.js gzip 222 B 222 B
link.js gzip 2.89 kB 2.89 kB
routerDirect.js gzip 283 B 283 B
withRouter.js gzip 282 B 282 B
Overall change 9.68 kB 9.68 kB
Client Pages Modern
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_app.module.js gzip 576 B 576 B
_error.module.js gzip 3.06 kB 3.06 kB
hooks.module.js gzip 371 B 371 B
index.module.js gzip 212 B 212 B
link.module.js gzip 2.46 kB 2.46 kB
routerDirect..dule.js gzip 273 B 273 B
withRouter.m..dule.js gzip 272 B 272 B
Overall change 7.22 kB 7.22 kB
Client Build Manifests
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_buildManifest.js gzip 61 B 61 B
_buildManife..dule.js gzip 61 B 61 B
Overall change 122 B 122 B
Rendered Page Sizes
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
index.html gzip 1.02 kB 1.02 kB
link.html gzip 1.03 kB 1.03 kB
withRouter.html gzip 1.02 kB 1.02 kB
Overall change 3.07 kB 3.07 kB

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
buildDuration 13s 12.4s -609ms
nodeModulesSize 52.6 MB 52.6 MB ⚠️ +793 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
main-HASH.js gzip 5.12 kB 5.12 kB
webpack-HASH.js gzip 746 B 746 B
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB
commons.HASH.js gzip 4.06 kB 4.06 kB
de003c3a9d30..b50f.js gzip 13.6 kB 13.6 kB
framework.HASH.js gzip 39.1 kB 39.1 kB
Overall change 67.3 kB 67.3 kB
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
main-HASH.module.js gzip 4.12 kB 4.12 kB
webpack-HASH..dule.js gzip 746 B 746 B
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB
de003c3a9d30..dule.js gzip 12.4 kB 12.4 kB
framework.HA..dule.js gzip 39.1 kB 39.1 kB
Overall change 61.9 kB 61.9 kB
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB
Overall change 4.76 kB 4.76 kB
Client Pages
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_app.js gzip 1.15 kB 1.15 kB
_error.js gzip 4.07 kB 4.07 kB
hooks.js gzip 779 B 779 B
index.js gzip 222 B 222 B
link.js gzip 2.89 kB 2.89 kB
routerDirect.js gzip 283 B 283 B
withRouter.js gzip 282 B 282 B
Overall change 9.68 kB 9.68 kB
Client Pages Modern
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_app.module.js gzip 576 B 576 B
_error.module.js gzip 3.06 kB 3.06 kB
hooks.module.js gzip 371 B 371 B
index.module.js gzip 212 B 212 B
link.module.js gzip 2.46 kB 2.46 kB
routerDirect..dule.js gzip 273 B 273 B
withRouter.m..dule.js gzip 272 B 272 B
Overall change 7.22 kB 7.22 kB
Client Build Manifests
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_buildManifest.js gzip 61 B 61 B
_buildManife..dule.js gzip 61 B 61 B
Overall change 122 B 122 B
Serverless bundles Overall increase ⚠️
zeit/next.js canary ijjk/next.js cleanup/path-normalize Change
_error.js gzip 46.5 kB 46.5 kB ⚠️ +10 B
404.html gzip 1.43 kB 1.43 kB
hooks.html gzip 1.07 kB 1.07 kB
index.js gzip 46.5 kB 46.5 kB ⚠️ +8 B
link.js gzip 72 kB 72 kB ⚠️ +9 B
routerDirect.js gzip 70.2 kB 70.2 kB ⚠️ +8 B
withRouter.js gzip 70 kB 70 kB ⚠️ +8 B
Overall change 308 kB 308 kB ⚠️ +43 B

Commit: a7a6787

@timneutkens timneutkens merged commit a4c507d into vercel:canary Feb 5, 2020
@timneutkens timneutkens deleted the cleanup/path-normalize branch February 5, 2020 21:10
chibicode pushed a commit to chibicode/next.js that referenced this pull request Feb 11, 2020
* Update to use existing util to de-dupe path check

* Update error message for requested/resolved mismatch

* Use correct dataRoute value for prerender manifest

* Fix pageUrl having double slash on Windows
@vercel vercel locked as resolved and limited conversation to collaborators Jan 31, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants