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

Ensure fallback rewrites dont match over pages with i18n #23674

Merged
merged 3 commits into from
Apr 6, 2021
Merged

Ensure fallback rewrites dont match over pages with i18n #23674

merged 3 commits into from
Apr 6, 2021

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Apr 4, 2021

This ensures we are checking the filesystem correctly when i18n is used to prevent fallback rewrites from being applied even when a page is matched. Additional tests have been added to ensure these cases are being handled.

Bug

  • Related issues linked using fixes #number
  • Integration tests added

Fixes: #23577

@ijjk ijjk added the type: next label Apr 4, 2021
@ijjk

This comment has been minimized.

Sign in to view
@ijjk

This comment has been minimized.

Sign in to view
@ijjk
Copy link
Member Author

ijjk commented Apr 4, 2021

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 13.1s 12.5s -615ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.304 2.288 -0.02
/ avg req/sec 1084.93 1092.81 +7.88
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.508 1.598 ⚠️ +0.09
/error-in-render avg req/sec 1658.11 1564.59 ⚠️ -93.52
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
677f882d2ed8..7edd.js gzip 13.4 kB 13.4 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-8fbabfc..6440.js gzip 1.28 kB 1.28 kB ✓
_error-af59f..582f.js gzip 3.46 kB 3.46 kB ✓
amp-9716187d..0aa8.js gzip 536 B 536 B ✓
hooks-107e90..74c7.js gzip 888 B 888 B ✓
index-ac435c..ecf2.js gzip 227 B 227 B ✓
link-c31053f..c329.js gzip 1.64 kB 1.64 kB ✓
routerDirect..dc9d.js gzip 303 B 303 B ✓
withRouter-6..0e02.js gzip 302 B 302 B ✓
Overall change 8.64 kB 8.64 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 370 B 370 B ✓
Overall change 370 B 370 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
index.html gzip 612 B 612 B ✓
link.html gzip 621 B 619 B -2 B
withRouter.html gzip 606 B 607 B ⚠️ +1 B
Overall change 1.84 kB 1.84 kB -1 B

Diffs

