@docusaurus/core 2.0.0-beta.12faed89d → 2.0.0-beta.13

package/lib/server/index.js

@@ -9,36 +9,38 @@ 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 constants_1 = require("../constants");
-const client_modules_1 = tslib_1.__importDefault(require("./client-modules"));
-const config_1 = tslib_1.__importDefault(require("./config"));
+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 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"));
+const module_1 = require("module");
+const moduleShorthand_1 = require("./moduleShorthand");
 async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
-    const siteConfigPathUnresolved = customConfigFilePath !== null && customConfigFilePath !== void 0 ? customConfigFilePath : constants_1.DEFAULT_CONFIG_FILE_NAME;
+    const siteConfigPathUnresolved = customConfigFilePath !== null && customConfigFilePath !== void 0 ? customConfigFilePath : utils_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;
 async function loadContext(siteDir, options = {}) {
     var _a;
     const { customOutDir, locale, customConfigFilePath } = options;
-    const generatedFilesDir = path_1.default.isAbsolute(constants_1.GENERATED_FILES_DIR_NAME)
-        ? constants_1.GENERATED_FILES_DIR_NAME
-        : path_1.default.resolve(siteDir, constants_1.GENERATED_FILES_DIR_NAME);
+    const generatedFilesDir = path_1.default.isAbsolute(utils_1.GENERATED_FILES_DIR_NAME)
+        ? utils_1.GENERATED_FILES_DIR_NAME
+        : path_1.default.resolve(siteDir, utils_1.GENERATED_FILES_DIR_NAME);
     const { siteConfig: initialSiteConfig, siteConfigPath } = await loadSiteConfig({
         siteDir,
         customConfigFilePath,
@@ -46,27 +48,27 @@ async function loadContext(siteDir, options = {}) {
     const { ssrTemplate } = initialSiteConfig;
     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({
+        : path_1.default.resolve(siteDir, utils_1.DEFAULT_BUILD_DIR_NAME);
+    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,38 +83,42 @@ async function loadContext(siteDir, options = {}) {
 }
 exports.loadContext = loadContext;
 function loadPluginConfigs(context) {
-    const { plugins: presetPlugins, themes: presetThemes } = presets_1.default(context);
-    const { siteConfig } = context;
+    let { plugins: presetPlugins, themes: presetThemes } = (0, presets_1.default)(context);
+    const { siteConfig, siteConfigPath } = context;
+    const require = (0, module_1.createRequire)(siteConfigPath);
+    function normalizeShorthand(pluginConfig, pluginType) {
+        var _a;
+        if (typeof pluginConfig === 'string') {
+            return (0, moduleShorthand_1.resolveModuleName)(pluginConfig, require, pluginType);
+        }
+        else if (Array.isArray(pluginConfig) &&
+            typeof pluginConfig[0] === 'string') {
+            return [
+                (0, moduleShorthand_1.resolveModuleName)(pluginConfig[0], require, pluginType),
+                (_a = pluginConfig[1]) !== null && _a !== void 0 ? _a : {},
+            ];
+        }
+        return pluginConfig;
+    }
+    presetPlugins = presetPlugins.map((plugin) => normalizeShorthand(plugin, 'plugin'));
+    presetThemes = presetThemes.map((theme) => normalizeShorthand(theme, 'theme'));
+    const standalonePlugins = (siteConfig.plugins || []).map((plugin) => normalizeShorthand(plugin, 'plugin'));
+    const standaloneThemes = (siteConfig.themes || []).map((theme) => normalizeShorthand(theme, 'theme'));
     return [
         ...presetPlugins,
         ...presetThemes,
         // Site config should be the highest priority.
-        ...(siteConfig.plugins || []),
-        ...(siteConfig.themes || []),
+        ...standalonePlugins,
+        ...standaloneThemes,
     ];
 }
 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 +148,103 @@ 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, siteConfig, }) {
+    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: {
+                                        staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
+                                        siteDir,
+                                        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, utils_1.DEFAULT_CONFIG_FILE_NAME, `export default ${JSON.stringify(siteConfig, null, 2)};`);
+    plugins.push(createBootstrapPlugin({ siteConfig }));
+    plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
     // 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 +253,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/moduleShorthand.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/// <reference types="node" />
+export declare function getNamePatterns(moduleName: string, moduleType: 'preset' | 'theme' | 'plugin'): string[];
+export declare function resolveModuleName(moduleName: string, moduleRequire: NodeRequire, moduleType: 'preset' | 'theme' | 'plugin'): string;

package/lib/server/moduleShorthand.js

@@ -0,0 +1,42 @@
+"use strict";
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveModuleName = exports.getNamePatterns = void 0;
+function getNamePatterns(moduleName, moduleType) {
+    if (moduleName.startsWith('@')) {
+        // Pure scope: `@scope` => `@scope/docusaurus-plugin`
+        if (!moduleName.includes('/')) {
+            return [`${moduleName}/docusaurus-${moduleType}`];
+        }
+        const [scope, packageName] = moduleName.split(/\/(.*)/);
+        return [
+            `${scope}/${packageName}`,
+            `${scope}/docusaurus-${moduleType}-${packageName}`,
+        ];
+    }
+    return [
+        moduleName,
+        `@docusaurus/${moduleType}-${moduleName}`,
+        `docusaurus-${moduleType}-${moduleName}`,
+    ];
+}
+exports.getNamePatterns = getNamePatterns;
+function resolveModuleName(moduleName, moduleRequire, moduleType) {
+    const modulePatterns = getNamePatterns(moduleName, moduleType);
+    // eslint-disable-next-line no-restricted-syntax
+    for (const module of modulePatterns) {
+        try {
+            moduleRequire.resolve(module);
+            return module;
+        }
+        catch (e) { }
+    }
+    throw new Error(`Docusaurus was unable to resolve the "${moduleName}" ${moduleType}. Make sure one of the following packages are installed:
+${modulePatterns.map((module) => `- ${module}`).join('\n')}`);
+}
+exports.resolveModuleName = resolveModuleName;

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,24 @@ 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 constants_1 = require("../../constants");
+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 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 +52,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 +69,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,14 +80,12 @@ 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)
-            .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();
-    })
+        .mapValues((nameItems) => (0, lodash_1.chain)(nameItems)
+        .groupBy((item) => { var _a; return (_a = item.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; })
+        .mapValues((idItems) => idItems[0].content)
+        .value())
         .value();
     // 3. Plugin Lifecycle - contentLoaded.
     const pluginsRouteConfigs = [];
@@ -91,13 +95,13 @@ async function loadPlugins({ pluginConfigs, context, }) {
         if (!plugin.contentLoaded) {
             return;
         }
-        const pluginId = (_a = plugin.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID;
+        const pluginId = (_a = plugin.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID;
         // plugins data files are namespaced by pluginName/pluginId
         const dataDirRoot = path_1.default.join(context.generatedFilesDir, plugin.name);
         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 +110,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 +149,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,9 +7,9 @@
  */
 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 constants_1 = require("../../constants");
+const module_1 = require("module");
+const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
+const utils_1 = require("@docusaurus/utils");
 const versions_1 = require("../versions");
 const pluginIds_1 = require("./pluginIds");
 const utils_validation_1 = require("@docusaurus/utils-validation");
@@ -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' };
@@ -129,7 +126,7 @@ function initPlugins({ pluginConfigs, context, }) {
             // as we don't go through the Joi schema that adds it
             return {
                 ...normalizedPluginConfig.options,
-                id: (_a = normalizedPluginConfig.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID,
+                id: (_a = normalizedPluginConfig.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID,
             };
         }
     }
@@ -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;

package/lib/server/plugins/pluginIds.js

@@ -8,16 +8,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureUniquePluginInstanceIds = void 0;
 const lodash_1 = require("lodash");
-const constants_1 = require("../../constants");
+const utils_1 = require("@docusaurus/utils");
 // It is forbidden to have 2 plugins of the same name sharing the same id
 // this is required to support multi-instance plugins without conflict
 function ensureUniquePluginInstanceIds(plugins) {
-    const pluginsByName = lodash_1.groupBy(plugins, (p) => p.name);
+    const pluginsByName = (0, lodash_1.groupBy)(plugins, (p) => p.name);
     Object.entries(pluginsByName).forEach(([pluginName, pluginInstances]) => {
-        const pluginInstancesById = lodash_1.groupBy(pluginInstances, (p) => { var _a; return (_a = p.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID; });
+        const pluginInstancesById = (0, lodash_1.groupBy)(pluginInstances, (p) => { var _a; return (_a = p.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; });
         Object.entries(pluginInstancesById).forEach(([pluginId, pluginInstancesWithId]) => {
             if (pluginInstancesWithId.length !== 1) {
-                throw new Error(`Plugin "${pluginName}" is used ${pluginInstancesWithId.length} times with id ${pluginId}.\nTo use the same plugin multiple times on a Docusaurus site, you need to assign a unique id to each plugin instance.`);
+                throw new Error(`Plugin "${pluginName}" is used ${pluginInstancesWithId.length} times with ID "${pluginId}".\nTo use the same plugin multiple times on a Docusaurus site, you need to assign a unique ID to each plugin instance.${pluginId === utils_1.DEFAULT_PLUGIN_ID
+                    ? `\n\nThe plugin ID is "${utils_1.DEFAULT_PLUGIN_ID}" by default. It's possible that the preset you are using already includes a plugin instance, in which case you either want to disable the plugin in the preset (to use a single instance), or assign another ID to your extra plugin instance (to use multiple instances).`
+                    : ''}`);
             }
         });
     });

package/lib/server/presets/index.js

@@ -7,19 +7,18 @@
  */
 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 moduleShorthand_1 = require("../moduleShorthand");
 function loadPresets(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);
+    // We need to resolve presets from the perspective of the siteDir, since the siteDir's package.json
+    // declares the dependency on these presets.
+    const presetRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const presets = (context.siteConfig || {}).presets || [];
     const unflatPlugins = [];
     const unflatThemes = [];
     presets.forEach((presetItem) => {
+        var _a;
         let presetModuleImport;
         let presetOptions = {};
         if (typeof presetItem === 'string') {
@@ -31,8 +30,9 @@ function loadPresets(context) {
         else {
             throw new Error('Invalid presets format detected in config.');
         }
-        const presetModule = import_fresh_1.default(pluginRequire.resolve(presetModuleImport));
-        const preset = (presetModule.default || presetModule)(context, presetOptions);
+        const presetName = (0, moduleShorthand_1.resolveModuleName)(presetModuleImport, presetRequire, 'preset');
+        const presetModule = (0, import_fresh_1.default)(presetRequire.resolve(presetName));
+        const preset = ((_a = presetModule.default) !== null && _a !== void 0 ? _a : presetModule)(context, presetOptions);
         if (preset.plugins) {
             unflatPlugins.push(preset.plugins);
         }
@@ -41,8 +41,8 @@ function loadPresets(context) {
         }
     });
     return {
-        plugins: [].concat(...unflatPlugins).filter(Boolean),
-        themes: [].concat(...unflatThemes).filter(Boolean),
+        plugins: unflatPlugins.flat().filter(Boolean),
+        themes: unflatThemes.flat().filter(Boolean),
     };
 }
 exports.default = loadPresets;