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

Do not add locale to link for api route and middleware preflight #35994

Merged

Conversation

nkzawa
Copy link
Contributor

@nkzawa nkzawa commented Apr 8, 2022

Fixes #33578

This PR fixes Link component as well to not add locale for api routes since both preflight redirect and link should work the same.

Additionally, it fixes the webdriver method browser.waitForCondition() for playwright to not wrap with function string.

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see contributing.md

@ijjk

This comment has been minimized.

@nkzawa nkzawa requested a review from ijjk April 11, 2022 07:26
@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Apr 11, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
buildDuration 22.1s 22s -50ms
buildDurationCached 8.3s 8.4s ⚠️ +74ms
nodeModulesSize 484 MB 484 MB ⚠️ +279 B
Page Load Tests Overall increase ✓
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
/ failed reqs 0 0
/ total time (seconds) 4.652 4.723 ⚠️ +0.07
/ avg req/sec 537.38 529.35 ⚠️ -8.03
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.245 2.09 -0.16
/error-in-render avg req/sec 1113.41 1196.38 +82.97
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
925.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 28 kB 28 kB ⚠️ +4 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.7 kB 71.7 kB ⚠️ +4 B
Legacy Client Bundles (polyfills)
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
_app-HASH.js gzip 1.36 kB 1.36 kB
_error-HASH.js gzip 192 B 192 B
amp-HASH.js gzip 309 B 309 B
css-HASH.js gzip 327 B 327 B
dynamic-HASH.js gzip 3.05 kB 3.05 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 920 B 920 B
image-HASH.js gzip 5.68 kB 5.68 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.32 kB 2.32 kB
routerDirect..HASH.js gzip 320 B 320 B
script-HASH.js gzip 387 B 387 B
withRouter-HASH.js gzip 319 B 319 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.9 kB 15.9 kB
Client Build Manifests
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
index.html gzip 531 B 532 B ⚠️ +1 B
link.html gzip 544 B 545 B ⚠️ +1 B
withRouter.html gzip 524 B 526 B ⚠️ +2 B
Overall change 1.6 kB 1.6 kB ⚠️ +4 B

Diffs

Diff for main-HASH.js
@@ -4406,6 +4406,10 @@
           ) + path.slice(pathname.length)
         );
       }
+      function hasPathPrefix(path, prefix) {
+        path = pathNoQueryHash(path);
+        return path === prefix || path.startsWith(prefix + "/");
+      }
       function getDomainLocale(path, locale, locales, domainLocales) {
         if (false) {
           var detectedDomain;
@@ -4434,8 +4438,7 @@
         return path;
       }
       function hasBasePath(path) {
-        path = pathNoQueryHash(path);
-        return path === basePath || path.startsWith(basePath + "/");
+        return hasPathPrefix(path, basePath);
       }
       function addBasePath(path) {
         // we only add the basepath on relative urls
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
buildDuration 25.6s 25.4s -280ms
buildDurationCached 8.3s 8.4s ⚠️ +67ms
nodeModulesSize 484 MB 484 MB ⚠️ +279 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
/ failed reqs 0 0
/ total time (seconds) 4.669 4.698 ⚠️ +0.03
/ avg req/sec 535.43 532.12 ⚠️ -3.31
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.182 2.204 ⚠️ +0.02
/error-in-render avg req/sec 1145.55 1134.48 ⚠️ -11.07
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
925.HASH.js gzip 178 B 178 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 28.3 kB 28.3 kB ⚠️ +9 B
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.3 kB 72.3 kB ⚠️ +9 B
Legacy Client Bundles (polyfills)
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 179 B 179 B
amp-HASH.js gzip 313 B 313 B
css-HASH.js gzip 325 B 325 B
dynamic-HASH.js gzip 3.03 kB 3.03 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 921 B 921 B
image-HASH.js gzip 5.74 kB 5.74 kB
index-HASH.js gzip 261 B 261 B
link-HASH.js gzip 2.38 kB 2.38 kB
routerDirect..HASH.js gzip 322 B 322 B
script-HASH.js gzip 388 B 388 B
withRouter-HASH.js gzip 317 B 317 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 16 kB 16 kB
Client Build Manifests
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary nkzawa/next.js api-locale-link-and-middleware-preflight Change
index.html gzip 531 B 532 B ⚠️ +1 B
link.html gzip 544 B 545 B ⚠️ +1 B
withRouter.html gzip 526 B 527 B ⚠️ +1 B
Overall change 1.6 kB 1.6 kB ⚠️ +3 B

Diffs

Diff for main-HASH.js
@@ -4406,6 +4406,10 @@
           ) + path.slice(pathname.length)
         );
       }
+      function hasPathPrefix(path, prefix) {
+        path = pathNoQueryHash(path);
+        return path === prefix || path.startsWith(prefix + "/");
+      }
       function getDomainLocale(path, locale, locales, domainLocales) {
         if (false) {
           var detectedDomain;
@@ -4434,8 +4438,7 @@
         return path;
       }
       function hasBasePath(path) {
-        path = pathNoQueryHash(path);
-        return path === basePath || path.startsWith(basePath + "/");
+        return hasPathPrefix(path, basePath);
       }
       function addBasePath(path) {
         // we only add the basepath on relative urls
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-26c4d970f7a13427.js"
+      src="/_next/static/chunks/main-059fcab728ca5c27.js"
       defer=""
     ></script>
     <script
Commit: bce9342

@kodiakhq kodiakhq bot merged commit 93678b5 into vercel:canary Apr 11, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 12, 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.

Middleware doesn't redirect properly with i18n
2 participants