From c0bd145a29a0d51e05d419841829b7609827668a Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Sat, 7 May 2022 18:57:35 +0800 Subject: [PATCH] fix(theme-classic): resolve customCss from site dir (#7363) --- packages/docusaurus-theme-classic/src/index.ts | 11 ++++++----- website/docusaurus.config.js | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts index 6a3d46c827..9fd370a2e5 100644 --- a/packages/docusaurus-theme-classic/src/index.ts +++ b/packages/docusaurus-theme-classic/src/index.ts @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ +import path from 'path'; import type {LoadContext, Plugin} from '@docusaurus/types'; import type {ThemeConfig} from '@docusaurus/theme-common'; import {getTranslationFiles, translateThemeConfig} from './translations'; @@ -142,11 +143,11 @@ export default function themeClassic( ]; if (customCss) { - if (Array.isArray(customCss)) { - modules.push(...customCss); - } else { - modules.push(customCss); - } + modules.push( + ...(Array.isArray(customCss) ? customCss : [customCss]).map((p) => + path.resolve(context.siteDir, p), + ), + ); } return modules; diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index e35a43104f..4c373b359c 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -337,7 +337,8 @@ const config = { theme: { customCss: [ require.resolve('./src/css/custom.css'), - require.resolve('./_dogfooding/dogfooding.css'), + // relative paths are relative to site dir + './_dogfooding/dogfooding.css', ], }, gtag: !isDeployPreview