From f8d239596019e3dcd12028b0880e484baf2fccb4 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Tue, 2 Aug 2022 17:06:54 -0700 Subject: [PATCH] Remove theme from HTML (#29560) * Remove theme from HTML * update for linting error * Fix for overriding default color modes Co-authored-by: Grace Park Co-authored-by: Grace Park --- components/lib/get-session.ts | 9 +++- middleware/cache-full-rendering.js | 30 -------------- pages/_app.tsx | 36 +++++++++------- pages/_document.tsx | 6 +-- tests/rendering/render-caching.js | 66 +++--------------------------- 5 files changed, 36 insertions(+), 111 deletions(-) diff --git a/components/lib/get-session.ts b/components/lib/get-session.ts index 536be5d412..11af586f10 100644 --- a/components/lib/get-session.ts +++ b/components/lib/get-session.ts @@ -1,5 +1,6 @@ import { useState, useEffect } from 'react' import { useRouter } from 'next/router' +import { ThemeProviderProps } from '@primer/react' const MAX_CACHE = 5000 // milliseconds const RETRY = 500 // milliseconds @@ -18,8 +19,12 @@ type Session = { csrfToken: string userLanguage: string // en, es, ja, cn languages: Record // en... name nativeName code hreflang redirectPatterns dir wip - theme: object // colorMode, nightTheme, dayTheme - themeCSS: object // colorMode, nightTheme, dayTheme + theme: { colorMode: Pick; nightTheme: string; dayTheme: string } + themeCss: { + colorMode: Pick + nightTheme: string + dayTheme: string + } } let sessionCache: Session | null diff --git a/middleware/cache-full-rendering.js b/middleware/cache-full-rendering.js index 76ac6cad6d..ab1af2cde6 100644 --- a/middleware/cache-full-rendering.js +++ b/middleware/cache-full-rendering.js @@ -3,11 +3,6 @@ import zlib from 'zlib' import cheerio from 'cheerio' import QuickLRU from 'quick-lru' -// This is what NextJS uses when it injects the JSON serialized -// in the `