Diff for 677f882d2ed8..16c686519.js 
@@ -1280,6 +1280,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
       function delLocale(path, locale) {
         if (false) {
+          var pathname;
         }
 
         return path;
Diff for index.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Diff for link.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -66,7 +66,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Diff for withRouter.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 14.9s 15s ⚠️ +115ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
677f882d2ed8..7edd.js gzip 13.4 kB N/A N/A
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
677f882d2ed8..e6c6.js gzip N/A 13.4 kB N/A
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-8fbabfc..6440.js gzip 1.28 kB 1.28 kB ✓
_error-af59f..582f.js gzip 3.46 kB 3.46 kB ✓
amp-9716187d..0aa8.js gzip 536 B 536 B ✓
hooks-107e90..74c7.js gzip 888 B 888 B ✓
index-ac435c..ecf2.js gzip 227 B 227 B ✓
link-c31053f..c329.js gzip 1.64 kB 1.64 kB ✓
routerDirect..dc9d.js gzip 303 B 303 B ✓
withRouter-6..0e02.js gzip 302 B 302 B ✓
Overall change 8.64 kB 8.64 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 370 B 370 B ✓
Overall change 370 B 370 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_error.js 1.36 MB 1.36 MB ⚠️ +318 B
404.html 2.67 kB 2.67 kB ✓
500.html 2.65 kB 2.65 kB ✓
amp.amp.html 10.7 kB 10.7 kB ✓
amp.html 1.86 kB 1.86 kB ✓
hooks.html 1.92 kB 1.92 kB ✓
index.js 1.36 MB 1.36 MB ⚠️ +318 B
link.js 1.42 MB 1.42 MB ⚠️ +318 B
routerDirect.js 1.41 MB 1.41 MB ⚠️ +318 B
withRouter.js 1.41 MB 1.41 MB ⚠️ +318 B
Overall change 6.99 MB 6.99 MB ⚠️ +1.59 kB
Webpack 5 Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 15.3s 15.1s -167ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.277 2.322 ⚠️ +0.04
/ avg req/sec 1098.17 1076.7 ⚠️ -21.47
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.582 1.504 -0.08
/error-in-render avg req/sec 1580.08 1662.29 +82.21
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
597-e27c5352..db8c.js gzip 13.3 kB 13.3 kB ✓
778-53316af9..68b6.js gzip 7.04 kB 7.04 kB ✓
framework.HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-5cc66b2..6f03.js gzip 1.3 kB 1.3 kB ✓
_error-b58c1..9b8e.js gzip 3.4 kB 3.4 kB ✓
amp-89a5460c..567f.js gzip 558 B 558 B ✓
hooks-8c2e74..be37.js gzip 924 B 924 B ✓
index-fec729..83b2.js gzip 243 B 243 B ✓
link-dd34d9b..0ade.js gzip 1.66 kB 1.66 kB ✓
routerDirect..5759.js gzip 336 B 336 B ✓
withRouter-1..98bf.js gzip 334 B 334 B ✓
Overall change 8.76 kB 8.76 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
index.html gzip 610 B 612 B ⚠️ +2 B
link.html gzip 615 B 616 B ⚠️ +1 B
withRouter.html gzip 605 B 607 B ⚠️ +2 B
Overall change 1.83 kB 1.83 kB ⚠️ +5 B

Diffs

Diff for index.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/",
         "query": {},
-        "buildId": "lmoDo-IPkF4qJ16kzILHz",
+        "buildId": "gbvm9VYi3u7z3SpVQBatd",
         "isFallback": false,
         "gip": true
       }
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_buildManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_ssgManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for link.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -48,7 +48,7 @@
         "props": { "pageProps": {} },
         "page": "/link",
         "query": {},
-        "buildId": "lmoDo-IPkF4qJ16kzILHz",
+        "buildId": "gbvm9VYi3u7z3SpVQBatd",
         "isFallback": false,
         "gip": true
       }
@@ -66,7 +66,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -82,11 +82,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_buildManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_ssgManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for withRouter.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/withRouter",
         "query": {},
-        "buildId": "lmoDo-IPkF4qJ16kzILHz",
+        "buildId": "gbvm9VYi3u7z3SpVQBatd",
         "isFallback": false,
         "gip": true
       }
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_buildManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/lmoDo-IPkF4qJ16kzILHz/_ssgManifest.js"
+      src="/_next/static/gbvm9VYi3u7z3SpVQBatd/_ssgManifest.js"
       async=""
     ></script>
   </body>
Commit: 17c6b65

@ijjk ijjk marked this pull request as ready for review April 4, 2021 04:43
@ijjk
Copy link
Member Author

ijjk commented Apr 6, 2021

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 12.7s 12.5s -169ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.665 2.7 ⚠️ +0.04
/ avg req/sec 938.02 925.81 ⚠️ -12.21
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.556 1.522 -0.03
/error-in-render avg req/sec 1606.35 1642.65 +36.3
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
677f882d2ed8..7edd.js gzip 13.4 kB 13.4 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-8fbabfc..6440.js gzip 1.28 kB 1.28 kB ✓
_error-d07ca..ef4d.js gzip 3.71 kB 3.71 kB ✓
amp-9716187d..0aa8.js gzip 536 B 536 B ✓
hooks-107e90..74c7.js gzip 888 B 888 B ✓
index-ac435c..ecf2.js gzip 227 B 227 B ✓
link-c31053f..c329.js gzip 1.64 kB 1.64 kB ✓
routerDirect..dc9d.js gzip 303 B 303 B ✓
withRouter-6..0e02.js gzip 302 B 302 B ✓
Overall change 8.89 kB 8.89 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 371 B 371 B ✓
Overall change 371 B 371 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
index.html gzip 613 B 613 B ✓
link.html gzip 621 B 621 B ✓
withRouter.html gzip 608 B 607 B -1 B
Overall change 1.84 kB 1.84 kB -1 B

