@docusaurus/core 2.0.0-beta.15a2b59f9 → 2.0.0-beta.17

package/lib/server/plugins/init.js

@@ -6,22 +6,22 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePluginConfigs = void 0;
 const tslib_1 = require("tslib");
-const module_1 = tslib_1.__importDefault(require("module"));
+const module_1 = require("module");
 const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
-const constants_1 = require("../../constants");
+const utils_1 = require("@docusaurus/utils");
 const versions_1 = require("../versions");
 const pluginIds_1 = require("./pluginIds");
 const utils_validation_1 = require("@docusaurus/utils-validation");
-function normalizePluginConfig(pluginConfig, pluginRequire) {
-    var _a, _b, _c, _d;
+async function normalizePluginConfig(pluginConfig, pluginRequire) {
     // plugins: ['./plugin']
     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,
+            plugin: pluginModule?.default ?? pluginModule,
             options: {},
             pluginModule: {
                 path: pluginModuleImport,
@@ -43,10 +43,10 @@ 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 : {},
+                plugin: pluginModule?.default ?? pluginModule,
+                options: pluginConfig[1] ?? {},
                 pluginModule: {
                     path: pluginModuleImport,
                     module: pluginModule,
@@ -59,49 +59,44 @@ function normalizePluginConfig(pluginConfig, pluginRequire) {
         if (typeof pluginConfig[0] === 'function') {
             return {
                 plugin: pluginConfig[0],
-                options: (_d = pluginConfig[1]) !== null && _d !== void 0 ? _d : {},
+                options: pluginConfig[1] ?? {},
             };
         }
     }
     throw new Error(`Unexpected: can't load plugin for following plugin config.\n${JSON.stringify(pluginConfig)}`);
 }
+async function normalizePluginConfigs(pluginConfigs, pluginRequire) {
+    return Promise.all(pluginConfigs.map((pluginConfig) => normalizePluginConfig(pluginConfig, pluginRequire)));
+}
+exports.normalizePluginConfigs = normalizePluginConfigs;
 function getOptionValidationFunction(normalizedPluginConfig) {
-    var _a, _b, _c, _d;
     if (normalizedPluginConfig.pluginModule) {
         // support both commonjs and ES modules
-        return ((_c = (_b = (_a = normalizedPluginConfig.pluginModule.module) === null || _a === void 0 ? void 0 : _a.default) === null || _b === void 0 ? void 0 : _b.validateOptions) !== null && _c !== void 0 ? _c : (_d = normalizedPluginConfig.pluginModule.module) === null || _d === void 0 ? void 0 : _d.validateOptions);
-    }
-    else {
-        return normalizedPluginConfig.plugin.validateOptions;
+        return (normalizedPluginConfig.pluginModule.module?.default?.validateOptions ??
+            normalizedPluginConfig.pluginModule.module?.validateOptions);
     }
+    return normalizedPluginConfig.plugin.validateOptions;
 }
 function getThemeValidationFunction(normalizedPluginConfig) {
-    var _a, _b;
     if (normalizedPluginConfig.pluginModule) {
         // support both commonjs and ES modules
-        return ((_b = (_a = normalizedPluginConfig.pluginModule.module.default) === null || _a === void 0 ? void 0 : _a.validateThemeConfig) !== null && _b !== void 0 ? _b : normalizedPluginConfig.pluginModule.module.validateThemeConfig);
-    }
-    else {
-        return normalizedPluginConfig.plugin.validateThemeConfig;
+        return (normalizedPluginConfig.pluginModule.module.default?.validateThemeConfig ??
+            normalizedPluginConfig.pluginModule.module.validateThemeConfig);
     }
+    return normalizedPluginConfig.plugin.validateThemeConfig;
 }
-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);
-    function doGetPluginVersion(normalizedPluginConfig) {
-        var _a, _b;
+async 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.
+    const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
+    const pluginConfigsNormalized = await normalizePluginConfigs(pluginConfigs, pluginRequire);
+    async function doGetPluginVersion(normalizedPluginConfig) {
         // 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);
-        }
-        else {
-            return { type: 'local' };
+        if (normalizedPluginConfig.pluginModule?.path) {
+            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule?.path);
+            return (0, versions_1.getPluginVersion)(pluginPath, context.siteDir);
         }
+        return { type: 'local' };
     }
     function doValidateThemeConfig(normalizedPluginConfig) {
         const validateThemeConfig = getThemeValidationFunction(normalizedPluginConfig);
@@ -111,12 +106,9 @@ function initPlugins({ pluginConfigs, context, }) {
                 themeConfig: context.siteConfig.themeConfig,
             });
         }
-        else {
-            return context.siteConfig.themeConfig;
-        }
+        return context.siteConfig.themeConfig;
     }
     function doValidatePluginOptions(normalizedPluginConfig) {
-        var _a;
         const validateOptions = getOptionValidationFunction(normalizedPluginConfig);
         if (validateOptions) {
             return validateOptions({
@@ -124,37 +116,35 @@ function initPlugins({ pluginConfigs, context, }) {
                 options: normalizedPluginConfig.options,
             });
         }
-        else {
-            // Important to ensure all plugins have an id
-            // 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,
-            };
-        }
+        // Important to ensure all plugins have an id
+        // as we don't go through the Joi schema that adds it
+        return {
+            ...normalizedPluginConfig.options,
+            id: normalizedPluginConfig.options.id ?? utils_1.DEFAULT_PLUGIN_ID,
+        };
     }
