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

Add experimental config for basePath testing #36843

Merged
merged 4 commits into from May 12, 2022
Merged

Add experimental config for basePath testing #36843

merged 4 commits into from May 12, 2022

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented May 11, 2022 •
edited

This adds an experimental config for testing basePath handling on the client.

x-ref: slack thread

Bug

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

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels May 11, 2022
@ijjk
Copy link
Member Author

ijjk commented May 11, 2022 •
edited

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
buildDuration 15.9s 16s ⚠️ +98ms
buildDurationCached 6.1s 6.2s ⚠️ +85ms
nodeModulesSize 475 MB 475 MB ⚠️ +913 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.982 3.977 -0.01
/ avg req/sec 627.82 628.66 +0.84
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.374 1.377 0
/error-in-render avg req/sec 1819.42 1815.94 ⚠️ -3.48
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
925.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42 kB 42 kB ✓
main-HASH.js gzip 28.8 kB 28.8 kB ⚠️ +2 B
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 72.5 kB 72.5 kB ⚠️ +2 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
_app-HASH.js gzip 1.36 kB 1.36 kB ✓
_error-HASH.js gzip 193 B 193 B ✓
amp-HASH.js gzip 308 B 308 B ✓
css-HASH.js gzip 327 B 327 B ✓
dynamic-HASH.js gzip 2.69 kB 2.69 kB ✓
head-HASH.js gzip 359 B 359 B ✓
hooks-HASH.js gzip 920 B 920 B ✓
image-HASH.js gzip 5.7 kB 5.7 kB ✓
index-HASH.js gzip 263 B 263 B ✓
link-HASH.js gzip 2.64 kB 2.64 kB ✓
routerDirect..HASH.js gzip 320 B 320 B ✓
script-HASH.js gzip 391 B 391 B ✓
withRouter-HASH.js gzip 318 B 318 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 15.9 kB 15.9 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
index.html gzip 532 B 532 B ✓
link.html gzip 545 B 546 B ⚠️ +1 B
withRouter.html gzip 527 B 528 B ⚠️ +1 B
Overall change 1.6 kB 1.61 kB ⚠️ +2 B

Diffs

Diff for main-HASH.js 
@@ -1720,7 +1720,8 @@
                   "/_next/data/"
                     .concat(_this.buildId)
                     .concat(dataRoute)
-                    .concat(ssg ? "" : search)
+                    .concat(ssg ? "" : search),
+                  true
                 );
               };
               var isDynamic = (0, _isDynamic).isDynamicRoute(route);
@@ -4641,11 +4642,15 @@
       function hasBasePath(path) {
         return hasPathPrefix(path, basePath);
       }
