Fix NextJS app build issues

[Oksamies]

Current dependencies on/for this PR:

• master
  • PR #1023
  • PR #1024
    • PR #1029
    • PR #1030
      • PR #1031
      • PR #1032
        • PR #1033
        • PR #1034
          • PR #1035 👈

This stack of pull requests is managed by Graphite.

[Oksamies]

Merge activity

• Feb 8, 8:22 AM EST: @Oksamies started a stack merge that includes this pull request via Graphite.
• Feb 8, 8:27 AM EST: Graphite failed to merge this pull request due to internal failures. Try your merge again, or report a bug if you see this consistently.