Skip to content

Fix bug in catch-all routes with SSG #10379

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
Merged
merged 3 commits into from
Feb 3, 2020
Merged

Fix bug in catch-all routes with SSG #10379

merged 3 commits into from
Feb 3, 2020
+5 −7

Conversation

TheDSCPL
Copy link
Contributor

@TheDSCPL TheDSCPL commented Feb 2, 2020

The catch-all routes in SSG wasn't working because it was escaping the '/' characters used to join the parameters instead of joining the parameters escaped individually.

@TheDSCPL
Fix bug in catch-all routes with SSG

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
188dcf3
@TheDSCPL
Copy link
Contributor Author

TheDSCPL commented Feb 2, 2020

Hey @Timer

From the [https://github.com/zeit/next.js/blame/db90ffe1ea7fe4c3dde86fce8e45470c803a7063/packages/next/build/utils.ts#L595](the git blame) I can see it was you who wrote this so you're probably more familiar with the code :)

@ijjk
Copy link
Member

ijjk commented Feb 2, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 13.6s 13.6s ⚠️ +4ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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.08 kB 3.08 kB ✓
Serverless Mode
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 14s 14.6s ⚠️ +650ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles
zeit/next.js canary TheDSCPL/next.js canary Change
_error.js gzip 46.7 kB 46.7 kB ✓
404.html gzip 1.43 kB 1.43 kB ✓
hooks.html gzip 1.07 kB 1.07 kB ✓
index.js gzip 46.8 kB 46.8 kB ✓
link.js gzip 72.3 kB 72.3 kB ✓
routerDirect.js gzip 70.6 kB 70.6 kB ✓
withRouter.js gzip 70.4 kB 70.4 kB ✓
Overall change 309 kB 309 kB ✓

Commit: 188dcf3

@TheDSCPL
Copy link
Contributor Author

TheDSCPL commented Feb 2, 2020 •
edited
Loading

Some tests are failing because expectedManifestRoutes is returning an incorrect result, I believe.

For example, the parameters ["foo","bar"] would be translating into the URL foo%2Fbar instead of the expected foo/bar.

These tests are supposed to fail because the routes manifest file of the snapshot used in the tests is wrong

ijjk
ijjk previously requested changes Feb 2, 2020
View reviewed changes
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.

Hi, this looks correct to me. Can we update the expectedManifestRoutes test to not have the encoded /

-   "/catchall/another%2Fvalue": Object {
-     "dataRoute": "/_next/data/D_tGOM2RU1gb-ZdBcwOUJ/catchall/another%2Fvalue.json",
+   "/catchall/another/value": Object {
+     "dataRoute": "/_next/data/D_tGOM2RU1gb-ZdBcwOUJ/catchall/another/value.json",

@TheDSCPL
Merge branch 'canary' into canary

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
c7dab83
@ijjk
Copy link
Member

ijjk commented Feb 2, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 12.1s 12.1s -18ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 12s 11.9s -148ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles
zeit/next.js canary TheDSCPL/next.js canary Change
_error.js gzip 46.7 kB 46.7 kB ✓
404.html gzip 1.43 kB 1.43 kB ✓
hooks.html gzip 1.06 kB 1.06 kB ✓
index.js gzip 46.8 kB 46.8 kB ✓
link.js gzip 72.3 kB 72.3 kB ✓
routerDirect.js gzip 70.6 kB 70.6 kB ✓
withRouter.js gzip 70.4 kB 70.4 kB ✓
Overall change 309 kB 309 kB ✓

Commit: c7dab83

@Timer
fix slash

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: C5B785A7D0DE1654
Learn about vigilant mode
50f30ef
@Timer Timer added this to the 9.2.2 milestone Feb 3, 2020
@ijjk
Copy link
Member

ijjk commented Feb 3, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 11.5s 11.9s ⚠️ +402ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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
General Overall increase ⚠️
zeit/next.js canary TheDSCPL/next.js canary Change
buildDuration 12.5s 12.1s -391ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +10 B
Client Bundles (main, webpack, commons)
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.js gzip 5.11 kB 5.11 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..d6ae.js gzip 16.2 kB 16.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.9 kB 69.9 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary TheDSCPL/next.js canary Change
main-HASH.module.js gzip 4.11 kB 4.11 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15.1 kB 15.1 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.6 kB 64.6 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary 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 TheDSCPL/next.js canary Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles
zeit/next.js canary TheDSCPL/next.js canary Change
_error.js gzip 46.7 kB 46.7 kB ✓
404.html gzip 1.43 kB 1.43 kB ✓
hooks.html gzip 1.06 kB 1.06 kB ✓
index.js gzip 46.8 kB 46.8 kB ✓
link.js gzip 72.3 kB 72.3 kB ✓
routerDirect.js gzip 70.6 kB 70.6 kB ✓
withRouter.js gzip 70.4 kB 70.4 kB ✓
Overall change 309 kB 309 kB ✓

Commit: 50f30ef

@Timer Timer merged commit a433b9b into vercel:canary Feb 3, 2020
@Timer Timer mentioned this pull request Feb 3, 2020
Closed
@jamespohalloran jamespohalloran mentioned this pull request Feb 3, 2020
Merged
chibicode pushed a commit to chibicode/next.js that referenced this pull request Feb 11, 2020
@TheDSCPL @Timer @chibicode
Fix bug in catch-all routes with SSG (vercel#10379)

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
3bda7b8 
* Fix bug in catch-all routes with SSG

* fix slash

Co-authored-by: Joe Haddad <timer150@gmail.com>
@ijjk ijjk mentioned this pull request Feb 25, 2020
Closed
This was referenced Mar 13, 2020
Closed
Open
This was referenced Mar 22, 2020
Merged
Merged
@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.
Reviewers

@Timer Timer

@ijjk ijjk

@lfades lfades

@timneutkens timneutkens

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@TheDSCPL @ijjk @Timer