-      function addBasePath(path) {
+      function addBasePath(path, required) {
+        if (false) {
+        }
         // we only add the basepath on relative urls
         return addPathPrefix(path, basePath);
       }
       function delBasePath(path) {
+        if (false) {
+        }
         path = path.slice(basePath.length);
         if (!path.startsWith("/")) path = "/".concat(path);
         return path;
@@ -5441,7 +5446,8 @@
                             }
                             rewritesResult = (0, _resolveRewrites).default(
                               addBasePath(
-                                addLocale(cleanedAs, nextState.locale)
+                                addLocale(cleanedAs, nextState.locale),
+                                true
                               ),
                               pages,
                               rewrites,
@@ -6401,7 +6407,7 @@
                           rewrites = ref.__rewrites;
                           ref;
                           rewritesResult = (0, _resolveRewrites).default(
-                            addBasePath(addLocale(asPath, _this.locale)),
+                            addBasePath(addLocale(asPath, _this.locale), true),
                             pages,
                             rewrites,
                             parsed.query,
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
buildDuration 17.8s 17.8s -38ms
buildDurationCached 6.3s 6.2s -75ms
nodeModulesSize 475 MB 475 MB ⚠️ +913 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.938 4.108 ⚠️ +0.17
/ avg req/sec 634.91 608.59 ⚠️ -26.32
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.374 1.369 -0.01
/error-in-render avg req/sec 1819.21 1825.84 +6.63
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
925.HASH.js gzip 178 B 178 B ✓
framework-HASH.js gzip 42.2 kB 42.2 kB ✓
main-HASH.js gzip 29.2 kB 29.2 kB ⚠️ +2 B
webpack-HASH.js gzip 1.45 kB 1.45 kB ✓
Overall change 73.1 kB 73.1 kB ⚠️ +2 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
_app-HASH.js gzip 1.35 kB 1.35 kB ✓
_error-HASH.js gzip 179 B 179 B ✓
amp-HASH.js gzip 312 B 312 B ✓
css-HASH.js gzip 324 B 324 B ✓
dynamic-HASH.js gzip 2.71 kB 2.71 kB ✓
head-HASH.js gzip 357 B 357 B ✓
hooks-HASH.js gzip 921 B 921 B ✓
image-HASH.js gzip 5.79 kB 5.79 kB ✓
index-HASH.js gzip 261 B 261 B ✓
link-HASH.js gzip 2.76 kB 2.76 kB ✓
routerDirect..HASH.js gzip 322 B 322 B ✓
script-HASH.js gzip 392 B 392 B ✓
withRouter-HASH.js gzip 317 B 317 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 16.1 kB 16.1 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
_buildManifest.js gzip 456 B 456 B ✓
Overall change 456 B 456 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary ijjk/next.js add/experimental-manual-base-path Change
index.html gzip 530 B 530 B ✓
link.html gzip 544 B 543 B -1 B
withRouter.html gzip 527 B 526 B -1 B
Overall change 1.6 kB 1.6 kB -2 B

Diffs

Diff for main-HASH.js 
@@ -1720,7 +1720,8 @@
                   "/_next/data/"
                     .concat(_this.buildId)
                     .concat(dataRoute)
-                    .concat(ssg ? "" : search)
+                    .concat(ssg ? "" : search),
+                  true
                 );
               };
               var isDynamic = (0, _isDynamic).isDynamicRoute(route);
@@ -4641,11 +4642,15 @@
       function hasBasePath(path) {
         return hasPathPrefix(path, basePath);
       }
-      function addBasePath(path) {
+      function addBasePath(path, required) {
+        if (false) {
+        }
         // we only add the basepath on relative urls
         return addPathPrefix(path, basePath);
       }
       function delBasePath(path) {
+        if (false) {
+        }
         path = path.slice(basePath.length);
         if (!path.startsWith("/")) path = "/".concat(path);
         return path;
@@ -5441,7 +5446,8 @@
                             }
                             rewritesResult = (0, _resolveRewrites).default(
                               addBasePath(
-                                addLocale(cleanedAs, nextState.locale)
+                                addLocale(cleanedAs, nextState.locale),
+                                true
                               ),
                               pages,
                               rewrites,
@@ -6401,7 +6407,7 @@
                           rewrites = ref.__rewrites;
                           ref;
                           rewritesResult = (0, _resolveRewrites).default(
-                            addBasePath(addLocale(asPath, _this.locale)),
+                            addBasePath(addLocale(asPath, _this.locale), true),
                             pages,
                             rewrites,
                             parsed.query,
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-e9e78adbed10804c.js"
+      src="/_next/static/chunks/main-456267f460d9f422.js"
       defer=""
     ></script>
     <script
Commit: c2f1a8d

@ijjk ijjk marked this pull request as ready for review May 11, 2022 23:30
@ijjk ijjk requested a review from styfle May 11, 2022 23:30
@kodiakhq kodiakhq bot merged commit 03d00e2 into vercel:canary May 12, 2022
@ijjk ijjk deleted the add/experimental-manual-base-path branch May 12, 2022 16:47
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 12, 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

@shuding shuding Awaiting requested review from shuding shuding is a code owner

@padmaia padmaia Awaiting requested review from padmaia

@huozhi huozhi Awaiting requested review from huozhi huozhi is a code owner

@styfle styfle Awaiting requested review from styfle

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ijjk @timneutkens