From 2297f8d20ae34c24d71d9c0de638c3cc1cabf0a2 Mon Sep 17 00:00:00 2001 From: Josh-Cena Date: Mon, 22 Nov 2021 13:15:20 +0800 Subject: [PATCH 1/2] fix(core): load client modules before mounting React components --- packages/docusaurus/src/client/App.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/docusaurus/src/client/App.tsx b/packages/docusaurus/src/client/App.tsx index 4082be154efc..c47deb902555 100644 --- a/packages/docusaurus/src/client/App.tsx +++ b/packages/docusaurus/src/client/App.tsx @@ -5,8 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -import React from 'react'; +// Load this at the very top! +// client modules have to be loaded before anything else... +import './client-lifecycles-dispatcher'; +import React from 'react'; import routes from '@generated/routes'; import renderRoutes from './exports/renderRoutes'; import {BrowserContextProvider} from './exports/browserContext'; @@ -17,8 +20,6 @@ import BaseUrlIssueBanner from './baseUrlIssueBanner/BaseUrlIssueBanner'; import Root from '@theme/Root'; import Error from '@theme/Error'; -import './client-lifecycles-dispatcher'; - function App(): JSX.Element { return ( From 024ada557990f58afc9a243d406bb2e5e504730a Mon Sep 17 00:00:00 2001 From: Josh-Cena Date: Mon, 22 Nov 2021 13:21:38 +0800 Subject: [PATCH 2/2] revert announcement bar patch --- .../src/theme/AnnouncementBar/styles.module.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css index a357446eb75d..74969ee6515c 100644 --- a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css +++ b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css @@ -29,8 +29,8 @@ html[data-announcement-bar-initially-dismissed='true'] .announcementBar { .announcementBarClose { flex: 0 0 30px; align-self: stretch; - padding: 0 !important; - line-height: 0 !important; + padding: 0; + line-height: 0; } .announcementBarContent {