-    const plugins = pluginConfigs
-        .map((pluginConfig) => {
-        if (!pluginConfig) {
-            return null;
-        }
-        const normalizedPluginConfig = normalizePluginConfig(pluginConfig, pluginRequire);
-        const pluginVersion = doGetPluginVersion(normalizedPluginConfig);
+    async function initializePlugin(normalizedPluginConfig) {
+        const pluginVersion = await doGetPluginVersion(normalizedPluginConfig);
         const pluginOptions = doValidatePluginOptions(normalizedPluginConfig);
         // Side-effect: merge the normalized theme config in the original one
         context.siteConfig.themeConfig = {
             ...context.siteConfig.themeConfig,
             ...doValidateThemeConfig(normalizedPluginConfig),
         };
-        const pluginInstance = normalizedPluginConfig.plugin(context, pluginOptions);
+        const pluginInstance = await normalizedPluginConfig.plugin(context, pluginOptions);
         return {
             ...pluginInstance,
             options: pluginOptions,
             version: pluginVersion,
         };
-    })
-        .filter((item) => Boolean(item));
-    pluginIds_1.ensureUniquePluginInstanceIds(plugins);
+    }
+    const plugins = (await Promise.all(pluginConfigsNormalized.map((pluginConfig) => {
+        if (!pluginConfig) {
+            return null;
+        }
+        return initializePlugin(pluginConfig);
+    }))).filter((item) => Boolean(item));
+    (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 { InitializedPlugin } from '@docusaurus/types';
+import type { InitializedPlugin } from '@docusaurus/types';
 export declare function ensureUniquePluginInstanceIds(plugins: InitializedPlugin[]): void;

package/lib/server/plugins/pluginIds.js

@@ -7,17 +7,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureUniquePluginInstanceIds = void 0;
-const lodash_1 = require("lodash");
-const constants_1 = require("../../constants");
+const tslib_1 = require("tslib");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+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 = lodash_1.default.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 = lodash_1.default.groupBy(pluginInstances, (p) => p.options.id ?? 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.d.ts

@@ -4,8 +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 { LoadContext, PluginConfig } from '@docusaurus/types';
-export default function loadPresets(context: LoadContext): {
+import type { LoadContext, PluginConfig } from '@docusaurus/types';
+export default function loadPresets(context: LoadContext): Promise<{
     plugins: PluginConfig[];
     themes: PluginConfig[];
-};
+}>;

package/lib/server/presets/index.js

@@ -7,16 +7,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const module_1 = tslib_1.__importDefault(require("module"));
+const module_1 = require("module");
 const import_fresh_1 = 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 presets = (context.siteConfig || {}).presets || [];
+const moduleShorthand_1 = require("../moduleShorthand");
+async function loadPresets(context) {
+    // 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) => {
@@ -31,8 +29,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 = (presetModule.default ?? presetModule)(context, presetOptions);
         if (preset.plugins) {
             unflatPlugins.push(preset.plugins);
         }
@@ -41,8 +40,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;

package/lib/server/routes.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ChunkRegistry, RouteConfig, ChunkNames } from '@docusaurus/types';
+import type { ChunkRegistry, RouteConfig, ChunkNames } from '@docusaurus/types';
 declare type LoadedRoutes = {
     registry: {
         [chunkName: string]: ChunkRegistry;

package/lib/server/routes.js

@@ -7,20 +7,34 @@
  */
 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 +45,13 @@ const RoutesImportsCode = [
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
 ].join('\n');
 function isModule(value) {
-    if (lodash_1.isString(value)) {
+    if (typeof value === 'string') {
         return true;
     }
-    if (lodash_1.isPlainObject(value) && lodash_1.has(value, '__import') && lodash_1.has(value, 'path')) {
+    if (typeof value === 'object' &&
+        // eslint-disable-next-line no-underscore-dangle
+        value?.__import &&
+        value?.path) {
         return true;
     }
     return false;
@@ -43,29 +60,31 @@ 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) {
-            throw new Error(`Invalid route config: path must be a string and component is required.\n${JSON.stringify(routeConfig)}`);
+        const { path: routePath, component, modules = {}, routes: subroutes, exact, priority, ...props } = routeConfig;
+        if (typeof routePath !== 'string' || !component) {
+            throw new Error(`Invalid route config: path must be a string and component is required.
+${JSON.stringify(routeConfig)}`);
         }
         // Collect all page paths for injecting it later in the plugin lifecycle
         // This is useful for plugins like sitemaps, redirects etc...
-        // If a route has subroutes, it is not necessarily a valid page path (more likely to be a wrapper)
+        // If a route has subroutes, it is not necessarily a valid page path (more
+        // likely to be a wrapper)
         if (!subroutes) {
             routesPaths.push(routePath);
         }
         // 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),
@@ -75,15 +94,18 @@ async function loadRoutes(pluginsRouteConfigs, baseUrl) {
             routePath: routeConfig.path.replace(/'/g, "\\'"),
             routeHash,
             exact,
-            subroutesCodeStrings: subroutes === null || subroutes === void 0 ? void 0 : subroutes.map(generateRouteCode),
+            subroutesCodeStrings: 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,9 +125,8 @@ registry, value, prefix, name) {
     }
     if (isModule(value)) {
         const modulePath = getModulePath(value);
-        const chunkName = 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)})`;
+        const chunkName = (0, utils_1.genChunkName)(modulePath, prefix, name);
+        const loader = `() => import(/* webpackChunkName: '${chunkName}' */ '${(0, utils_1.escapePath)(modulePath)}')`;
         registry[chunkName] = {
             loader,
             modulePath,

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 { ThemeAliases } from '@docusaurus/types';
-export default function themeAlias(themePath: string, addOriginalAlias: boolean): ThemeAliases;
+import type { ThemeAliases } from '@docusaurus/types';
+export declare function sortAliases(aliases: ThemeAliases): ThemeAliases;
+export default function themeAlias(themePath: string, addOriginalAlias: boolean): Promise<ThemeAliases>;

package/lib/server/themes/alias.js

@@ -6,35 +6,43 @@
  * 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 utils_1 = require("@docusaurus/utils");
-const lodash_1 = require("lodash");
-// TODO make async
-function themeAlias(themePath, addOriginalAlias) {
-    if (!fs_extra_1.default.pathExistsSync(themePath)) {
+const lodash_1 = tslib_1.__importDefault(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 = lodash_1.default.sortBy(Object.entries(aliases), ([alias]) => alias);
+    // @theme/NavbarItem should be after @theme/NavbarItem/LocaleDropdown
+    entries.sort(([alias1], [alias2]) => alias1.includes(`${alias2}/`) ? -1 : 0);
+    return Object.fromEntries(entries);
+}
+exports.sortAliases = sortAliases;
+async function themeAlias(themePath, addOriginalAlias) {
+    if (!(await fs_extra_1.default.pathExists(themePath))) {
         return {};
     }
-    const themeComponentFiles = globby_1.default.sync(['**/*.{js,jsx,ts,tsx}'], {
+    const themeComponentFiles = await (0, utils_1.Globby)(['**/*.{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,9 +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 { ThemeAliases, LoadedPlugin } from '@docusaurus/types';
-export declare function loadThemeAliases(themePaths: string[], userThemePaths?: string[]): ThemeAliases;
+import type { ThemeAliases, LoadedPlugin } from '@docusaurus/types';
+export declare function loadThemeAliases(themePaths: string[], userThemePaths: string[]): Promise<ThemeAliases>;
 export declare function loadPluginsThemeAliases({ siteDir, plugins, }: {
     siteDir: string;
     plugins: LoadedPlugin[];
-}): ThemeAliases;
+}): Promise<ThemeAliases>;

package/lib/server/themes/index.js

@@ -9,39 +9,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../constants");
-const alias_1 = tslib_1.__importDefault(require("./alias"));
+const utils_1 = require("@docusaurus/utils");
+const alias_1 = 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 loadThemeAliases(themePaths, userThemePaths = []) {
-    let aliases = {}; // TODO refactor, inelegant side-effect
-    themePaths.forEach((themePath) => {
-        const themeAliases = alias_1.default(themePath, true);
-        aliases = { ...aliases, ...buildThemeAliases(themeAliases, aliases) };
-    });
-    userThemePaths.forEach((themePath) => {
-        const userThemeAliases = alias_1.default(themePath, false);
-        aliases = { ...aliases, ...buildThemeAliases(userThemeAliases, aliases) };
-    });
-    return aliases;
+async function loadThemeAliases(themePaths, userThemePaths) {
+    const aliases = {};
+    for (const themePath of themePaths) {
+        const themeAliases = await (0, alias_1.default)(themePath, true);
+        Object.keys(themeAliases).forEach((aliasKey) => {
+            // If this alias shadows a previous one, use @theme-init to preserve the
+            // initial one. @theme-init is only applied once: to the initial theme
+            // that provided this component
+            if (aliasKey in aliases) {
+                const componentName = aliasKey.substring(aliasKey.indexOf('/') + 1);
+                const initAlias = `@theme-init/${componentName}`;
+                if (!(initAlias in aliases)) {
+                    aliases[initAlias] = aliases[aliasKey];
+                }
+            }
+            aliases[aliasKey] = themeAliases[aliasKey];
+        });
+    }
+    for (const themePath of userThemePaths) {
+        const userThemeAliases = await (0, alias_1.default)(themePath, false);
+        Object.assign(aliases, userThemeAliases);
+    }
+    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);
+    const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
     return loadThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
 }
 exports.loadPluginsThemeAliases = loadPluginsThemeAliases;

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

@@ -1,4 +1,10 @@
-import { TranslationFileContent, TranslationFile, TranslationMessage, InitializedPlugin } from '@docusaurus/types';
+/**
+ * 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.
+ */
+import type { TranslationFileContent, TranslationFile, TranslationMessage, InitializedPlugin } from '@docusaurus/types';
 export declare type WriteTranslationsOptions = {
     override?: boolean;
     messagePrefix?: string;