Diffs

Diff for 677f882d2ed8..16c686519.js 
@@ -1280,6 +1280,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
       function delLocale(path, locale) {
         if (false) {
+          var pathname;
         }
 
         return path;
Diff for index.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Diff for link.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -66,7 +66,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Diff for withRouter.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       as="script"
     />
     <link
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.d5b389c227c16c686519.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9435f13b64c68ee0afbc.js"
       async=""
     ></script>
     <script
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 14.6s 14.2s -451ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
677f882d2ed8..7edd.js gzip 13.4 kB N/A N/A
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
677f882d2ed8..e6c6.js gzip N/A 13.4 kB N/A
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-8fbabfc..6440.js gzip 1.28 kB 1.28 kB ✓
_error-d07ca..ef4d.js gzip 3.71 kB 3.71 kB ✓
amp-9716187d..0aa8.js gzip 536 B 536 B ✓
hooks-107e90..74c7.js gzip 888 B 888 B ✓
index-ac435c..ecf2.js gzip 227 B 227 B ✓
link-c31053f..c329.js gzip 1.64 kB 1.64 kB ✓
routerDirect..dc9d.js gzip 303 B 303 B ✓
withRouter-6..0e02.js gzip 302 B 302 B ✓
Overall change 8.89 kB 8.89 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 371 B 371 B ✓
Overall change 371 B 371 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_error.js 1.37 MB 1.37 MB ⚠️ +318 B
404.html 2.67 kB 2.67 kB ✓
500.html 2.65 kB 2.65 kB ✓
amp.amp.html 10.7 kB 10.7 kB ✓
amp.html 1.86 kB 1.86 kB ✓
hooks.html 1.92 kB 1.92 kB ✓
index.js 1.37 MB 1.37 MB ⚠️ +318 B
link.js 1.42 MB 1.42 MB ⚠️ +318 B
routerDirect.js 1.42 MB 1.42 MB ⚠️ +318 B
withRouter.js 1.42 MB 1.42 MB ⚠️ +318 B
Overall change 7 MB 7.01 MB ⚠️ +1.59 kB
Webpack 5 Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
buildDuration 14.8s 14.8s -82ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +1.82 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.756 2.693 -0.06
/ avg req/sec 907.25 928.26 +21.01
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.493 1.535 ⚠️ +0.04
/error-in-render avg req/sec 1674.22 1628.34 ⚠️ -45.88
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
597-e27c5352..db8c.js gzip 13.3 kB 13.3 kB ✓
778-2fdd7b63..cd87.js gzip 7.05 kB 7.05 kB ✓
framework.HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_app-5cc66b2..6f03.js gzip 1.3 kB 1.3 kB ✓
_error-55112..054d.js gzip 3.68 kB 3.68 kB ✓
amp-89a5460c..567f.js gzip 558 B 558 B ✓
hooks-8c2e74..be37.js gzip 924 B 924 B ✓
index-fec729..83b2.js gzip 243 B 243 B ✓
link-dd34d9b..0ade.js gzip 1.66 kB 1.66 kB ✓
routerDirect..5759.js gzip 336 B 336 B ✓
withRouter-1..98bf.js gzip 334 B 334 B ✓
Overall change 9.03 kB 9.03 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/i18n-fallback-rewrite Change
index.html gzip 609 B 612 B ⚠️ +3 B
link.html gzip 614 B 617 B ⚠️ +3 B
withRouter.html gzip 604 B 605 B ⚠️ +1 B
Overall change 1.83 kB 1.83 kB ⚠️ +7 B

Diffs

Diff for index.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/",
         "query": {},
-        "buildId": "yCKqzZ1q9d-6LvnGz4iKA",
+        "buildId": "N8TtFxwXutVZoTZ3NiquL",
         "isFallback": false,
         "gip": true
       }
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_buildManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_ssgManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for link.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -48,7 +48,7 @@
         "props": { "pageProps": {} },
         "page": "/link",
         "query": {},
