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

Custom app for switchable runtime #35666

Merged
merged 17 commits into from
Apr 5, 2022
Merged

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Mar 28, 2022

x-ref: #33149
RFCs:

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

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Mar 28, 2022
@huozhi huozhi changed the title Switchable app Custom app for switchable runtime Mar 28, 2022
@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@huozhi huozhi marked this pull request as ready for review April 4, 2022 12:59
@huozhi huozhi requested a review from timneutkens as a code owner April 4, 2022 12:59
@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

Comment on lines +161 to +162
┌ /_app
├ /_app.server
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should output _app and _app.server since they're not pages.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The /_app was always exported if there's custom app there, but we don't give them prefix. So I made _app.server followed it

@huozhi huozhi requested a review from shuding April 5, 2022 15:09
@ijjk
Copy link
Member

ijjk commented Apr 5, 2022

Failing test suites

Commit: a972952

yarn testheadless test/integration/amphtml/test/index.test.js

  • AMP Usage > AMP dev mode > should detect the changes and display it
  • AMP Usage > AMP dev mode > should not reload unless the page is edited for an AMP page
Expand output

● AMP Usage › AMP dev mode › should detect the changes and display it

TIMED OUT: /This is the hot AMP page/

This is a cold AMP page.

no AMP for you...

  474 |
  475 |   if (hardError) {
> 476 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content)
      |           ^
  477 |   }
  478 |   return false
  479 | }

  at Object.check (lib/next-test-utils.js:476:11)
  at Object.<anonymous> (integration/amphtml/test/index.test.js:372:9)

● AMP Usage › AMP dev mode › should not reload unless the page is edited for an AMP page

TIMED OUT: /I'm an AMP page!/

undefined

  474 |
  475 |   if (hardError) {
> 476 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content)
      |           ^
  477 |   }
  478 |   return false
  479 | }

  at Object.check (lib/next-test-utils.js:476:11)
  at Object.<anonymous> (integration/amphtml/test/index.test.js:434:9)

Read more about building and testing Next.js in contributing.md.

@ijjk

This comment has been minimized.

@kodiakhq kodiakhq bot merged commit 67d25a5 into vercel:canary Apr 5, 2022
@ijjk
Copy link
Member

ijjk commented Apr 5, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
buildDuration 18.9s 18.6s -283ms
buildDurationCached 7.3s 7.1s -208ms
nodeModulesSize 477 MB 477 MB ⚠️ +4.52 kB
Page Load Tests Overall increase ✓
vercel/next.js canary huozhi/next.js switchable-app Change
/ failed reqs 0 0
/ total time (seconds) 3.761 3.715 -0.05
/ avg req/sec 664.78 672.92 +8.14
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.702 1.7 0
/error-in-render avg req/sec 1468.86 1470.37 +1.51
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
925.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 28.4 kB 28.5 kB ⚠️ +44 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 72.1 kB 72.1 kB ⚠️ +44 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js switchable-app Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js switchable-app 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.52 kB 5.52 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.7 kB 15.7 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js switchable-app Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
index.html gzip 532 B 532 B
link.html gzip 545 B 545 B
withRouter.html gzip 525 B 526 B ⚠️ +1 B
Overall change 1.6 kB 1.6 kB ⚠️ +1 B

Diffs

Diff for main-HASH.js
@@ -643,7 +643,7 @@
       var webpackHMR;
       var CachedApp, onPerfEntry;
       var CachedComponent;
