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

Ensure i18n custom routes resolves correctly #19766

Merged
merged 6 commits into from
Dec 4, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Dec 3, 2020

This ensures i81n custom routes are resolving correctly, it also corrects redirects for default locales when locale: false is not used, and this also simplifies the resolving for custom routes with i18n in next-server adding types for the i18n config. This also adds additional tests to prevent regression and starts leveraging a shared NextConfig type to allow us to share types for config values.

Fixes: #19521
Fixes: #19403
Fixes: #19302
Fixes: #19227

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@vercel vercel bot temporarily deployed to Preview December 3, 2020 16:20 Inactive
@ijjk
Copy link
Member Author

ijjk commented Dec 3, 2020

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 10s 10.2s ⚠️ +242ms
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
/ failed reqs 0 0
/ total time (seconds) 2.014 2.005 -0.01
/ avg req/sec 1241.11 1247.16 +6.05
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.259 1.331 ⚠️ +0.07
/error-in-render avg req/sec 1985.26 1878.32 ⚠️ -106.94
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB 12.8 kB
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-fca3d..2eb1.js gzip 3.44 kB 3.44 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.01 kB 8.01 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 321 B 321 B
Overall change 321 B 321 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
index.html gzip 614 B 615 B ⚠️ +1 B
link.html gzip 620 B 621 B ⚠️ +1 B
withRouter.html gzip 608 B 608 B
Overall change 1.84 kB 1.84 kB ⚠️ +2 B

Diffs

Diff for index.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for link.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -70,7 +70,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for withRouter.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 12s 11.9s -93ms
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB N/A N/A
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
677f882d2ed8..34b9.js gzip N/A 12.8 kB N/A
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-fca3d..2eb1.js gzip 3.44 kB 3.44 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.01 kB 8.01 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 321 B 321 B
Overall change 321 B 321 B
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_error.js 997 kB 1000 kB ⚠️ +2.14 kB
404.html 2.67 kB 2.67 kB
hooks.html 1.92 kB 1.92 kB
index.js 998 kB 1000 kB ⚠️ +2.14 kB
link.js 1.05 MB 1.05 MB ⚠️ +2.14 kB
routerDirect.js 1.04 MB 1.05 MB ⚠️ +2.14 kB
withRouter.js 1.04 MB 1.05 MB ⚠️ +2.14 kB
Overall change 5.14 MB 5.15 MB ⚠️ +10.7 kB
Commit: 66f3a90

@vercel vercel bot temporarily deployed to Preview December 4, 2020 09:41 Inactive
@ijjk
Copy link
Member Author

ijjk commented Dec 4, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 8.5s 8.5s ⚠️ +39ms
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
/ failed reqs 0 0
/ total time (seconds) 1.717 1.743 ⚠️ +0.03
/ avg req/sec 1456.24 1433.98 ⚠️ -22.26
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.106 1.094 -0.01
/error-in-render avg req/sec 2261.06 2285.22 +24.16
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB 12.8 kB
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-fca3d..2eb1.js gzip 3.44 kB 3.44 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.01 kB 8.01 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 321 B 321 B
Overall change 321 B 321 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
index.html gzip 614 B 615 B ⚠️ +1 B
link.html gzip 620 B 621 B ⚠️ +1 B
withRouter.html gzip 608 B 608 B
Overall change 1.84 kB 1.84 kB ⚠️ +2 B

Diffs

Diff for index.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for link.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -70,7 +70,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for withRouter.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 10.1s 10.1s ⚠️ +3ms
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB N/A N/A
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
677f882d2ed8..34b9.js gzip N/A 12.8 kB N/A
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-fca3d..2eb1.js gzip 3.44 kB 3.44 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.01 kB 8.01 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 321 B 321 B
Overall change 321 B 321 B
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_error.js 997 kB 1000 kB ⚠️ +2.14 kB
404.html 2.67 kB 2.67 kB
hooks.html 1.92 kB 1.92 kB
index.js 998 kB 1000 kB ⚠️ +2.14 kB
link.js 1.05 MB 1.05 MB ⚠️ +2.14 kB
routerDirect.js 1.04 MB 1.05 MB ⚠️ +2.14 kB
withRouter.js 1.04 MB 1.05 MB ⚠️ +2.14 kB
Overall change 5.14 MB 5.15 MB ⚠️ +10.7 kB
Commit: 1a83829

@vercel vercel bot temporarily deployed to Preview December 4, 2020 09:53 Inactive
@ijjk
Copy link
Member Author

ijjk commented Dec 4, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 10.5s 9s -1.5s
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
/ failed reqs 0 0
/ total time (seconds) 2.379 2.268 -0.11
/ avg req/sec 1050.69 1102.37 +51.68
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.236 1.138 -0.1
/error-in-render avg req/sec 2022.82 2196.8 +173.98
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB 12.8 kB
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-01375..90b6.js gzip 3.69 kB 3.69 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.27 kB 8.27 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 322 B 322 B
Overall change 322 B 322 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
index.html gzip 614 B 615 B ⚠️ +1 B
link.html gzip 620 B 621 B ⚠️ +1 B
withRouter.html gzip 608 B 608 B
Overall change 1.84 kB 1.84 kB ⚠️ +2 B

Diffs

Diff for index.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for link.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -70,7 +70,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script
Diff for withRouter.html
@@ -22,7 +22,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       as="script"
     />
     <link
@@ -65,7 +65,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a8f91a45a8b4eae9202a.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.ef24a8546d94f72a9a2e.js"
       async=""
     ></script>
     <script

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
buildDuration 10.5s 10.4s -136ms
nodeModulesSize 82.4 MB 82.4 MB ⚠️ +4.38 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
677f882d2ed8..8b6e.js gzip 12.8 kB N/A N/A
framework.HASH.js gzip 39 kB 39 kB
main-3c9ff84..1d7c.js gzip 6.56 kB 6.56 kB
webpack-e067..f178.js gzip 751 B 751 B
677f882d2ed8..34b9.js gzip N/A 12.8 kB N/A
Overall change 59 kB 59 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_app-7231d4b..5856.js gzip 1.28 kB 1.28 kB
_error-01375..90b6.js gzip 3.69 kB 3.69 kB
hooks-d4591d..e7c2.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-db223d9..dbd7.js gzip 1.61 kB 1.61 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 8.27 kB 8.27 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_buildManifest.js gzip 322 B 322 B
Overall change 322 B 322 B
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/custom-routes-simplify Change
_error.js 999 kB 1 MB ⚠️ +2.14 kB
404.html 2.67 kB 2.67 kB
hooks.html 1.92 kB 1.92 kB
index.js 999 kB 1 MB ⚠️ +2.14 kB
link.js 1.05 MB 1.06 MB ⚠️ +2.14 kB
routerDirect.js 1.05 MB 1.05 MB ⚠️ +2.14 kB
withRouter.js 1.05 MB 1.05 MB ⚠️ +2.14 kB
Overall change 5.15 MB 5.16 MB ⚠️ +10.7 kB
Commit: 7817e63

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
2 participants