@docusaurus/core 2.0.0-beta.16 → 2.0.0-beta.17

package/lib/commands/writeTranslations.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const server_1 = require("../server");
-const init_1 = (0, tslib_1.__importDefault)(require("../server/plugins/init"));
+const init_1 = tslib_1.__importDefault(require("../server/plugins/init"));
 const translations_1 = require("../server/translations/translations");
 const translationsExtractor_1 = require("../server/translations/translationsExtractor");
 const utils_1 = require("../webpack/utils");
@@ -30,9 +30,8 @@ async function getExtraSourceCodeFilePaths() {
     }
 }
 async function writePluginTranslationFiles({ siteDir, plugin, locale, options, }) {
-    var _a;
     if (plugin.getTranslationFiles) {
-        const content = await ((_a = plugin.loadContent) === null || _a === void 0 ? void 0 : _a.call(plugin));
+        const content = await plugin.loadContent?.();
         const translationFiles = await plugin.getTranslationFiles({
             content,
         });
@@ -48,7 +47,6 @@ async function writePluginTranslationFiles({ siteDir, plugin, locale, options, }
     }
 }
 async function writeTranslations(siteDir, options) {
-    var _a;
     const context = await (0, server_1.loadContext)(siteDir, {
         customConfigFilePath: options.config,
         locale: options.locale,
@@ -58,7 +56,7 @@ async function writeTranslations(siteDir, options) {
         pluginConfigs,
         context,
     });
-    const locale = (_a = options.locale) !== null && _a !== void 0 ? _a : context.i18n.defaultLocale;
+    const locale = options.locale ?? context.i18n.defaultLocale;
     if (!context.i18n.locales.includes(locale)) {
         throw new Error(`Can't write-translation for locale "${locale}" that is not in the locale configuration file.
 Available locales are: ${context.i18n.locales.join(',')}.`);

package/lib/index.js

@@ -8,21 +8,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeTranslations = exports.writeHeadingIds = exports.swizzle = exports.start = exports.serve = exports.externalCommand = exports.deploy = exports.clear = exports.build = void 0;
 const tslib_1 = require("tslib");
-const build_1 = (0, tslib_1.__importDefault)(require("./commands/build"));
+const build_1 = tslib_1.__importDefault(require("./commands/build"));
 exports.build = build_1.default;
-const clear_1 = (0, tslib_1.__importDefault)(require("./commands/clear"));
+const clear_1 = tslib_1.__importDefault(require("./commands/clear"));
 exports.clear = clear_1.default;
-const deploy_1 = (0, tslib_1.__importDefault)(require("./commands/deploy"));
+const deploy_1 = tslib_1.__importDefault(require("./commands/deploy"));
 exports.deploy = deploy_1.default;
-const external_1 = (0, tslib_1.__importDefault)(require("./commands/external"));
+const external_1 = tslib_1.__importDefault(require("./commands/external"));
 exports.externalCommand = external_1.default;
-const serve_1 = (0, tslib_1.__importDefault)(require("./commands/serve"));
+const serve_1 = tslib_1.__importDefault(require("./commands/serve"));
 exports.serve = serve_1.default;
-const start_1 = (0, tslib_1.__importDefault)(require("./commands/start"));
+const start_1 = tslib_1.__importDefault(require("./commands/start"));
 exports.start = start_1.default;
-const swizzle_1 = (0, tslib_1.__importDefault)(require("./commands/swizzle"));
+const swizzle_1 = tslib_1.__importDefault(require("./commands/swizzle"));
 exports.swizzle = swizzle_1.default;
-const writeHeadingIds_1 = (0, tslib_1.__importDefault)(require("./commands/writeHeadingIds"));
+const writeHeadingIds_1 = tslib_1.__importDefault(require("./commands/writeHeadingIds"));
 exports.writeHeadingIds = writeHeadingIds_1.default;
-const writeTranslations_1 = (0, tslib_1.__importDefault)(require("./commands/writeTranslations"));
+const writeTranslations_1 = tslib_1.__importDefault(require("./commands/writeTranslations"));
 exports.writeTranslations = writeTranslations_1.default;

package/lib/server/brokenLinks.js

@@ -9,12 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBrokenLinks = exports.filterExistingFileLinks = exports.getBrokenLinksErrorMessage = exports.getAllBrokenLinks = void 0;
 const tslib_1 = require("tslib");
 const react_router_config_1 = require("react-router-config");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const combine_promises_1 = (0, tslib_1.__importDefault)(require("combine-promises"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function toReactRouterRoutes(routes) {
     // @ts-expect-error: types incompatible???
     return routes;
@@ -66,7 +67,9 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
         return `${brokenLink.link}${showResolvedLink ? ` (resolved as: ${brokenLink.resolvedLink})` : ''}`;
     }
     function pageBrokenLinksMessage(pagePath, brokenLinks) {
-        return `\n- On source page path = ${pagePath}:\n   -> linking to ${brokenLinks
+        return `
+- On source page path = ${pagePath}:
+   -> linking to ${brokenLinks
             .map(brokenLinkMessage)
             .join('\n   -> linking to ')}`;
     }
@@ -85,13 +88,24 @@ function getBrokenLinksErrorMessage(allBrokenLinks) {
         if (frequentLinks.length === 0) {
             return '';
         }
-        return `\n\nIt looks like some of the broken links we found appear in many pages of your site.\nMaybe those broken links appear on all pages through your site layout?\nWe recommend that you check your theme configuration for such links (particularly, theme navbar and footer).\nFrequent broken links are linking to:\n- ${frequentLinks.join(`\n- `)}\n`;
+        return logger_1.default.interpolate `
+
+It looks like some of the broken links we found appear in many pages of your site.
+Maybe those broken links appear on all pages through your site layout?
+We recommend that you check your theme configuration for such links (particularly, theme navbar and footer).
+Frequent broken links are linking to:${frequentLinks}
+`;
     }
-    return (`Docusaurus found broken links!\n\nPlease check the pages of your site in the list below, and make sure you don't reference any path that does not exist.\nNote: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.${getLayoutBrokenLinksHelpMessage()}` +
-        `\n\nExhaustive list of all broken links found:\n${Object.entries(allBrokenLinks)
-            .map(([pagePath, brokenLinks]) => pageBrokenLinksMessage(pagePath, brokenLinks))
-            .join('\n')}
-`);
+    return `Docusaurus found broken links!
+
+Please check the pages of your site in the list below, and make sure you don't reference any path that does not exist.
+Note: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.${getLayoutBrokenLinksHelpMessage()}
+
+Exhaustive list of all broken links found:
+${Object.entries(allBrokenLinks)
+        .map(([pagePath, brokenLinks]) => pageBrokenLinksMessage(pagePath, brokenLinks))
+        .join('\n')}
+`;
 }
 exports.getBrokenLinksErrorMessage = getBrokenLinksErrorMessage;
 async function isExistingFile(filePath) {
@@ -107,7 +121,7 @@ async function isExistingFile(filePath) {
 async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, }) {
     async function linkFileExists(link) {
         // /baseUrl/javadoc/ -> /outDir/javadoc
-        const baseFilePath = (0, utils_1.removeSuffix)(`${outDir}/${(0, utils_1.removePrefix)(link, baseUrl)}`, '/');
+        const baseFilePath = onlyPathname((0, utils_1.removeSuffix)(`${outDir}/${(0, utils_1.removePrefix)(link, baseUrl)}`, '/'));
         // -> /outDir/javadoc
         // -> /outDir/javadoc.html
         // -> /outDir/javadoc/index.html

package/lib/server/client-modules/index.js

@@ -7,6 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 function loadClientModules(plugins) {
-    return plugins.flatMap((plugin) => { var _a, _b; return (_b = (_a = plugin.getClientModules) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : []; });
+    return plugins.flatMap((plugin) => plugin.getClientModules?.() ?? []);
 }
 exports.default = loadClientModules;

package/lib/server/config.js

@@ -7,8 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
 const configValidation_1 = require("./configValidation");
 async function loadConfig(configPath) {
     if (!(await fs_extra_1.default.pathExists(configPath))) {

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

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const html_tags_1 = (0, tslib_1.__importDefault)(require("html-tags"));
-const void_1 = (0, tslib_1.__importDefault)(require("html-tags/void"));
-const escape_html_1 = (0, tslib_1.__importDefault)(require("escape-html"));
+const html_tags_1 = tslib_1.__importDefault(require("html-tags"));
+const void_1 = tslib_1.__importDefault(require("html-tags/void"));
+const escape_html_1 = tslib_1.__importDefault(require("escape-html"));
 function assertIsHtmlTagObject(val) {
     if (typeof val !== 'object' || !val) {
         throw new Error(`"${val}" is not a valid HTML tag object.`);

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

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

package/lib/server/i18n.js

@@ -8,12 +8,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localizePath = exports.loadI18n = exports.getDefaultLocaleConfig = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const rtl_detect_1 = require("rtl-detect");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function getDefaultLocaleLabel(locale) {
     const languageName = new Intl.DisplayNames(locale, { type: 'language' }).of(locale);
+    if (!languageName) {
+        return locale;
+    }
     return (languageName.charAt(0).toLocaleUpperCase(locale) + languageName.substring(1));
 }
 function getDefaultLocaleConfig(locale) {
@@ -25,9 +28,8 @@ function getDefaultLocaleConfig(locale) {
 }
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;
 async function loadI18n(config, options = {}) {
-    var _a;
     const { i18n: i18nConfig } = config;
-    const currentLocale = (_a = options.locale) !== null && _a !== void 0 ? _a : i18nConfig.defaultLocale;
+    const currentLocale = options.locale ?? i18nConfig.defaultLocale;
     if (!i18nConfig.locales.includes(currentLocale)) {
         logger_1.default.warn `The locale name=${currentLocale} was not found in your site configuration: Available locales are: ${i18nConfig.locales}
 Note: Docusaurus only support running one locale at a time.`;
@@ -51,10 +53,9 @@ Note: Docusaurus only support running one locale at a time.`;
 }
 exports.loadI18n = loadI18n;
 function localizePath({ pathType, path: originalPath, i18n, options = {}, }) {
-    var _a;
     const shouldLocalizePath = 
     // By default, we don't localize the path of defaultLocale
-    (_a = options.localizePath) !== null && _a !== void 0 ? _a : i18n.currentLocale !== i18n.defaultLocale;
+    options.localizePath ?? i18n.currentLocale !== i18n.defaultLocale;
     if (!shouldLocalizePath) {
         return originalPath;
     }

package/lib/server/index.js

@@ -9,25 +9,25 @@ 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 = (0, tslib_1.__importDefault)(require("path"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const ssr_html_template_1 = (0, tslib_1.__importDefault)(require("../webpack/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 path_1 = tslib_1.__importDefault(require("path"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const ssr_html_template_1 = tslib_1.__importDefault(require("../webpack/templates/ssr.html.template"));
+const client_modules_1 = tslib_1.__importDefault(require("./client-modules"));
+const config_1 = tslib_1.__importDefault(require("./config"));
 const plugins_1 = require("./plugins");
-const presets_1 = (0, tslib_1.__importDefault)(require("./presets"));
-const routes_1 = (0, tslib_1.__importDefault)(require("./routes"));
+const presets_1 = tslib_1.__importDefault(require("./presets"));
+const routes_1 = 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 = (0, tslib_1.__importDefault)(require("lodash"));
-const remark_admonitions_1 = (0, tslib_1.__importDefault)(require("remark-admonitions"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const remark_admonitions_1 = 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 : utils_1.DEFAULT_CONFIG_FILE_NAME;
+    const siteConfigPathUnresolved = customConfigFilePath ?? utils_1.DEFAULT_CONFIG_FILE_NAME;
     const siteConfigPath = path_1.default.isAbsolute(siteConfigPathUnresolved)
         ? siteConfigPathUnresolved
         : path_1.default.resolve(siteDir, siteConfigPathUnresolved);
@@ -36,7 +36,6 @@ async function loadSiteConfig({ siteDir, customConfigFilePath, }) {
 }
 exports.loadSiteConfig = loadSiteConfig;
 async function loadContext(siteDir, options = {}) {
-    var _a;
     const { customOutDir, locale, customConfigFilePath } = options;
     const generatedFilesDir = path_1.default.isAbsolute(utils_1.GENERATED_FILES_DIR_NAME)
         ? utils_1.GENERATED_FILES_DIR_NAME
@@ -63,10 +62,10 @@ async function loadContext(siteDir, options = {}) {
         pathType: 'fs',
     });
     const siteConfig = { ...initialSiteConfig, baseUrl };
-    const codeTranslationFileContent = (_a = (await (0, translations_1.readCodeTranslationFileContent)({
+    const codeTranslationFileContent = (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.default.mapValues(codeTranslationFileContent, (value) => value.message);
     return {
@@ -77,7 +76,7 @@ async function loadContext(siteDir, options = {}) {
         outDir,
         baseUrl,
         i18n,
-        ssrTemplate: ssrTemplate !== null && ssrTemplate !== void 0 ? ssrTemplate : ssr_html_template_1.default,
+        ssrTemplate: ssrTemplate ?? ssr_html_template_1.default,
         codeTranslations,
     };
 }
@@ -87,7 +86,6 @@ async function loadPluginConfigs(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);
         }
@@ -95,7 +93,7 @@ async function loadPluginConfigs(context) {
             typeof pluginConfig[0] === 'string') {
             return [
                 (0, moduleShorthand_1.resolveModuleName)(pluginConfig[0], require, pluginType),
-                (_a = pluginConfig[1]) !== null && _a !== void 0 ? _a : {},
+                pluginConfig[1] ?? {},
             ];
         }
         return pluginConfig;
@@ -167,8 +165,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
             // processed by content plugins mdx loaders. This works, but a bit
             // hacky... Not sure there's a way to handle that differently in webpack
             function getMDXFallbackExcludedPaths() {
-                var _a;
-                const rules = (_a = config === null || config === void 0 ? void 0 : config.module) === null || _a === void 0 ? void 0 : _a.rules;
+                const rules = config?.module?.rules;
                 return rules.flatMap((rule) => {
                     const isMDXRule = rule.test instanceof RegExp && rule.test.test('x.mdx');
                     return isMDXRule ? rule.include : [];
@@ -302,9 +299,8 @@ exports.load = load;
 function checkDocusaurusPackagesVersion(siteMetadata) {
     const { docusaurusVersion } = siteMetadata;
     Object.entries(siteMetadata.pluginVersions).forEach(([plugin, versionInfo]) => {
-        var _a;
         if (versionInfo.type === 'package' &&
-            ((_a = versionInfo.name) === null || _a === void 0 ? void 0 : _a.startsWith('@docusaurus/')) &&
+            versionInfo.name?.startsWith('@docusaurus/') &&
             versionInfo.version &&
             versionInfo.version !== docusaurusVersion) {
             // should we throw instead?

package/lib/server/plugins/index.js

@@ -9,13 +9,13 @@ 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 = (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 logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+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 logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const translations_1 = require("../translations/translations");
-const applyRouteTrailingSlash_1 = (0, tslib_1.__importDefault)(require("./applyRouteTrailingSlash"));
+const applyRouteTrailingSlash_1 = tslib_1.__importDefault(require("./applyRouteTrailingSlash"));
 function sortConfig(routeConfigs, baseUrl = '/') {
     // Sort the route config. This ensures that route with nested
     // routes is always placed last.
@@ -45,8 +45,7 @@ function sortConfig(routeConfigs, baseUrl = '/') {
         return a.path.localeCompare(b.path);
     });
     routeConfigs.forEach((routeConfig) => {
-        var _a;
-        (_a = routeConfig.routes) === null || _a === void 0 ? void 0 : _a.sort((a, b) => a.path.localeCompare(b.path));
+        routeConfig.routes?.sort((a, b) => a.path.localeCompare(b.path));
     });
 }
 exports.sortConfig = sortConfig;
@@ -65,10 +64,9 @@ async function loadPlugins({ pluginConfigs, context, }) {
         return { ...plugin, content };
     }));
     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, {
+        const translationFiles = (await contentLoadedPlugin?.getTranslationFiles?.({
             content: contentLoadedPlugin.content,
-        })))) !== null && _b !== void 0 ? _b : [];
+        })) ?? [];
         const localizedTranslationFiles = await Promise.all(translationFiles.map((translationFile) => (0, translations_1.localizePluginTranslationFile)({
             locale: context.i18n.currentLocale,
             siteDir: context.siteDir,
@@ -83,7 +81,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     const allContent = lodash_1.default.chain(loadedPlugins)
         .groupBy((item) => item.name)
         .mapValues((nameItems) => lodash_1.default.chain(nameItems)
-        .groupBy((item) => { var _a; return (_a = item.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID; })
+        .groupBy((item) => item.options.id ?? utils_1.DEFAULT_PLUGIN_ID)
         .mapValues((idItems) => idItems[0].content)
         .value())
         .value();
@@ -91,11 +89,10 @@ async function loadPlugins({ pluginConfigs, context, }) {
     const pluginsRouteConfigs = [];
     const globalData = {};
     await Promise.all(contentLoadedTranslatedPlugins.map(async ({ content, translationFiles, ...plugin }) => {
-        var _a, _b, _c;
         if (!plugin.contentLoaded) {
             return;
         }
-        const pluginId = (_a = plugin.options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID;
+        const pluginId = plugin.options.id ?? 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);
@@ -117,8 +114,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
         // - by plugin name
         // - by plugin id (allow using multiple instances of the same plugin)
         const setGlobalData = (data) => {
-            var _a;
-            globalData[plugin.name] = (_a = globalData[plugin.name]) !== null && _a !== void 0 ? _a : {};
+            globalData[plugin.name] = globalData[plugin.name] ?? {};
             globalData[plugin.name][pluginId] = data;
         };
         const actions = {
@@ -126,7 +122,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
             createData,
             setGlobalData,
         };
-        const translatedContent = (_c = (_b = plugin.translateContent) === null || _b === void 0 ? void 0 : _b.call(plugin, { content, translationFiles })) !== null && _c !== void 0 ? _c : content;
+        const translatedContent = plugin.translateContent?.({ content, translationFiles }) ?? content;
         await plugin.contentLoaded({
             content: translatedContent,
             actions,
@@ -153,8 +149,7 @@ async function loadPlugins({ pluginConfigs, context, }) {
     // Apply each plugin one after the other to translate the theme config
     function translateThemeConfig(untranslatedThemeConfig) {
         return contentLoadedTranslatedPlugins.reduce((currentThemeConfig, plugin) => {
-            var _a;
-            const translatedThemeConfigSlice = (_a = plugin.translateThemeConfig) === null || _a === void 0 ? void 0 : _a.call(plugin, {
+            const translatedThemeConfigSlice = plugin.translateThemeConfig?.({
                 themeConfig: currentThemeConfig,
                 translationFiles: plugin.translationFiles,
             });

package/lib/server/plugins/init.js

@@ -9,20 +9,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePluginConfigs = void 0;
 const tslib_1 = require("tslib");
 const module_1 = require("module");
-const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
+const import_fresh_1 = 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");
 async function normalizePluginConfig(pluginConfig, pluginRequire) {
-    var _a, _b, _c, _d;
     // plugins: ['./plugin']
     if (typeof pluginConfig === 'string') {
         const pluginModuleImport = pluginConfig;
         const pluginPath = pluginRequire.resolve(pluginModuleImport);
         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,
@@ -46,8 +45,8 @@ async function normalizePluginConfig(pluginConfig, pluginRequire) {
             const pluginPath = pluginRequire.resolve(pluginModuleImport);
             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,
@@ -60,7 +59,7 @@ async 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] ?? {},
             };
         }
     }
@@ -71,18 +70,18 @@ async function normalizePluginConfigs(pluginConfigs, 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);
+        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);
+        return (normalizedPluginConfig.pluginModule.module.default?.validateThemeConfig ??
+            normalizedPluginConfig.pluginModule.module.validateThemeConfig);
     }
     return normalizedPluginConfig.plugin.validateThemeConfig;
 }
@@ -92,10 +91,9 @@ async function initPlugins({ pluginConfigs, context, }) {
     const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const pluginConfigsNormalized = await normalizePluginConfigs(pluginConfigs, pluginRequire);
     async 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);
+        if (normalizedPluginConfig.pluginModule?.path) {
+            const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule?.path);
             return (0, versions_1.getPluginVersion)(pluginPath, context.siteDir);
         }
         return { type: 'local' };
@@ -111,7 +109,6 @@ async function initPlugins({ pluginConfigs, context, }) {
         return context.siteConfig.themeConfig;
     }
     function doValidatePluginOptions(normalizedPluginConfig) {
-        var _a;
         const validateOptions = getOptionValidationFunction(normalizedPluginConfig);
         if (validateOptions) {
             return validateOptions({
@@ -123,7 +120,7 @@ async 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 : utils_1.DEFAULT_PLUGIN_ID,
+            id: normalizedPluginConfig.options.id ?? utils_1.DEFAULT_PLUGIN_ID,
         };
     }
     async function initializePlugin(normalizedPluginConfig) {

package/lib/server/plugins/pluginIds.js

@@ -8,14 +8,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureUniquePluginInstanceIds = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+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.default.groupBy(plugins, (p) => p.name);
     Object.entries(pluginsByName).forEach(([pluginName, pluginInstances]) => {
-        const pluginInstancesById = lodash_1.default.groupBy(pluginInstances, (p) => { var _a; return (_a = p.options.id) !== null && _a !== void 0 ? _a : utils_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.${pluginId === utils_1.DEFAULT_PLUGIN_ID

package/lib/server/presets/index.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const module_1 = require("module");
-const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
+const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
 const moduleShorthand_1 = require("../moduleShorthand");
 async function loadPresets(context) {
     // We need to resolve presets from the perspective of the siteDir, since the
@@ -18,7 +18,6 @@ async function loadPresets(context) {
     const unflatPlugins = [];
     const unflatThemes = [];
     presets.forEach((presetItem) => {
-        var _a;
         let presetModuleImport;
         let presetOptions = {};
         if (typeof presetItem === 'string') {
@@ -32,7 +31,7 @@ async function loadPresets(context) {
         }
         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);
+        const preset = (presetModule.default ?? presetModule)(context, presetOptions);
         if (preset.plugins) {
             unflatPlugins.push(preset.plugins);
         }

package/lib/server/routes.js

@@ -45,15 +45,13 @@ const RoutesImportsCode = [
     `import ComponentCreator from '@docusaurus/ComponentCreator';`,
 ].join('\n');
 function isModule(value) {
-    var _a, _b;
     if (typeof value === 'string') {
         return true;
     }
     if (typeof value === 'object' &&
-        (
         // eslint-disable-next-line no-underscore-dangle
-        (_a = value) === null || _a === void 0 ? void 0 : _a.__import) &&
-        ((_b = value) === null || _b === void 0 ? void 0 : _b.path)) {
+        value?.__import &&
+        value?.path) {
         return true;
     }
     return false;
@@ -96,7 +94,7 @@ ${JSON.stringify(routeConfig)}`);
             routePath: routeConfig.path.replace(/'/g, "\\'"),
             routeHash,
             exact,
-            subroutesCodeStrings: subroutes === null || subroutes === void 0 ? void 0 : subroutes.map(generateRouteCode),
+            subroutesCodeStrings: subroutes?.map(generateRouteCode),
             props,
         });
     }

package/lib/server/themes/alias.js

@@ -8,10 +8,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortAliases = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+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 = (0, tslib_1.__importDefault)(require("lodash"));
+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

package/lib/server/themes/index.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPluginsThemeAliases = exports.loadThemeAliases = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
-const alias_1 = (0, tslib_1.__importStar)(require("./alias"));
+const alias_1 = tslib_1.__importStar(require("./alias"));
 const ThemeFallbackDir = path_1.default.resolve(__dirname, '../../client/theme-fallback');
 async function loadThemeAliases(themePaths, userThemePaths) {
     const aliases = {};