-      var isAppRSC;
+      var isRSCPage;
       var Container = /*#__PURE__*/ (function(_Component) {
         _inherits(Container, _Component);
         var _super = _createSuper(Container);
@@ -868,7 +868,6 @@
                       (app = appEntrypoint.component),
                         (mod = appEntrypoint.exports);
                       CachedApp = app;
-                      isAppRSC = !!mod.__next_rsc__;
                       exportedReportWebVitals = mod && mod.reportWebVitals;
                       onPerfEntry = function(param) {
                         var id = param.id,
@@ -909,30 +908,31 @@
                         // error, so we need to skip waiting for the entrypoint.
                         true
                       ) {
-                        _ctx.next = 16;
+                        _ctx.next = 15;
                         break;
                       }
                       _ctx.t0 = {
                         error: initialData.err
                       };
-                      _ctx.next = 19;
-                      break;
-                    case 16:
                       _ctx.next = 18;
+                      break;
+                    case 15:
+                      _ctx.next = 17;
                       return pageLoader.routeLoader.whenEntrypoint(
                         initialData.page
                       );
-                    case 18:
+                    case 17:
                       _ctx.t0 = _ctx.sent;
-                    case 19:
+                    case 18:
                       pageEntrypoint = _ctx.t0;
                       if (!("error" in pageEntrypoint)) {
-                        _ctx.next = 22;
+                        _ctx.next = 21;
                         break;
                       }
                       throw pageEntrypoint.error;
-                    case 22:
+                    case 21:
                       CachedComponent = pageEntrypoint.component;
+                      isRSCPage = !!pageEntrypoint.exports.__next_rsc__;
                       if (true) {
                         _ctx.next = 27;
                         break;
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
buildDuration 21.7s 21.4s -284ms
buildDurationCached 7.5s 6.9s -507ms
nodeModulesSize 477 MB 477 MB ⚠️ +4.52 kB
Page Load Tests Overall increase ✓
vercel/next.js canary huozhi/next.js switchable-app Change
/ failed reqs 0 0
/ total time (seconds) 3.767 3.784 ⚠️ +0.02
/ avg req/sec 663.64 660.62 ⚠️ -3.02
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.707 1.693 -0.01
/error-in-render avg req/sec 1464.24 1477.05 +12.81
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
925.HASH.js gzip 178 B 178 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 28.8 kB 28.8 kB ⚠️ +3 B
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.7 kB 72.7 kB ⚠️ +3 B
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js switchable-app Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js switchable-app 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.63 kB 5.63 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 15.9 kB 15.9 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js switchable-app Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary huozhi/next.js switchable-app Change
index.html gzip 531 B 531 B
link.html gzip 544 B 544 B
withRouter.html gzip 526 B 527 B ⚠️ +1 B
Overall change 1.6 kB 1.6 kB ⚠️ +1 B

Diffs

Diff for main-HASH.js
@@ -643,7 +643,7 @@
       var webpackHMR;
       var CachedApp, onPerfEntry;
       var CachedComponent;
-      var isAppRSC;
+      var isRSCPage;
       var Container = /*#__PURE__*/ (function(_Component) {
         _inherits(Container, _Component);
         var _super = _createSuper(Container);
@@ -868,7 +868,6 @@
                       (app = appEntrypoint.component),
                         (mod = appEntrypoint.exports);
                       CachedApp = app;
-                      isAppRSC = !!mod.__next_rsc__;
                       exportedReportWebVitals = mod && mod.reportWebVitals;
                       onPerfEntry = function(param) {
                         var id = param.id,
@@ -909,30 +908,31 @@
                         // error, so we need to skip waiting for the entrypoint.
                         true
                       ) {
-                        _ctx.next = 16;
+                        _ctx.next = 15;
                         break;
                       }
                       _ctx.t0 = {
                         error: initialData.err
                       };
-                      _ctx.next = 19;
-                      break;
-                    case 16:
                       _ctx.next = 18;
+                      break;
+                    case 15:
+                      _ctx.next = 17;
                       return pageLoader.routeLoader.whenEntrypoint(
                         initialData.page
                       );
-                    case 18:
+                    case 17:
                       _ctx.t0 = _ctx.sent;
-                    case 19:
+                    case 18:
                       pageEntrypoint = _ctx.t0;
                       if (!("error" in pageEntrypoint)) {
-                        _ctx.next = 22;
+                        _ctx.next = 21;
                         break;
                       }
                       throw pageEntrypoint.error;
-                    case 22:
+                    case 21:
                       CachedComponent = pageEntrypoint.component;
+                      isRSCPage = !!pageEntrypoint.exports.__next_rsc__;
                       if (true) {
                         _ctx.next = 27;
                         break;
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-29d269f0411823e2.js"
+      src="/_next/static/chunks/main-b9430164b0f7c068.js"
       defer=""
     ></script>
     <script
Commit: c47991e

@huozhi huozhi deleted the switchable-app branch April 5, 2022 22:14
kodiakhq bot pushed a commit that referenced this pull request Apr 16, 2022
## Bug

The custom app is missing in the `ctx.AppTree` that causing the issue, it was accidently missed in custom _app.server pr #35666

Fixes #36198

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [x] Errors have helpful link attached, see `contributing.md`
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants