From 6703f8420ef1fc221a16a7bfb57d804dc7c8b1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Mon, 14 Dec 2020 20:52:20 +0100 Subject: [PATCH] fix(v2): fix navbar items issue on Windows? (#3922) * attempt to fix navbar items issue on Windows? * attempt to fix alias ordering issue on Windows --- packages/docusaurus/src/server/themes/alias.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/docusaurus/src/server/themes/alias.ts b/packages/docusaurus/src/server/themes/alias.ts index 883d29df1c01..0310f2dff6ca 100644 --- a/packages/docusaurus/src/server/themes/alias.ts +++ b/packages/docusaurus/src/server/themes/alias.ts @@ -10,6 +10,7 @@ import fs from 'fs-extra'; import path from 'path'; import {fileToPath, posixPath, normalizeUrl} from '@docusaurus/utils'; import {ThemeAlias} from '@docusaurus/types'; +import {sortBy} from 'lodash'; export default function themeAlias( themePath: string, @@ -23,9 +24,15 @@ export default function themeAlias( cwd: themePath, }); + // See https://github.com/facebook/docusaurus/pull/3922 + // ensure @theme/NavbarItem alias is created after @theme/NavbarItem/LocaleDropdown + const sortedThemeComponentFiles = sortBy(themeComponentFiles, (file) => + file.endsWith('/index.js'), + ); + const aliases: ThemeAlias = {}; - themeComponentFiles.forEach((relativeSource) => { + sortedThemeComponentFiles.forEach((relativeSource) => { const filePath = path.join(themePath, relativeSource); const fileName = fileToPath(relativeSource);