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

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,35 +53,39 @@ 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,
     });
-    const contentLoadedPlugins = await Promise.all(plugins.map(async (plugin) => {
+    // 2. Plugin Lifecycle - loadContent.
+    // Currently plugins run lifecycle methods in parallel and are not order-dependent.
+    // We could change this in future if there are plugins which need to
+    // run in certain order or depend on others for data.
+    const loadedPlugins = await Promise.all(plugins.map(async (plugin) => {
         const content = plugin.loadContent ? await plugin.loadContent() : null;
-        return { plugin, content };
+        return { ...plugin, content };
     }));
-    const contentLoadedTranslatedPlugins = await Promise.all(contentLoadedPlugins.map(async (contentLoadedPlugin) => {
-        var _a, _b, _c;
-        const translationFiles = (_c = (await ((_b = (_a = contentLoadedPlugin.plugin) === null || _a === void 0 ? void 0 : _a.getTranslationFiles) === null || _b === void 0 ? void 0 : _b.call(_a, {
+    const contentLoadedTranslatedPlugins = await Promise.all(loadedPlugins.map(async (contentLoadedPlugin) => {
+        var _a, _b;
+        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 && _c !== void 0 ? _c : [];
-        const localizedTranslationFiles = await Promise.all(translationFiles.map((translationFile) => translations_1.localizePluginTranslationFile({
+        })))) !== null && _b !== void 0 ? _b : [];
+        const localizedTranslationFiles = await Promise.all(translationFiles.map((translationFile) => (0, translations_1.localizePluginTranslationFile)({
             locale: context.i18n.currentLocale,
             siteDir: context.siteDir,
             translationFile,
-            plugin: contentLoadedPlugin.plugin,
+            plugin: contentLoadedPlugin,
         })));
         return {
             ...contentLoadedPlugin,
             translationFiles: localizedTranslationFiles,
         };
     }));
-    const allContent = lodash_1.chain(contentLoadedPlugins)
-        .groupBy((item) => item.plugin.name)
+    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.plugin.options.id) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PLUGIN_ID; })
+        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();
     })
@@ -82,7 +93,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     // 3. Plugin Lifecycle - contentLoaded.
     const pluginsRouteConfigs = [];
     const globalData = {};
-    await Promise.all(contentLoadedTranslatedPlugins.map(async ({ plugin, content, translationFiles }) => {
+    await Promise.all(contentLoadedTranslatedPlugins.map(async ({ content, translationFiles, ...plugin }) => {
         var _a, _b, _c;
         if (!plugin.contentLoaded) {
             return;
@@ -93,13 +104,16 @@ 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, context.siteConfig.trailingSlash);
+            const finalRouteConfig = (0, applyRouteTrailingSlash_1.default)(initialRouteConfig, {
+                trailingSlash: context.siteConfig.trailingSlash,
+                baseUrl: context.siteConfig.baseUrl,
+            });
             pluginsRouteConfigs.push(finalRouteConfig);
         };
         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:
@@ -126,7 +140,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     // Currently plugins run lifecycle methods in parallel and are not order-dependent.
     // We could change this in future if there are plugins which need to
     // run in certain order or depend on others for data.
-    await Promise.all(contentLoadedTranslatedPlugins.map(async ({ plugin }) => {
+    await Promise.all(contentLoadedTranslatedPlugins.map(async (plugin) => {
         if (!plugin.routesLoaded) {
             return null;
         }
@@ -138,14 +152,14 @@ 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, translationFiles }) => {
+        return contentLoadedTranslatedPlugins.reduce((currentThemeConfig, plugin) => {
             var _a;
             const translatedThemeConfigSlice = (_a = plugin.translateThemeConfig) === null || _a === void 0 ? void 0 : _a.call(plugin, {
                 themeConfig: currentThemeConfig,
-                translationFiles,
+                translationFiles: plugin.translationFiles,
             });
             return {
                 ...currentThemeConfig,
@@ -154,7 +168,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         }, untranslatedThemeConfig);
     }
     return {
-        plugins,
+        plugins: loadedPlugins,
         pluginsRouteConfigs,
         globalData,
         themeConfigTranslated: translateThemeConfig(context.siteConfig.themeConfig),

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

@@ -4,12 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { DocusaurusPluginVersionInformation, LoadContext, Plugin, PluginConfig, PluginOptions } from '@docusaurus/types';
-export declare type InitPlugin = Plugin<unknown> & {
-    readonly options: PluginOptions;
-    readonly version: DocusaurusPluginVersionInformation;
-};
+import { LoadContext, PluginConfig, InitializedPlugin } from '@docusaurus/types';
 export default function initPlugins({ pluginConfigs, context, }: {
     pluginConfigs: PluginConfig[];
     context: LoadContext;
-}): InitPlugin[];
+}): InitializedPlugin[];

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;

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

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { InitPlugin } from './init';
-export declare function ensureUniquePluginInstanceIds(plugins: InitPlugin[]): void;
+import { InitializedPlugin } from '@docusaurus/types';
+export declare function ensureUniquePluginInstanceIds(plugins: InitializedPlugin[]): void;

package/lib/server/plugins/pluginIds.js

@@ -12,9 +12,9 @@ const constants_1 = require("../../constants");
 // 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 : constants_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.`);

package/lib/server/presets/index.js

@@ -7,15 +7,12 @@
  */
 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"));
 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);
+    const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const presets = (context.siteConfig || {}).presets || [];
     const unflatPlugins = [];
     const unflatThemes = [];
@@ -31,7 +28,7 @@ function loadPresets(context) {
         else {
             throw new Error('Invalid presets format detected in config.');
         }
-        const presetModule = import_fresh_1.default(pluginRequire.resolve(presetModuleImport));
+        const presetModule = (0, import_fresh_1.default)(pluginRequire.resolve(presetModuleImport));
         const preset = (presetModule.default || presetModule)(context, presetOptions);
         if (preset.plugins) {
             unflatPlugins.push(preset.plugins);

package/lib/server/routes.js

@@ -9,18 +9,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@docusaurus/utils");
 const lodash_1 = require("lodash");
 const querystring_1 = require("querystring");
-const createRouteCodeString = ({ routePath, routeHash, exact, subroutesCodeStrings, }) => {
-    const str = `{
-  path: '${routePath}',
-  component: ComponentCreator('${routePath}','${routeHash}'),
-  ${exact ? `exact: true,` : ''}
-${subroutesCodeStrings
-        ? `  routes: [
-${utils_1.removeSuffix(subroutesCodeStrings.join(',\n'), ',\n')},
-]
-`
-        : ''}}`;
-    return str;
+function indent(str) {
+    const spaces = '  ';
+    return `${spaces}${str.replace(/(\n)/g, `\n${spaces}`)}`;
+}
+const createRouteCodeString = ({ routePath, routeHash, exact, subroutesCodeStrings, props, }) => {
+    const parts = [
+        `path: '${routePath}'`,
+        `component: ComponentCreator('${routePath}','${routeHash}')`,
+    ];
+    if (exact) {
+        parts.push(`exact: true`);
+    }
+    if (subroutesCodeStrings) {
+        parts.push(`routes: [
+${indent((0, utils_1.removeSuffix)(subroutesCodeStrings.join(',\n'), ',\n'))}
+]`);
+    }
+    Object.entries(props).forEach(([propName, propValue]) => {
+        // Figure out how to "unquote" JS attributes that don't need to be quoted
+        // Is this lib reliable? https://github.com/armanozak/should-quote
+        const shouldQuote = true; // TODO
+        const key = shouldQuote ? `'${propName}'` : propName;
+        parts.push(`${key}: ${JSON.stringify(propValue)}`);
+    });
+    return `{
+${indent(parts.join(',\n'))}
+}`;
 };
 const NotFoundRouteCode = `{
   path: '*',
@@ -31,10 +46,10 @@ const RoutesImportsCode = [
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
 ].join('\n');
 function isModule(value) {
-    if (lodash_1.isString(value)) {
+    if ((0, lodash_1.isString)(value)) {
         return true;
     }
-    if (lodash_1.isPlainObject(value) && lodash_1.has(value, '__import') && lodash_1.has(value, 'path')) {
+    if ((0, lodash_1.isPlainObject)(value) && (0, lodash_1.has)(value, '__import') && (0, lodash_1.has)(value, 'path')) {
         return true;
     }
     return false;
@@ -43,17 +58,17 @@ function getModulePath(target) {
     if (typeof target === 'string') {
         return target;
     }
-    const queryStr = target.query ? `?${querystring_1.stringify(target.query)}` : '';
+    const queryStr = target.query ? `?${(0, querystring_1.stringify)(target.query)}` : '';
     return `${target.path}${queryStr}`;
 }
 async function loadRoutes(pluginsRouteConfigs, baseUrl) {
     const registry = {};
-    const routesPaths = [utils_1.normalizeUrl([baseUrl, '404.html'])];
+    const routesPaths = [(0, utils_1.normalizeUrl)([baseUrl, '404.html'])];
     const routesChunkNames = {};
     // This is the higher level overview of route code generation.
     function generateRouteCode(routeConfig) {
-        const { path: routePath, component, modules = {}, routes: subroutes, exact, } = routeConfig;
-        if (!lodash_1.isString(routePath) || !component) {
+        const { path: routePath, component, modules = {}, routes: subroutes, exact, priority, ...props } = routeConfig;
+        if (!(0, lodash_1.isString)(routePath) || !component) {
             throw new Error(`Invalid route config: path must be a string and component is required.\n${JSON.stringify(routeConfig)}`);
         }
         // Collect all page paths for injecting it later in the plugin lifecycle
@@ -65,7 +80,7 @@ async function loadRoutes(pluginsRouteConfigs, baseUrl) {
         // We hash the route to generate the key, because 2 routes can conflict with
         // each others if they have the same path, ex: parent=/docs, child=/docs
         // see https://github.com/facebook/docusaurus/issues/2917
-        const routeHash = utils_1.simpleHash(JSON.stringify(routeConfig), 3);
+        const routeHash = (0, utils_1.simpleHash)(JSON.stringify(routeConfig), 3);
         const chunkNamesKey = `${routePath}-${routeHash}`;
         routesChunkNames[chunkNamesKey] = {
             ...genRouteChunkNames(registry, { component }, 'component', component),
@@ -76,14 +91,17 @@ async function loadRoutes(pluginsRouteConfigs, baseUrl) {
             routeHash,
             exact,
             subroutesCodeStrings: subroutes === null || subroutes === void 0 ? void 0 : subroutes.map(generateRouteCode),
+            props,
         });
     }
     const routesConfig = `
 ${RoutesImportsCode}
+
 export default [
-${pluginsRouteConfigs.map(generateRouteCode).join(',\n')},
-${NotFoundRouteCode}
-];\n`;
+${indent(`${pluginsRouteConfigs.map(generateRouteCode).join(',\n')},`)}
+${indent(NotFoundRouteCode)}
+];
+`;
     return {
         registry,
         routesConfig,
@@ -103,7 +121,7 @@ registry, value, prefix, name) {
     }
     if (isModule(value)) {
         const modulePath = getModulePath(value);
-        const chunkName = utils_1.genChunkName(modulePath, prefix, name);
+        const chunkName = (0, utils_1.genChunkName)(modulePath, prefix, name);
         // We need to JSON.stringify so that if its on windows, backslashes are escaped.
         const loader = `() => import(/* webpackChunkName: '${chunkName}' */ ${JSON.stringify(modulePath)})`;
         registry[chunkName] = {

package/lib/server/themes/alias.d.ts

@@ -4,5 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ThemeAlias } from '@docusaurus/types';
-export default function themeAlias(themePath: string, addOriginalAlias: boolean): ThemeAlias;
+import { ThemeAliases } from '@docusaurus/types';
+export declare function sortAliases(aliases: ThemeAliases): ThemeAliases;
+export default function themeAlias(themePath: string, addOriginalAlias: boolean): ThemeAliases;

package/lib/server/themes/alias.js

@@ -6,34 +6,46 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortAliases = void 0;
 const tslib_1 = require("tslib");
-const globby_1 = tslib_1.__importDefault(require("globby"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const lodash_1 = require("lodash");
+// Order of Webpack aliases is important because one alias can shadow another
+// This ensure @theme/NavbarItem alias is after @theme/NavbarItem/LocaleDropdown
+// See https://github.com/facebook/docusaurus/pull/3922
+// See https://github.com/facebook/docusaurus/issues/5382
+function sortAliases(aliases) {
+    // Alphabetical order by default
+    const entries = (0, lodash_1.sortBy)(Object.entries(aliases), ([alias]) => alias);
+    // @theme/NavbarItem should be after @theme/NavbarItem/LocaleDropdown
+    entries.sort(([alias1], [alias2]) => {
+        return alias1.includes(`${alias2}/`) ? -1 : 0;
+    });
+    return Object.fromEntries(entries);
+}
+exports.sortAliases = sortAliases;
+// TODO make async
 function themeAlias(themePath, addOriginalAlias) {
     if (!fs_extra_1.default.pathExistsSync(themePath)) {
         return {};
     }
-    const themeComponentFiles = globby_1.default.sync(['**/*.{js,jsx,ts,tsx}'], {
+    const themeComponentFiles = utils_1.Globby.sync(['**/*.{js,jsx,ts,tsx}'], {
         cwd: themePath,
     });
-    // See https://github.com/facebook/docusaurus/pull/3922
-    // ensure @theme/NavbarItem alias is created after @theme/NavbarItem/LocaleDropdown
-    const sortedThemeComponentFiles = lodash_1.sortBy(themeComponentFiles, (file) => file.endsWith('/index.js'));
     const aliases = {};
-    sortedThemeComponentFiles.forEach((relativeSource) => {
+    themeComponentFiles.forEach((relativeSource) => {
         const filePath = path_1.default.join(themePath, relativeSource);
-        const fileName = utils_1.fileToPath(relativeSource);
-        const aliasName = utils_1.posixPath(utils_1.normalizeUrl(['@theme', fileName]).replace(/\/$/, ''));
+        const fileName = (0, utils_1.fileToPath)(relativeSource);
+        const aliasName = (0, utils_1.posixPath)((0, utils_1.normalizeUrl)(['@theme', fileName]).replace(/\/$/, ''));
         aliases[aliasName] = filePath;
         if (addOriginalAlias) {
             // For swizzled components to access the original.
-            const originalAliasName = utils_1.posixPath(utils_1.normalizeUrl(['@theme-original', fileName]).replace(/\/$/, ''));
+            const originalAliasName = (0, utils_1.posixPath)((0, utils_1.normalizeUrl)(['@theme-original', fileName]).replace(/\/$/, ''));
             aliases[originalAliasName] = filePath;
         }
     });
-    return aliases;
+    return sortAliases(aliases);
 }
 exports.default = themeAlias;

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

@@ -4,5 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ThemeAlias } from '@docusaurus/types';
-export default function loadThemeAlias(themePaths: string[], userThemePaths?: string[]): ThemeAlias;
+import { ThemeAliases, LoadedPlugin } from '@docusaurus/types';
+export declare function loadThemeAliases(themePaths: string[], userThemePaths?: string[]): ThemeAliases;
+export declare function loadPluginsThemeAliases({ siteDir, plugins, }: {
+    siteDir: string;
+    plugins: LoadedPlugin[];
+}): ThemeAliases;

package/lib/server/themes/index.js

@@ -6,30 +6,40 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
-const alias_1 = tslib_1.__importDefault(require("./alias"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const constants_1 = require("../../constants");
+const alias_1 = (0, tslib_1.__importStar)(require("./alias"));
+const ThemeFallbackDir = path_1.default.resolve(__dirname, '../../client/theme-fallback');
 function buildThemeAliases(themeAliases, aliases = {}) {
     Object.keys(themeAliases).forEach((aliasKey) => {
         if (aliasKey in aliases) {
             const componentName = aliasKey.substring(aliasKey.indexOf('/') + 1);
-            // eslint-disable-next-line no-param-reassign
             aliases[`@theme-init/${componentName}`] = aliases[aliasKey];
         }
-        // eslint-disable-next-line no-param-reassign
         aliases[aliasKey] = themeAliases[aliasKey];
     });
     return aliases;
 }
-function loadThemeAlias(themePaths, userThemePaths = []) {
-    let aliases = {};
+function loadThemeAliases(themePaths, userThemePaths = []) {
+    let aliases = {}; // TODO refactor, inelegant side-effect
     themePaths.forEach((themePath) => {
-        const themeAliases = alias_1.default(themePath, true);
+        const themeAliases = (0, alias_1.default)(themePath, true);
         aliases = { ...aliases, ...buildThemeAliases(themeAliases, aliases) };
     });
     userThemePaths.forEach((themePath) => {
-        const userThemeAliases = alias_1.default(themePath, false);
+        const userThemeAliases = (0, alias_1.default)(themePath, false);
         aliases = { ...aliases, ...buildThemeAliases(userThemeAliases, aliases) };
     });
-    return aliases;
+    return (0, alias_1.sortAliases)(aliases);
+}
+exports.loadThemeAliases = loadThemeAliases;
+function loadPluginsThemeAliases({ siteDir, plugins, }) {
+    const pluginThemes = plugins
+        .map((plugin) => (plugin.getThemePath ? plugin.getThemePath() : undefined))
+        .filter((x) => Boolean(x));
+    const userTheme = path_1.default.resolve(siteDir, constants_1.THEME_PATH);
+    return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
 }
-exports.default = loadThemeAlias;
+exports.loadPluginsThemeAliases = loadPluginsThemeAliases;

package/lib/server/translations/translations.d.ts

@@ -1,5 +1,4 @@
-import { InitPlugin } from '../plugins/init';
-import { TranslationFileContent, TranslationFile, TranslationMessage } from '@docusaurus/types';
+import { TranslationFileContent, TranslationFile, TranslationMessage, InitializedPlugin } from '@docusaurus/types';
 export declare type WriteTranslationsOptions = {
     override?: boolean;
     messagePrefix?: string;
@@ -21,15 +20,15 @@ export declare function getCodeTranslationsFilePath(context: TranslationContext)
 export declare function readCodeTranslationFileContent(context: TranslationContext): Promise<TranslationFileContent | undefined>;
 export declare function writeCodeTranslations(context: TranslationContext, content: TranslationFileContent, options: WriteTranslationsOptions): Promise<void>;
 export declare function writePluginTranslations({ siteDir, plugin, locale, translationFile, options, }: TranslationContext & {
-    plugin: InitPlugin;
+    plugin: InitializedPlugin;
     translationFile: TranslationFile;
     options?: WriteTranslationsOptions;
 }): Promise<void>;
 export declare function localizePluginTranslationFile({ siteDir, plugin, locale, translationFile, }: TranslationContext & {
-    plugin: InitPlugin;
+    plugin: InitializedPlugin;
     translationFile: TranslationFile;
 }): Promise<TranslationFile>;
-export declare function getPluginsDefaultCodeTranslationMessages(plugins: InitPlugin[]): Promise<Record<string, string>>;
+export declare function getPluginsDefaultCodeTranslationMessages(plugins: InitializedPlugin[]): Promise<Record<string, string>>;
 export declare function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }: {
     extractedCodeTranslations: Record<string, TranslationMessage>;
     defaultCodeMessages: Record<string, string>;

package/lib/server/translations/translations.js

@@ -8,12 +8,12 @@ const tslib_1 = require("tslib");
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const lodash_1 = require("lodash");
 const utils_1 = require("@docusaurus/utils");
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const TranslationFileContentSchema = utils_validation_1.Joi.object()
     .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
     message: utils_validation_1.Joi.string().allow('').required(),
@@ -44,7 +44,7 @@ async function readTranslationFileContent(filePath) {
 exports.readTranslationFileContent = readTranslationFileContent;
 function mergeTranslationFileContent({ existingContent = {}, newContent, options, }) {
     // Apply messagePrefix to all messages
-    const newContentTransformed = lodash_1.mapValues(newContent, (value) => {
+    const newContentTransformed = (0, lodash_1.mapValues)(newContent, (value) => {
         var _a;
         return ({
             ...value,
@@ -68,7 +68,7 @@ function mergeTranslationFileContent({ existingContent = {}, newContent, options
 async function writeTranslationFileContent({ filePath, content: newContent, options = {}, }) {
     const existingContent = await readTranslationFileContent(filePath);
     // Warn about potential legacy keys
-    const unknownKeys = lodash_1.difference(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
+    const unknownKeys = (0, lodash_1.difference)(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
     if (unknownKeys.length > 0) {
         console.warn(chalk_1.default.yellow(`Some translation keys looks unknown to us in file ${filePath}
 Maybe you should remove them?
@@ -83,7 +83,7 @@ Maybe you should remove them?
     if (Object.keys(mergedContent).length > 0) {
         console.log(`${Object.keys(mergedContent)
             .length.toString()
-            .padStart(3, ' ')} translations will be written at "${utils_1.toMessageRelativeFilePath(filePath)}".`);
+            .padStart(3, ' ')} translations will be written at "${(0, utils_1.toMessageRelativeFilePath)(filePath)}".`);
         await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
         await fs_extra_1.default.writeFile(filePath, JSON.stringify(mergedContent, null, 2));
     }
@@ -124,7 +124,7 @@ function addTranslationFileExtension(translationFilePath) {
     return `${translationFilePath}.json`;
 }
 function getPluginTranslationFilePath({ siteDir, plugin, locale, translationFilePath, }) {
-    const dirPath = utils_1.getPluginI18nPath({
+    const dirPath = (0, utils_1.getPluginI18nPath)({
         siteDir,
         locale,
         pluginName: plugin.name,
@@ -178,14 +178,14 @@ async function getPluginsDefaultCodeTranslationMessages(plugins) {
 }
 exports.getPluginsDefaultCodeTranslationMessages = getPluginsDefaultCodeTranslationMessages;
 function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }) {
-    const unusedDefaultCodeMessages = lodash_1.difference(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
+    const unusedDefaultCodeMessages = (0, lodash_1.difference)(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
     if (unusedDefaultCodeMessages.length > 0) {
         console.warn(chalk_1.default.yellow(`Unused default message codes found.
 Please report this Docusaurus issue.
 - ${unusedDefaultCodeMessages.join('\n- ')}
 `));
     }
-    return lodash_1.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => {
+    return (0, lodash_1.mapValues)(extractedCodeTranslations, (messageTranslation, messageId) => {
         var _a;
         return {
             ...messageTranslation,

package/lib/server/translations/translationsExtractor.d.ts

@@ -1,8 +1,7 @@
 import { TransformOptions } from '@babel/core';
-import { TranslationFileContent, TranslationMessage } from '@docusaurus/types';
-import { InitPlugin } from '../plugins/init';
+import { InitializedPlugin, TranslationFileContent, TranslationMessage } from '@docusaurus/types';
 export declare function globSourceCodeFilePaths(dirPaths: string[]): Promise<string[]>;
-export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitPlugin[], babelOptions: TransformOptions): Promise<TranslationFileContent>;
+export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions, extraSourceCodeFilePaths?: string[]): Promise<TranslationFileContent>;
 declare type SourceCodeFileTranslations = {
     sourceCodeFilePath: string;
     translations: Record<string, TranslationMessage>;