@docusaurus/core 2.0.0-beta.8e9b829d9 → 2.0.0-beta.9

package/lib/server/brokenLinks.js

@@ -9,12 +9,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBrokenLinks = exports.filterExistingFileLinks = exports.getBrokenLinksErrorMessage = exports.getAllBrokenLinks = void 0;
 const tslib_1 = require("tslib");
 const react_router_config_1 = require("react-router-config");
-const resolve_pathname_1 = tslib_1.__importDefault(require("resolve-pathname"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const resolve_pathname_1 = (0, tslib_1.__importDefault)(require("resolve-pathname"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const lodash_1 = require("lodash");
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
-const path_1 = tslib_1.__importDefault(require("path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 function toReactRouterRoutes(routes) {
     // @ts-expect-error: types incompatible???
     return routes;
@@ -29,12 +29,12 @@ function getPageBrokenLinks({ pagePath, pageLinks, routes, }) {
     // we must resolve the links before using matchRoutes
     // resolvePathname is used internally by ReactRouter
     function resolveLink(link) {
-        const resolvedLink = resolve_pathname_1.default(onlyPathname(link), pagePath);
+        const resolvedLink = (0, resolve_pathname_1.default)(onlyPathname(link), pagePath);
         return { link, resolvedLink };
     }
     function isBrokenLink(link) {
         const matchedRoutes = [link, decodeURI(link)]
-            .map((l) => react_router_config_1.matchRoutes(toReactRouterRoutes(routes), l))
+            .map((l) => (0, react_router_config_1.matchRoutes)(toReactRouterRoutes(routes), l))
             .reduce((prev, cur) => prev.concat(cur));
         return matchedRoutes.length === 0;
     }
@@ -46,15 +46,15 @@ function getPageBrokenLinks({ pagePath, pageLinks, routes, }) {
 // We also need to remove the match all 404 route
 function filterIntermediateRoutes(routesInput) {
     const routesWithout404 = routesInput.filter((route) => route.path !== '*');
-    return utils_2.getAllFinalRoutes(routesWithout404);
+    return (0, utils_2.getAllFinalRoutes)(routesWithout404);
 }
 function getAllBrokenLinks({ allCollectedLinks, routes, }) {
     const filteredRoutes = filterIntermediateRoutes(routes);
-    const allBrokenLinks = lodash_1.mapValues(allCollectedLinks, (pageLinks, pagePath) => {
+    const allBrokenLinks = (0, lodash_1.mapValues)(allCollectedLinks, (pageLinks, pagePath) => {
         return getPageBrokenLinks({ pageLinks, pagePath, routes: filteredRoutes });
     });
     // remove pages without any broken link
-    return lodash_1.pickBy(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
+    return (0, lodash_1.pickBy)(allBrokenLinks, (brokenLinks) => brokenLinks.length > 0);
 }
 exports.getAllBrokenLinks = getAllBrokenLinks;
 function getBrokenLinksErrorMessage(allBrokenLinks) {
@@ -74,8 +74,8 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
     // Add an additional message in such case to help user figure this out.
     // see https://github.com/facebook/docusaurus/issues/3567#issuecomment-706973805
     function getLayoutBrokenLinksHelpMessage() {
-        const flatList = lodash_1.flatten(Object.entries(allBrokenLinks).map(([pagePage, brokenLinks]) => brokenLinks.map((brokenLink) => ({ pagePage, brokenLink }))));
-        const countedBrokenLinks = lodash_1.countBy(flatList, (item) => item.brokenLink.link);
+        const flatList = Object.entries(allBrokenLinks).flatMap(([pagePage, brokenLinks]) => brokenLinks.map((brokenLink) => ({ pagePage, brokenLink })));
+        const countedBrokenLinks = (0, lodash_1.countBy)(flatList, (item) => item.brokenLink.link);
         const FrequencyThreshold = 5; // Is this a good value?
         const frequentLinks = Object.entries(countedBrokenLinks)
             .filter(([, count]) => count >= FrequencyThreshold)
@@ -106,7 +106,7 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
     // not easy to make this async :'(
     function linkFileExists(link) {
         // /baseUrl/javadoc/ -> /outDir/javadoc
-        const baseFilePath = utils_1.removeSuffix(`${outDir}/${utils_1.removePrefix(link, baseUrl)}`, '/');
+        const baseFilePath = (0, utils_1.removeSuffix)(`${outDir}/${(0, utils_1.removePrefix)(link, baseUrl)}`, '/');
         // -> /outDir/javadoc
         // -> /outDir/javadoc.html
         // -> /outDir/javadoc/index.html
@@ -117,7 +117,7 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
         }
         return filePathsToTry.some(isExistingFile);
     }
-    return lodash_1.mapValues(allCollectedLinks, (links) => {
+    return (0, lodash_1.mapValues)(allCollectedLinks, (links) => {
         return links.filter((link) => !linkFileExists(link));
     });
 }
@@ -139,7 +139,7 @@ async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, bas
     });
     const errorMessage = getBrokenLinksErrorMessage(allBrokenLinks);
     if (errorMessage) {
-        utils_1.reportMessage(errorMessage, onBrokenLinks);
+        (0, utils_1.reportMessage)(errorMessage, onBrokenLinks);
     }
 }
 exports.handleBrokenLinks = handleBrokenLinks;

package/lib/server/config.js

@@ -7,14 +7,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
 const configValidation_1 = require("./configValidation");
 function loadConfig(configPath) {
     if (!fs_extra_1.default.existsSync(configPath)) {
         throw new Error(`Config file at "${configPath}" not found.`);
     }
-    const loadedConfig = import_fresh_1.default(configPath);
-    return configValidation_1.validateConfig(loadedConfig);
+    const loadedConfig = (0, import_fresh_1.default)(configPath);
+    return (0, configValidation_1.validateConfig)(loadedConfig);
 }
 exports.default = loadConfig;

package/lib/server/configValidation.js

@@ -103,6 +103,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
         .default(exports.DEFAULT_CONFIG.onDuplicateRoutes),
     organizationName: utils_validation_1.Joi.string().allow(''),
     projectName: utils_validation_1.Joi.string().allow(''),
+    deploymentBranch: utils_validation_1.Joi.string().optional(),
     customFields: utils_validation_1.Joi.object().unknown().default(exports.DEFAULT_CONFIG.customFields),
     githubHost: utils_validation_1.Joi.string(),
     plugins: utils_validation_1.Joi.array().items(PluginSchema).default(exports.DEFAULT_CONFIG.plugins),
@@ -138,9 +139,9 @@ function validateConfig(config) {
     const { error, warning, value } = exports.ConfigSchema.validate(config, {
         abortEarly: false,
     });
-    utils_validation_1.printWarning(warning);
+    (0, utils_validation_1.printWarning)(warning);
     if (error) {
-        utils_validation_1.logValidationBugReportHint();
+        (0, utils_validation_1.logValidationBugReportHint)();
         if (utils_validation_1.isValidationDisabledEscapeHatch) {
             console.error(error);
             return config;

package/lib/server/duplicateRoutes.js

@@ -4,7 +4,7 @@ exports.handleDuplicateRoutes = exports.getDuplicateRoutesMessage = exports.getA
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 function getAllDuplicateRoutes(pluginsRouteConfigs) {
-    const allRoutes = utils_2.getAllFinalRoutes(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
+    const allRoutes = (0, utils_2.getAllFinalRoutes)(pluginsRouteConfigs).map((routeConfig) => routeConfig.path);
     const seenRoutes = {};
     return allRoutes.filter((route) => {
         if (Object.prototype.hasOwnProperty.call(seenRoutes, route)) {
@@ -32,7 +32,7 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
     const message = getDuplicateRoutesMessage(duplicatePaths);
     if (message) {
         const finalMessage = `Duplicate routes found!\n${message}\nThis could lead to non-deterministic routing behavior`;
-        utils_1.reportMessage(finalMessage, onDuplicateRoutes);
+        (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }
 exports.handleDuplicateRoutes = handleDuplicateRoutes;

package/lib/server/html-tags/htmlTags.js

@@ -8,11 +8,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
-const html_tags_1 = tslib_1.__importDefault(require("html-tags"));
-const void_1 = tslib_1.__importDefault(require("html-tags/void"));
-const escape_html_1 = tslib_1.__importDefault(require("escape-html"));
+const html_tags_1 = (0, tslib_1.__importDefault)(require("html-tags"));
+const void_1 = (0, tslib_1.__importDefault)(require("html-tags/void"));
+const escape_html_1 = (0, tslib_1.__importDefault)(require("escape-html"));
 function assertIsHtmlTagObject(val) {
-    if (!lodash_1.isPlainObject(val)) {
+    if (!(0, lodash_1.isPlainObject)(val)) {
         throw new Error(`"${val}" is not a valid HTML tag object.`);
     }
     // @ts-expect-error: If tagName doesn't exist, it will throw.
@@ -33,7 +33,7 @@ function htmlTagObjectToString(tagDefinition) {
         if (tagAttributes[attributeName] === true) {
             return attributeName;
         }
-        return `${attributeName}="${escape_html_1.default(tagAttributes[attributeName])}"`;
+        return `${attributeName}="${(0, escape_html_1.default)(tagAttributes[attributeName])}"`;
     });
     return `<${[tagDefinition.tagName].concat(attributes).join(' ')}>${(!isVoidTag && tagDefinition.innerHTML) || ''}${isVoidTag ? '' : `</${tagDefinition.tagName}>`}`;
 }

package/lib/server/html-tags/index.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadHtmlTags = exports.createHtmlTagsString = void 0;
 const tslib_1 = require("tslib");
-const htmlTags_1 = tslib_1.__importDefault(require("./htmlTags"));
+const htmlTags_1 = (0, tslib_1.__importDefault)(require("./htmlTags"));
 function toString(val) {
-    return typeof val === 'string' ? val : htmlTags_1.default(val);
+    return typeof val === 'string' ? val : (0, htmlTags_1.default)(val);
 }
 function createHtmlTagsString(tags) {
     return Array.isArray(tags) ? tags.map(toString).join('\n') : toString(tags);

package/lib/server/i18n.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localizePath = exports.loadI18n = exports.shouldWarnAboutNodeVersion = exports.getDefaultLocaleConfig = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const rtl_detect_1 = require("rtl-detect");
 const constants_1 = require("../constants");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 function getDefaultLocaleLabel(locale) {
     // Intl.DisplayNames is ES2021 - Node14+
     // https://v8.dev/features/intl-displaynames
@@ -20,7 +20,7 @@ function getDefaultLocaleLabel(locale) {
 function getDefaultLocaleConfig(locale) {
     return {
         label: getDefaultLocaleLabel(locale),
-        direction: rtl_detect_1.getLangDir(locale),
+        direction: (0, rtl_detect_1.getLangDir)(locale),
     };
 }
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
@@ -73,7 +73,7 @@ function localizePath({ pathType, path: originalPath, i18n, options = {}, }) {
         }
         // Url paths
         else if (pathType === 'url') {
-            return utils_1.normalizeUrl([originalPath, '/', i18n.currentLocale, '/']);
+            return (0, utils_1.normalizeUrl)([originalPath, '/', i18n.currentLocale, '/']);
         }
         // should never happen
         else {

package/lib/server/index.js

@@ -9,27 +9,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = exports.loadPluginConfigs = exports.loadContext = exports.loadSiteConfig = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
-const path_1 = tslib_1.__importStar(require("path"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const ssr_html_template_1 = tslib_1.__importDefault(require("../client/templates/ssr.html.template"));
+const path_1 = (0, tslib_1.__importStar)(require("path"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const ssr_html_template_1 = (0, tslib_1.__importDefault)(require("../client/templates/ssr.html.template"));
 const constants_1 = require("../constants");
-const client_modules_1 = tslib_1.__importDefault(require("./client-modules"));
-const config_1 = tslib_1.__importDefault(require("./config"));
+const client_modules_1 = (0, tslib_1.__importDefault)(require("./client-modules"));
+const config_1 = (0, tslib_1.__importDefault)(require("./config"));
 const plugins_1 = require("./plugins");
-const presets_1 = tslib_1.__importDefault(require("./presets"));
-const routes_1 = tslib_1.__importDefault(require("./routes"));
+const presets_1 = (0, tslib_1.__importDefault)(require("./presets"));
+const routes_1 = (0, tslib_1.__importDefault)(require("./routes"));
 const html_tags_1 = require("./html-tags");
 const versions_1 = require("./versions");
 const duplicateRoutes_1 = require("./duplicateRoutes");
 const i18n_1 = require("./i18n");
 const translations_1 = require("./translations/translations");
 const lodash_1 = require("lodash");
+const remark_admonitions_1 = (0, tslib_1.__importDefault)(require("remark-admonitions"));
 async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
     const siteConfigPathUnresolved = customConfigFilePath !== null && customConfigFilePath !== void 0 ? customConfigFilePath : constants_1.DEFAULT_CONFIG_FILE_NAME;
     const siteConfigPath = path_1.default.isAbsolute(siteConfigPathUnresolved)
         ? siteConfigPathUnresolved
         : path_1.default.resolve(siteDir, siteConfigPathUnresolved);
-    const siteConfig = await config_1.default(siteConfigPath);
+    const siteConfig = await (0, config_1.default)(siteConfigPath);
     return { siteConfig, siteConfigPath };
 }
 exports.loadSiteConfig = loadSiteConfig;
@@ -47,26 +48,26 @@ async function loadContext(siteDir, options = {}) {
     const baseOutDir = customOutDir
         ? path_1.default.resolve(customOutDir)
         : path_1.default.resolve(siteDir, constants_1.DEFAULT_BUILD_DIR_NAME);
-    const i18n = await i18n_1.loadI18n(initialSiteConfig, { locale });
-    const baseUrl = i18n_1.localizePath({
+    const i18n = await (0, i18n_1.loadI18n)(initialSiteConfig, { locale });
+    const baseUrl = (0, i18n_1.localizePath)({
         path: initialSiteConfig.baseUrl,
         i18n,
         options,
         pathType: 'url',
     });
-    const outDir = i18n_1.localizePath({
+    const outDir = (0, i18n_1.localizePath)({
         path: baseOutDir,
         i18n,
         options,
         pathType: 'fs',
     });
     const siteConfig = { ...initialSiteConfig, baseUrl };
-    const codeTranslationFileContent = (_a = (await translations_1.readCodeTranslationFileContent({
+    const codeTranslationFileContent = (_a = (await (0, translations_1.readCodeTranslationFileContent)({
         siteDir,
         locale: i18n.currentLocale,
     }))) !== null && _a !== void 0 ? _a : {};
     // We only need key->message for code translations
-    const codeTranslations = lodash_1.mapValues(codeTranslationFileContent, (value) => value.message);
+    const codeTranslations = (0, lodash_1.mapValues)(codeTranslationFileContent, (value) => value.message);
     return {
         siteDir,
         generatedFilesDir,
@@ -81,7 +82,7 @@ async function loadContext(siteDir, options = {}) {
 }
 exports.loadContext = loadContext;
 function loadPluginConfigs(context) {
-    const { plugins: presetPlugins, themes: presetThemes } = presets_1.default(context);
+    const { plugins: presetPlugins, themes: presetThemes } = (0, presets_1.default)(context);
     const { siteConfig } = context;
     return [
         ...presetPlugins,
@@ -92,27 +93,12 @@ function loadPluginConfigs(context) {
     ];
 }
 exports.loadPluginConfigs = loadPluginConfigs;
-async function load(siteDir, options = {}) {
-    // Context.
-    const context = await loadContext(siteDir, options);
-    const { generatedFilesDir, siteConfig, siteConfigPath, outDir, baseUrl, i18n, ssrTemplate, codeTranslations, } = context;
-    // Plugins.
-    const pluginConfigs = loadPluginConfigs(context);
-    const { plugins, pluginsRouteConfigs, globalData, themeConfigTranslated, } = await plugins_1.loadPlugins({
-        pluginConfigs,
-        context,
-    });
-    // Side-effect to replace the untranslated themeConfig by the translated one
-    context.siteConfig.themeConfig = themeConfigTranslated;
-    duplicateRoutes_1.handleDuplicateRoutes(pluginsRouteConfigs, siteConfig.onDuplicateRoutes);
-    // Site config must be generated after plugins
-    // We want the generated config to have been normalized by the plugins!
-    const genSiteConfig = utils_1.generate(generatedFilesDir, constants_1.DEFAULT_CONFIG_FILE_NAME, `export default ${JSON.stringify(siteConfig, null, 2)};`);
-    // Make a fake plugin to:
-    // - Resolve aliased theme components
-    // - Inject scripts/stylesheets
+// Make a fake plugin to:
+// - Resolve aliased theme components
+// - Inject scripts/stylesheets
+function createBootstrapPlugin({ siteConfig, }) {
     const { stylesheets = [], scripts = [], clientModules: siteConfigClientModules = [], } = siteConfig;
-    plugins.push({
+    return {
         name: 'docusaurus-bootstrap-plugin',
         content: null,
         options: {},
@@ -142,39 +128,102 @@ async function load(siteDir, options = {}) {
                 headTags: [...stylesheetsTags, ...scriptsTags],
             };
         },
-    });
+    };
+}
+// Configurer Webpack fallback mdx loader for md/mdx files out of content-plugin folders
+// Adds a "fallback" mdx loader for mdx files that are not processed by content plugins
+// This allows to do things such as importing repo/README.md as a partial from another doc
+// Not ideal solution though, but good enough for now
+function createMDXFallbackPlugin({ siteDir }) {
+    return {
+        name: 'docusaurus-mdx-fallback-plugin',
+        content: null,
+        options: {},
+        version: { type: 'synthetic' },
+        configureWebpack(config, isServer, { getJSLoader }) {
+            // We need the mdx fallback loader to exclude files that were already processed by content plugins mdx loaders
+            // This works, but a bit hacky...
+            // Not sure there's a way to handle that differently in webpack :s
+            function getMDXFallbackExcludedPaths() {
+                var _a;
+                const rules = (_a = config === null || config === void 0 ? void 0 : config.module) === null || _a === void 0 ? void 0 : _a.rules;
+                return rules.flatMap((rule) => {
+                    const isMDXRule = rule.test instanceof RegExp && rule.test.test('x.mdx');
+                    return isMDXRule ? rule.include : [];
+                });
+            }
+            return {
+                module: {
+                    rules: [
+                        {
+                            test: /(\.mdx?)$/,
+                            exclude: getMDXFallbackExcludedPaths(),
+                            use: [
+                                getJSLoader({ isServer }),
+                                {
+                                    loader: require.resolve('@docusaurus/mdx-loader'),
+                                    options: {
+                                        staticDir: path_1.default.join(siteDir, constants_1.STATIC_DIR_NAME),
+                                        isMDXPartial: (_filename) => true,
+                                        isMDXPartialFrontMatterWarningDisabled: true,
+                                        remarkPlugins: [remark_admonitions_1.default],
+                                    },
+                                },
+                            ],
+                        },
+                    ],
+                },
+            };
+        },
+    };
+}
+async function load(siteDir, options = {}) {
+    // Context.
+    const context = await loadContext(siteDir, options);
+    const { generatedFilesDir, siteConfig, siteConfigPath, outDir, baseUrl, i18n, ssrTemplate, codeTranslations, } = context;
+    // Plugins.
+    const pluginConfigs = loadPluginConfigs(context);
+    const { plugins, pluginsRouteConfigs, globalData, themeConfigTranslated } = await (0, plugins_1.loadPlugins)({ pluginConfigs, context });
+    // Side-effect to replace the untranslated themeConfig by the translated one
+    context.siteConfig.themeConfig = themeConfigTranslated;
+    (0, duplicateRoutes_1.handleDuplicateRoutes)(pluginsRouteConfigs, siteConfig.onDuplicateRoutes);
+    // Site config must be generated after plugins
+    // We want the generated config to have been normalized by the plugins!
+    const genSiteConfig = (0, utils_1.generate)(generatedFilesDir, constants_1.DEFAULT_CONFIG_FILE_NAME, `export default ${JSON.stringify(siteConfig, null, 2)};`);
+    plugins.push(createBootstrapPlugin({ siteConfig }));
+    plugins.push(createMDXFallbackPlugin({ siteDir }));
     // Load client modules.
-    const clientModules = client_modules_1.default(plugins);
-    const genClientModules = utils_1.generate(generatedFilesDir, 'client-modules.js', `export default [\n${clientModules
+    const clientModules = (0, client_modules_1.default)(plugins);
+    const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [\n${clientModules
         // import() is async so we use require() because client modules can have
         // CSS and the order matters for loading CSS.
         // We need to JSON.stringify so that if its on windows, backslash are escaped.
         .map((module) => `  require(${JSON.stringify(module)}),`)
         .join('\n')}\n];\n`);
     // Load extra head & body html tags.
-    const { headTags, preBodyTags, postBodyTags } = html_tags_1.loadHtmlTags(plugins);
+    const { headTags, preBodyTags, postBodyTags } = (0, html_tags_1.loadHtmlTags)(plugins);
     // Routing.
-    const { registry, routesChunkNames, routesConfig, routesPaths, } = await routes_1.default(pluginsRouteConfigs, baseUrl);
-    const genRegistry = utils_1.generate(generatedFilesDir, 'registry.js', `export default {
+    const { registry, routesChunkNames, routesConfig, routesPaths } = await (0, routes_1.default)(pluginsRouteConfigs, baseUrl);
+    const genRegistry = (0, utils_1.generate)(generatedFilesDir, 'registry.js', `export default {
 ${Object.keys(registry)
         .sort()
         .map((key) => 
     // We need to JSON.stringify so that if its on windows, backslash are escaped.
     `  '${key}': [${registry[key].loader}, ${JSON.stringify(registry[key].modulePath)}, require.resolveWeak(${JSON.stringify(registry[key].modulePath)})],`)
         .join('\n')}};\n`);
-    const genRoutesChunkNames = utils_1.generate(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
-    const genRoutes = utils_1.generate(generatedFilesDir, 'routes.js', routesConfig);
-    const genGlobalData = utils_1.generate(generatedFilesDir, 'globalData.json', JSON.stringify(globalData, null, 2));
-    const genI18n = utils_1.generate(generatedFilesDir, 'i18n.json', JSON.stringify(i18n, null, 2));
+    const genRoutesChunkNames = (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
+    const genRoutes = (0, utils_1.generate)(generatedFilesDir, 'routes.js', routesConfig);
+    const genGlobalData = (0, utils_1.generate)(generatedFilesDir, 'globalData.json', JSON.stringify(globalData, null, 2));
+    const genI18n = (0, utils_1.generate)(generatedFilesDir, 'i18n.json', JSON.stringify(i18n, null, 2));
     const codeTranslationsWithFallbacks = {
-        ...(await translations_1.getPluginsDefaultCodeTranslationMessages(plugins)),
+        ...(await (0, translations_1.getPluginsDefaultCodeTranslationMessages)(plugins)),
         ...codeTranslations,
     };
-    const genCodeTranslations = utils_1.generate(generatedFilesDir, 'codeTranslations.json', JSON.stringify(codeTranslationsWithFallbacks, null, 2));
+    const genCodeTranslations = (0, utils_1.generate)(generatedFilesDir, 'codeTranslations.json', JSON.stringify(codeTranslationsWithFallbacks, null, 2));
     // Version metadata.
     const siteMetadata = {
-        docusaurusVersion: versions_1.getPackageJsonVersion(path_1.join(__dirname, '../../package.json')),
-        siteVersion: versions_1.getPackageJsonVersion(path_1.join(siteDir, 'package.json')),
+        docusaurusVersion: (0, versions_1.getPackageJsonVersion)((0, path_1.join)(__dirname, '../../package.json')),
+        siteVersion: (0, versions_1.getPackageJsonVersion)((0, path_1.join)(siteDir, 'package.json')),
         pluginVersions: {},
     };
     plugins
@@ -183,7 +232,7 @@ ${Object.keys(registry)
         siteMetadata.pluginVersions[name] = version;
     });
     checkDocusaurusPackagesVersion(siteMetadata);
-    const genSiteMetadata = utils_1.generate(generatedFilesDir, 'site-metadata.json', JSON.stringify(siteMetadata, null, 2));
+    const genSiteMetadata = (0, utils_1.generate)(generatedFilesDir, 'site-metadata.json', JSON.stringify(siteMetadata, null, 2));
     await Promise.all([
         genClientModules,
         genSiteConfig,

package/lib/server/loadSetup.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const index_1 = require("./index");
 // Helper methods to setup dummy/fake projects.
 const loadSetup = async (name) => {
@@ -16,10 +16,10 @@ const loadSetup = async (name) => {
     const customSite = path_1.default.join(fixtures, 'custom-site');
     switch (name) {
         case 'custom':
-            return index_1.load(customSite);
+            return (0, index_1.load)(customSite);
         case 'simple':
         default:
-            return index_1.load(simpleSite);
+            return (0, index_1.load)(simpleSite);
     }
 };
 exports.default = loadSetup;

package/lib/server/plugins/applyRouteTrailingSlash.js

@@ -10,7 +10,7 @@ const utils_common_1 = require("@docusaurus/utils-common");
 function applyRouteTrailingSlash(route, params) {
     return {
         ...route,
-        path: utils_common_1.applyTrailingSlash(route.path, params),
+        path: (0, utils_common_1.applyTrailingSlash)(route.path, params),
         ...(route.routes && {
             routes: route.routes.map((subroute) => applyRouteTrailingSlash(subroute, params)),
         }),

package/lib/server/plugins/index.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { LoadContext, PluginConfig, RouteConfig, ThemeConfig, LoadedPlugin } from '@docusaurus/types';
-export declare function sortConfig(routeConfigs: RouteConfig[]): void;
+export declare function sortConfig(routeConfigs: RouteConfig[], baseUrl?: string): void;
 export declare function loadPlugins({ pluginConfigs, context, }: {
     pluginConfigs: PluginConfig[];
     context: LoadContext;

package/lib/server/plugins/index.js

@@ -9,18 +9,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugins = exports.sortConfig = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const init_1 = tslib_1.__importDefault(require("./init"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const init_1 = (0, tslib_1.__importDefault)(require("./init"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const constants_1 = require("../../constants");
 const lodash_1 = require("lodash");
 const translations_1 = require("../translations/translations");
-const applyRouteTrailingSlash_1 = tslib_1.__importDefault(require("./applyRouteTrailingSlash"));
-function sortConfig(routeConfigs) {
+const applyRouteTrailingSlash_1 = (0, tslib_1.__importDefault)(require("./applyRouteTrailingSlash"));
+function sortConfig(routeConfigs, baseUrl = '/') {
     // Sort the route config. This ensures that route with nested
     // routes is always placed last.
     routeConfigs.sort((a, b) => {
+        // Root route should get placed last.
+        if (a.path === baseUrl && b.path !== baseUrl) {
+            return 1;
+        }
+        if (a.path !== baseUrl && b.path === baseUrl) {
+            return -1;
+        }
         if (a.routes && !b.routes) {
             return 1;
         }
@@ -46,7 +53,7 @@ function sortConfig(routeConfigs) {
 exports.sortConfig = sortConfig;
 async function loadPlugins({ pluginConfigs, context, }) {
     // 1. Plugin Lifecycle - Initialization/Constructor.
-    const plugins = init_1.default({
+    const plugins = (0, init_1.default)({
         pluginConfigs,
         context,
     });
@@ -63,7 +70,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         const translationFiles = (_b = (await ((_a = contentLoadedPlugin === null || contentLoadedPlugin === void 0 ? void 0 : contentLoadedPlugin.getTranslationFiles) === null || _a === void 0 ? void 0 : _a.call(contentLoadedPlugin, {
             content: contentLoadedPlugin.content,
         })))) !== null && _b !== void 0 ? _b : [];
-        const localizedTranslationFiles = await Promise.all(translationFiles.map((translationFile) => translations_1.localizePluginTranslationFile({
+        const localizedTranslationFiles = await Promise.all(translationFiles.map((translationFile) => (0, translations_1.localizePluginTranslationFile)({
             locale: context.i18n.currentLocale,
             siteDir: context.siteDir,
             translationFile,
@@ -74,10 +81,10 @@ async function loadPlugins({ pluginConfigs, context, }) {
             translationFiles: localizedTranslationFiles,
         };
     }));
-    const allContent = lodash_1.chain(loadedPlugins)
+    const allContent = (0, lodash_1.chain)(loadedPlugins)
         .groupBy((item) => item.name)
         .mapValues((nameItems) => {
-        return lodash_1.chain(nameItems)
+        return (0, lodash_1.chain)(nameItems)
             .groupBy((item) => { var _a; return (_a = item.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID; })
             .mapValues((idItems) => idItems[0].content)
             .value();
@@ -97,7 +104,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         const dataDir = path_1.default.join(dataDirRoot, pluginId);
         const addRoute = (initialRouteConfig) => {
             // Trailing slash behavior is handled in a generic way for all plugins
-            const finalRouteConfig = applyRouteTrailingSlash_1.default(initialRouteConfig, {
+            const finalRouteConfig = (0, applyRouteTrailingSlash_1.default)(initialRouteConfig, {
                 trailingSlash: context.siteConfig.trailingSlash,
                 baseUrl: context.siteConfig.baseUrl,
             });
@@ -106,7 +113,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         const createData = async (name, data) => {
             const modulePath = path_1.default.join(dataDir, name);
             await fs_extra_1.default.ensureDir(path_1.default.dirname(modulePath));
-            await utils_1.generate(dataDir, name, data);
+            await (0, utils_1.generate)(dataDir, name, data);
             return modulePath;
         };
         // the plugins global data are namespaced to avoid data conflicts:
@@ -145,7 +152,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     }));
     // Sort the route config. This ensures that route with nested
     // routes are always placed last.
-    sortConfig(pluginsRouteConfigs);
+    sortConfig(pluginsRouteConfigs, context.siteConfig.baseUrl);
     // Apply each plugin one after the other to translate the theme config
     function translateThemeConfig(untranslatedThemeConfig) {
         return contentLoadedTranslatedPlugins.reduce((currentThemeConfig, plugin) => {

package/lib/server/plugins/init.js

@@ -7,8 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const module_1 = tslib_1.__importDefault(require("module"));
-const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
+const module_1 = require("module");
+const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
 const constants_1 = require("../../constants");
 const versions_1 = require("../versions");
 const pluginIds_1 = require("./pluginIds");
@@ -19,7 +19,7 @@ function normalizePluginConfig(pluginConfig, pluginRequire) {
     if (typeof pluginConfig === 'string') {
         const pluginModuleImport = pluginConfig;
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
-        const pluginModule = import_fresh_1.default(pluginPath);
+        const pluginModule = (0, import_fresh_1.default)(pluginPath);
         return {
             plugin: (_a = pluginModule === null || pluginModule === void 0 ? void 0 : pluginModule.default) !== null && _a !== void 0 ? _a : pluginModule,
             options: {},
@@ -43,7 +43,7 @@ function normalizePluginConfig(pluginConfig, pluginRequire) {
         if (typeof pluginConfig[0] === 'string') {
             const pluginModuleImport = pluginConfig[0];
             const pluginPath = pluginRequire.resolve(pluginModuleImport);
-            const pluginModule = import_fresh_1.default(pluginPath);
+            const pluginModule = (0, import_fresh_1.default)(pluginPath);
             return {
                 plugin: (_b = pluginModule === null || pluginModule === void 0 ? void 0 : pluginModule.default) !== null && _b !== void 0 ? _b : pluginModule,
                 options: (_c = pluginConfig[1]) !== null && _c !== void 0 ? _c : {},
@@ -88,16 +88,13 @@ function getThemeValidationFunction(normalizedPluginConfig) {
 function initPlugins({ pluginConfigs, context, }) {
     // We need to resolve plugins from the perspective of the siteDir, since the siteDir's package.json
     // declares the dependency on these plugins.
-    // We need to fallback to createRequireFromPath since createRequire is only available in node v12.
-    // See: https://nodejs.org/api/modules.html#modules_module_createrequire_filename
-    const createRequire = module_1.default.createRequire || module_1.default.createRequireFromPath;
-    const pluginRequire = createRequire(context.siteConfigPath);
+    const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
     function doGetPluginVersion(normalizedPluginConfig) {
         var _a, _b;
         // get plugin version
         if ((_a = normalizedPluginConfig.pluginModule) === null || _a === void 0 ? void 0 : _a.path) {
             const pluginPath = pluginRequire.resolve((_b = normalizedPluginConfig.pluginModule) === null || _b === void 0 ? void 0 : _b.path);
-            return versions_1.getPluginVersion(pluginPath, context.siteDir);
+            return (0, versions_1.getPluginVersion)(pluginPath, context.siteDir);
         }
         else {
             return { type: 'local' };
@@ -154,7 +151,7 @@ function initPlugins({ pluginConfigs, context, }) {
         };
     })
         .filter((item) => Boolean(item));
-    pluginIds_1.ensureUniquePluginInstanceIds(plugins);
+    (0, pluginIds_1.ensureUniquePluginInstanceIds)(plugins);
     return plugins;
 }
 exports.default = initPlugins;