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 basePath is not applied for external GSSP redirect #23673

Merged
merged 3 commits into from
Apr 6, 2021

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Apr 4, 2021

This ensures we don't attempt prepending the basePath for external (http://) getStaticProps/getServerSideProps redirects. Additional tests to cover this case have been added in the gssp-redirect test suites to prevent regression.

Bug

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

Fixes: #23623

@ijjk ijjk added the type: next label Apr 4, 2021
@ijjk
Copy link
Member Author

ijjk commented Apr 4, 2021

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 14.1s 13.8s -251ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
/ failed reqs 0 0
/ total time (seconds) 2.477 2.471 -0.01
/ avg req/sec 1009.33 1011.79 +2.46
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.67 1.65 -0.02
/error-in-render avg req/sec 1496.66 1515.57 +18.91
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_buildManifest.js gzip 370 B 370 B
Overall change 370 B 370 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
index.html gzip 612 B 612 B
link.html gzip 621 B 621 B
withRouter.html gzip 606 B 606 B
Overall change 1.84 kB 1.84 kB

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 16.4s 15.9s -480ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_error.js 1.36 MB 1.36 MB ⚠️ +38 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 ⚠️ +38 B
link.js 1.42 MB 1.42 MB ⚠️ +38 B
routerDirect.js 1.41 MB 1.41 MB ⚠️ +38 B
withRouter.js 1.41 MB 1.41 MB ⚠️ +38 B
Overall change 6.99 MB 6.99 MB ⚠️ +190 B

Webpack 5 Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 16.3s 16.3s ⚠️ +55ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
/ failed reqs 0 0
/ total time (seconds) 2.423 2.51 ⚠️ +0.09
/ avg req/sec 1031.61 996.18 ⚠️ -35.43
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.707 1.713 ⚠️ +0.01
/error-in-render avg req/sec 1464.17 1459.58 ⚠️ -4.59
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_buildManifest.js gzip 349 B 349 B
Overall change 349 B 349 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
index.html gzip 610 B 610 B
link.html gzip 615 B 615 B
withRouter.html gzip 605 B 605 B
Overall change 1.83 kB 1.83 kB

Diffs

Diff for index.html
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/",
         "query": {},
-        "buildId": "tdzzma-VHG18R3LIHXbm8",
+        "buildId": "YhXOnLWym8dj9aecdQmmU",
         "isFallback": false,
         "gip": true
       }
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_buildManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_ssgManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for link.html
@@ -48,7 +48,7 @@
         "props": { "pageProps": {} },
         "page": "/link",
         "query": {},
-        "buildId": "tdzzma-VHG18R3LIHXbm8",
+        "buildId": "YhXOnLWym8dj9aecdQmmU",
         "isFallback": false,
         "gip": true
       }
@@ -82,11 +82,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_buildManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_ssgManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for withRouter.html
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/withRouter",
         "query": {},
-        "buildId": "tdzzma-VHG18R3LIHXbm8",
+        "buildId": "YhXOnLWym8dj9aecdQmmU",
         "isFallback": false,
         "gip": true
       }
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_buildManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/tdzzma-VHG18R3LIHXbm8/_ssgManifest.js"
+      src="/_next/static/YhXOnLWym8dj9aecdQmmU/_ssgManifest.js"
       async=""
     ></script>
   </body>
Commit: 3c02253

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

ijjk commented Apr 6, 2021

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 13s 13s -2ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
/ failed reqs 0 0
/ total time (seconds) 2.561 2.64 ⚠️ +0.08
/ avg req/sec 976.03 946.9 ⚠️ -29.13
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.41 1.508 ⚠️ +0.1
/error-in-render avg req/sec 1772.84 1657.58 ⚠️ -115.26
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_buildManifest.js gzip 371 B 371 B
Overall change 371 B 371 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
index.html gzip 613 B 613 B
link.html gzip 621 B 621 B
withRouter.html gzip 608 B 608 B
Overall change 1.84 kB 1.84 kB

Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 15.4s 14.6s -865ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_error.js 1.37 MB 1.37 MB ⚠️ +38 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 ⚠️ +38 B
link.js 1.42 MB 1.42 MB ⚠️ +38 B
routerDirect.js 1.42 MB 1.42 MB ⚠️ +38 B
withRouter.js 1.42 MB 1.42 MB ⚠️ +38 B
Overall change 7 MB 7 MB ⚠️ +190 B

Webpack 5 Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
buildDuration 14.9s 14.4s -465ms
nodeModulesSize 45.9 MB 45.9 MB ⚠️ +367 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
/ failed reqs 0 0
/ total time (seconds) 2.74 2.604 -0.14
/ avg req/sec 912.47 960.05 +47.58
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.27 1.31 ⚠️ +0.04
/error-in-render avg req/sec 1968.74 1908.49 ⚠️ -60.25
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect 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/external-gssp-redirect Change
_buildManifest.js gzip 349 B 349 B
Overall change 349 B 349 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/external-gssp-redirect Change
index.html gzip 609 B 609 B
link.html gzip 614 B 614 B
withRouter.html gzip 604 B 604 B
Overall change 1.83 kB 1.83 kB

Diffs

Diff for index.html
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/",
         "query": {},
-        "buildId": "fzklE8d6i1XoMiEQMQLjs",
+        "buildId": "-MlIvd0LABGeMxbIFmKTI",
         "isFallback": false,
         "gip": true
       }
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_buildManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_ssgManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for link.html
@@ -48,7 +48,7 @@
         "props": { "pageProps": {} },
         "page": "/link",
         "query": {},
-        "buildId": "fzklE8d6i1XoMiEQMQLjs",
+        "buildId": "-MlIvd0LABGeMxbIFmKTI",
         "isFallback": false,
         "gip": true
       }
@@ -82,11 +82,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_buildManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_ssgManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_ssgManifest.js"
       async=""
     ></script>
   </body>
Diff for withRouter.html
@@ -43,7 +43,7 @@
         "props": { "pageProps": {} },
         "page": "/withRouter",
         "query": {},
-        "buildId": "fzklE8d6i1XoMiEQMQLjs",
+        "buildId": "-MlIvd0LABGeMxbIFmKTI",
         "isFallback": false,
         "gip": true
       }
@@ -77,11 +77,11 @@
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_buildManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_buildManifest.js"
       async=""
     ></script>
     <script
-      src="/_next/static/fzklE8d6i1XoMiEQMQLjs/_ssgManifest.js"
+      src="/_next/static/-MlIvd0LABGeMxbIFmKTI/_ssgManifest.js"
       async=""
     ></script>
   </body>
Commit: 160a761

@kodiakhq kodiakhq bot merged commit 55c6b7a into vercel:canary Apr 6, 2021
@ijjk ijjk deleted the fix/external-gssp-redirect branch April 6, 2021 15:03
divmain added a commit to divmain/next.js that referenced this pull request Apr 7, 2021
* 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
This ensures we don't attempt prepending the `basePath` for external (http://) `getStaticProps`/`getServerSideProps` redirects. Additional tests to cover this case have been added in the `gssp-redirect` test suites to prevent regression.

## Bug

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

Fixes: vercel#23623
@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Redirecting externally in getServerSideProps with basePath
2 participants