-        "buildId": "yCKqzZ1q9d-6LvnGz4iKA",
+        "buildId": "N8TtFxwXutVZoTZ3NiquL",
         "isFallback": false,
         "gip": true
       }
@@ -66,7 +66,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -82,11 +82,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_buildManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_ssgManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for withRouter.html 
@@ -17,7 +17,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       as="script"
     />
     <link
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/withRouter",
         "query": {},
-        "buildId": "yCKqzZ1q9d-6LvnGz4iKA",
+        "buildId": "N8TtFxwXutVZoTZ3NiquL",
         "isFallback": false,
         "gip": true
       }
@@ -61,7 +61,7 @@
       async=""
     ></script>
     <script
-      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.b916e3dd36c533eb7edd.js"
+      src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c7d6c13de152520de6c6.js"
       async=""
     ></script>
     <script
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_buildManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/yCKqzZ1q9d-6LvnGz4iKA/_ssgManifest.js"
+      src="/_next/static/N8TtFxwXutVZoTZ3NiquL/_ssgManifest.js"
       async=""
     ></script>
   </body>
Commit: 40bd9c7

@kodiakhq kodiakhq bot merged commit 45b8c88 into vercel:canary Apr 6, 2021
@ijjk ijjk deleted the fix/i18n-fallback-rewrite branch April 6, 2021 15:04
divmain added a commit to divmain/next.js that referenced this pull request Apr 7, 2021
@divmain
Merge remote-tracking branch 'origin/canary' into babel-turbo-mode
7471fb9 
* origin/canary: (36 commits)
  Fixed issue accessing index page of "with-reason-relay" example (vercel#23780)
  upgrade to webpack 5.31.0 (vercel#23776)
  Add note about prefetching (vercel#23732)
  v10.1.4-canary.2
  Ensure no-op export returns without error (vercel#23752)
  Update to with-supertokens example (vercel#23728)
  Ensure fallback rewrites dont match over pages with i18n (vercel#23674)
  Ensure basePath is not applied for external GSSP redirect (vercel#23673)
  Fix webpack5 cache distDir (vercel#23718)
  v10.1.4-canary.1
  Stop mutating `resolvedAsPath` (vercel#23705)
  Font optimization (vercel#21676)
  v10.1.4-canary.0
  Ensure default fallback values are correct with i18n (vercel#23675)
  Fix: Codeblock Syntax Highlighting (vercel#23545)
  fix with-mqtt-js example. (vercel#23636)
  fix with-styled-jsx-plugins example. (vercel#23635)
  fix with-web-worker example. (vercel#23634)
  fixes a part of vercel#23607 remove with-glamor example (vercel#23639)
  v10.1.3
  ...

# Conflicts:
#	packages/next/package.json
#	yarn.lock
SokratisVidros pushed a commit to SokratisVidros/next.js that referenced this pull request Apr 20, 2021
@ijjk @SokratisVidros
Ensure fallback rewrites dont match over pages with i18n (vercel#23674)
2f53bb5 
This ensures we are checking the filesystem correctly when i18n is used to prevent fallback rewrites from being applied even when a page is matched. Additional tests have been added to ensure these cases are being handled. 

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added

Fixes: vercel#23577
@sync-by-unito sync-by-unito bot mentioned this pull request May 18, 2021
Closed
@vercel vercel locked as resolved and limited conversation to collaborators Jan 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@timneutkens timneutkens timneutkens approved these changes

@divmain divmain Awaiting requested review from divmain

@lfades lfades Awaiting requested review from lfades

@shuding shuding Awaiting requested review from shuding

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rewrites matching i18n route in front when they should not.
2 participants
@ijjk @timneutkens