@docusaurus/core 0.0.0-5872 → 0.0.0-5878

package/lib/commands/build.js

@@ -41,17 +41,13 @@ forceTerminate = true) {
     ['SIGINT', 'SIGTERM'].forEach((sig) => {
         process.on(sig, () => process.exit());
     });
-    async function tryToBuildLocale({ locale, isLastLocale, }) {
+    async function tryToBuildLocale({ locale }) {
         try {
-            utils_3.PerfLogger.start(`Building site for locale ${locale}`);
-            await buildLocale({
+            await utils_3.PerfLogger.async(`${logger_1.default.name(locale)}`, () => buildLocale({
                 siteDir,
                 locale,
                 cliOptions,
-                forceTerminate,
-                isLastLocale,
-            });
-            utils_3.PerfLogger.end(`Building site for locale ${locale}`);
+            }));
         }
         catch (err) {
             throw new Error(logger_1.default.interpolate `Unable to build website for locale name=${locale}.`, {
@@ -59,18 +55,21 @@ forceTerminate = true) {
             });
         }
     }
-    utils_3.PerfLogger.start(`Get locales to build`);
-    const locales = await getLocalesToBuild({ siteDir, cliOptions });
-    utils_3.PerfLogger.end(`Get locales to build`);
+    const locales = await utils_3.PerfLogger.async('Get locales to build', () => getLocalesToBuild({ siteDir, cliOptions }));
     if (locales.length > 1) {
         logger_1.default.info `Website will be built for all these locales: ${locales}`;
     }
-    utils_3.PerfLogger.start(`Building ${locales.length} locales`);
-    await (0, utils_1.mapAsyncSequential)(locales, (locale) => {
+    await utils_3.PerfLogger.async(`Build`, () => (0, utils_1.mapAsyncSequential)(locales, async (locale) => {
         const isLastLocale = locales.indexOf(locale) === locales.length - 1;
-        return tryToBuildLocale({ locale, isLastLocale });
-    });
-    utils_3.PerfLogger.end(`Building ${locales.length} locales`);
+        await tryToBuildLocale({ locale });
+        if (isLastLocale) {
+            logger_1.default.info `Use code=${'npm run serve'} command to test your build locally.`;
+        }
+        // TODO do we really need this historical forceTerminate exit???
+        if (forceTerminate && isLastLocale && !cliOptions.bundleAnalyzer) {
+            process.exit(0);
+        }
+    }));
 }
 exports.build = build;
 async function getLocalesToBuild({ siteDir, cliOptions, }) {
@@ -97,26 +96,23 @@ async function getLocalesToBuild({ siteDir, cliOptions, }) {
         ...i18n.locales.filter((locale) => locale !== i18n.defaultLocale),
     ];
 }
-async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLastLocale, }) {
+async function buildLocale({ siteDir, locale, cliOptions, }) {
     // Temporary workaround to unlock the ability to translate the site config
     // We'll remove it if a better official API can be designed
     // See https://github.com/facebook/docusaurus/issues/4542
     process.env.DOCUSAURUS_CURRENT_LOCALE = locale;
     logger_1.default.info `name=${`[${locale}]`} Creating an optimized production build...`;
-    utils_3.PerfLogger.start('Loading site');
-    const site = await (0, site_1.loadSite)({
+    const site = await utils_3.PerfLogger.async('Load site', () => (0, site_1.loadSite)({
         siteDir,
         outDir: cliOptions.outDir,
         config: cliOptions.config,
         locale,
         localizePath: cliOptions.locale ? false : undefined,
-    });
-    utils_3.PerfLogger.end('Loading site');
+    }));
     const { props } = site;
     const { outDir, plugins } = props;
     // We can build the 2 configs in parallel
-    utils_3.PerfLogger.start('Creating webpack configs');
-    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await Promise.all([
+    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await utils_3.PerfLogger.async('Creating webpack configs', () => Promise.all([
         getBuildClientConfig({
             props,
             cliOptions,
@@ -124,60 +120,30 @@ async function buildLocale({ siteDir, locale, cliOptions, forceTerminate, isLast
         getBuildServerConfig({
             props,
         }),
-    ]);
-    utils_3.PerfLogger.end('Creating webpack configs');
-    // Make sure generated client-manifest is cleaned first, so we don't reuse
-    // the one from previous builds.
-    // TODO do we really need this? .docusaurus folder is cleaned between builds
-    utils_3.PerfLogger.start('Deleting previous client manifest');
-    await ensureUnlink(clientManifestPath);
-    utils_3.PerfLogger.end('Deleting previous client manifest');
+    ]));
     // Run webpack to build JS bundle (client) and static html files (server).
-    utils_3.PerfLogger.start('Bundling');
-    await (0, utils_2.compile)([clientConfig, serverConfig]);
-    utils_3.PerfLogger.end('Bundling');
-    utils_3.PerfLogger.start('Executing static site generation');
-    const { collectedData } = await executeSSG({
+    await utils_3.PerfLogger.async('Bundling with Webpack', () => (0, utils_2.compile)([clientConfig, serverConfig]));
+    const { collectedData } = await utils_3.PerfLogger.async('SSG', () => executeSSG({
         props,
         serverBundlePath,
         clientManifestPath,
-    });
-    utils_3.PerfLogger.end('Executing static site generation');
+    }));
     // Remove server.bundle.js because it is not needed.
-    utils_3.PerfLogger.start('Deleting server bundle');
-    await ensureUnlink(serverBundlePath);
-    utils_3.PerfLogger.end('Deleting server bundle');
+    await utils_3.PerfLogger.async('Deleting server bundle', () => ensureUnlink(serverBundlePath));
     // Plugin Lifecycle - postBuild.
-    utils_3.PerfLogger.start('Executing postBuild()');
-    await executePluginsPostBuild({ plugins, props, collectedData });
-    utils_3.PerfLogger.end('Executing postBuild()');
+    await utils_3.PerfLogger.async('postBuild()', () => executePluginsPostBuild({ plugins, props, collectedData }));
     // TODO execute this in parallel to postBuild?
-    utils_3.PerfLogger.start('Executing broken links checker');
-    await executeBrokenLinksCheck({ props, collectedData });
-    utils_3.PerfLogger.end('Executing broken links checker');
+    await utils_3.PerfLogger.async('Broken links checker', () => executeBrokenLinksCheck({ props, collectedData }));
     logger_1.default.success `Generated static files in path=${path_1.default.relative(process.cwd(), outDir)}.`;
-    if (isLastLocale) {
-        logger_1.default.info `Use code=${'npm run serve'} command to test your build locally.`;
-    }
-    if (forceTerminate && isLastLocale && !cliOptions.bundleAnalyzer) {
-        process.exit(0);
-    }
     return outDir;
 }
 async function executeSSG({ props, serverBundlePath, clientManifestPath, }) {
-    utils_3.PerfLogger.start('Reading client manifest');
-    const manifest = await fs_extra_1.default.readJSON(clientManifestPath, 'utf-8');
-    utils_3.PerfLogger.end('Reading client manifest');
-    utils_3.PerfLogger.start('Compiling SSR template');
-    const ssrTemplate = await (0, templates_1.compileSSRTemplate)(props.siteConfig.ssrTemplate ?? ssr_html_template_1.default);
-    utils_3.PerfLogger.end('Compiling SSR template');
-    utils_3.PerfLogger.start('Loading App renderer');
-    const renderer = await (0, ssg_1.loadAppRenderer)({
+    const manifest = await utils_3.PerfLogger.async('Read client manifest', () => fs_extra_1.default.readJSON(clientManifestPath, 'utf-8'));
+    const ssrTemplate = await utils_3.PerfLogger.async('Compile SSR template', () => (0, templates_1.compileSSRTemplate)(props.siteConfig.ssrTemplate ?? ssr_html_template_1.default));
+    const renderer = await utils_3.PerfLogger.async('Load App renderer', () => (0, ssg_1.loadAppRenderer)({
         serverBundlePath,
-    });
-    utils_3.PerfLogger.end('Loading App renderer');
-    utils_3.PerfLogger.start('Generate static files');
-    const ssgResult = await (0, ssg_1.generateStaticFiles)({
+    }));
+    const ssgResult = await utils_3.PerfLogger.async('Generate static files', () => (0, ssg_1.generateStaticFiles)({
         pathnames: props.routesPaths,
         renderer,
         params: {
@@ -192,8 +158,7 @@ async function executeSSG({ props, serverBundlePath, clientManifestPath, }) {
             noIndex: props.siteConfig.noIndex,
             DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
         },
-    });
-    utils_3.PerfLogger.end('Generate static files');
+    }));
     return ssgResult;
 }
 async function executePluginsPostBuild({ plugins, props, collectedData, }) {

package/lib/commands/start/utils.js

@@ -16,6 +16,7 @@ const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const getHostPort_1 = require("../../server/getHostPort");
 const utils_2 = require("../../utils");
 const site_1 = require("../../server/site");
+const pluginsUtils_1 = require("../../server/plugins/pluginsUtils");
 async function createOpenUrlContext({ cliOptions, }) {
     const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
     const { host, port } = await (0, getHostPort_1.getHostPort)(cliOptions);
@@ -41,10 +42,8 @@ async function createLoadSiteParams({ siteDirParam, cliOptions, }) {
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 async function createReloadableSite(startParams) {
     const openUrlContext = await createOpenUrlContext(startParams);
-    let site = await utils_2.PerfLogger.async('Loading site', async () => {
-        const params = await createLoadSiteParams(startParams);
-        return (0, site_1.loadSite)(params);
-    });
+    const loadSiteParams = await utils_2.PerfLogger.async('createLoadSiteParams', () => createLoadSiteParams(startParams));
+    let site = await utils_2.PerfLogger.async('Load site', () => (0, site_1.loadSite)(loadSiteParams));
     const get = () => site;
     const getOpenUrl = () => openUrlContext.getOpenUrl({
         baseUrl: site.props.baseUrl,
@@ -56,7 +55,7 @@ async function createReloadableSite(startParams) {
     const reloadBase = async () => {
         try {
             const oldSite = site;
-            site = await utils_2.PerfLogger.async('Reloading site', () => (0, site_1.reloadSite)(site));
+            site = await utils_2.PerfLogger.async('Reload site', () => (0, site_1.reloadSite)(site));
             if (oldSite.props.baseUrl !== site.props.baseUrl) {
                 printOpenUrlMessage();
             }
@@ -73,13 +72,13 @@ async function createReloadableSite(startParams) {
     //  but we should still support it and probably use a task queuing system
     const reloadPlugin = async (plugin) => {
         try {
-            site = await utils_2.PerfLogger.async(`Reloading site plugin ${plugin.name}@${plugin.options.id}`, () => {
+            site = await utils_2.PerfLogger.async(`Reload site plugin ${(0, pluginsUtils_1.formatPluginName)(plugin)}`, () => {
                 const pluginIdentifier = { name: plugin.name, id: plugin.options.id };
                 return (0, site_1.reloadSitePlugin)(site, pluginIdentifier);
             });
         }
         catch (e) {
-            logger_1.default.error(`Site plugin reload failure - Plugin ${plugin.name}@${plugin.options.id}`);
+            logger_1.default.error(`Site plugin reload failure - Plugin ${(0, pluginsUtils_1.formatPluginName)(plugin)}`);
             console.error(e);
         }
     };

package/lib/commands/writeTranslations.js

@@ -72,7 +72,7 @@ Available locales are: ${context.i18n.locales.join(',')}.`);
         babelOptions: await (0, utils_1.getCustomBabelConfigFilePath)(siteDir),
     });
     const extractedCodeTranslations = await (0, translationsExtractor_1.extractSiteSourceCodeTranslations)(siteDir, plugins, babelOptions, await getExtraSourceCodeFilePaths());
-    const defaultCodeMessages = await (0, translations_1.getPluginsDefaultCodeTranslationMessages)(plugins);
+    const defaultCodeMessages = await (0, translations_1.loadPluginsDefaultCodeTranslationMessages)(plugins);
     const codeTranslations = (0, translations_1.applyDefaultCodeTranslations)({
         extractedCodeTranslations,
         defaultCodeMessages,

package/lib/server/clientModules.d.ts

@@ -9,4 +9,4 @@ import type { LoadedPlugin } from '@docusaurus/types';
  * Runs the `getClientModules` lifecycle. The returned file paths are all
  * absolute.
  */
-export declare function loadClientModules(plugins: LoadedPlugin[]): string[];
+export declare function getAllClientModules(plugins: LoadedPlugin[]): string[];

package/lib/server/clientModules.js

@@ -6,15 +6,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadClientModules = void 0;
+exports.getAllClientModules = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 /**
  * Runs the `getClientModules` lifecycle. The returned file paths are all
  * absolute.
  */
-function loadClientModules(plugins) {
+function getAllClientModules(plugins) {
     return plugins.flatMap((plugin) => plugin.getClientModules?.().map((p) => path_1.default.resolve(plugin.path, p)) ??
         []);
 }
-exports.loadClientModules = loadClientModules;
+exports.getAllClientModules = getAllClientModules;

package/lib/server/plugins/actions.js

@@ -24,6 +24,7 @@ async function createPluginActionsUtils({ plugin, generatedFilesDir, baseUrl, tr
         id: pluginId,
     };
     const pluginRouteContextModulePath = path_1.default.join(dataDir, `${(0, utils_1.docuHash)('pluginRouteContextModule')}.json`);
+    // TODO not ideal place to generate that file
     await (0, utils_1.generate)('/', pluginRouteContextModulePath, JSON.stringify(pluginRouteContext, null, 2));
     const routes = [];
     let globalData;

package/lib/server/plugins/init.js

@@ -40,10 +40,10 @@ async function initPlugins(context) {
     // we are using `require.resolve` on those module names.
     const pluginRequire = (0, module_1.createRequire)(context.siteConfigPath);
     const pluginConfigs = await (0, configs_1.loadPluginConfigs)(context);
-    async function doGetPluginVersion(normalizedPluginConfig) {
+    async function doLoadPluginVersion(normalizedPluginConfig) {
         if (normalizedPluginConfig.pluginModule?.path) {
             const pluginPath = pluginRequire.resolve(normalizedPluginConfig.pluginModule.path);
-            return (0, siteMetadata_1.getPluginVersion)(pluginPath, context.siteDir);
+            return (0, siteMetadata_1.loadPluginVersion)(pluginPath, context.siteDir);
         }
         return { type: 'local' };
     }
@@ -73,7 +73,7 @@ async function initPlugins(context) {
         };
     }
     async function initializePlugin(normalizedPluginConfig) {
-        const pluginVersion = await doGetPluginVersion(normalizedPluginConfig);
+        const pluginVersion = await doLoadPluginVersion(normalizedPluginConfig);
         const pluginOptions = doValidatePluginOptions(normalizedPluginConfig);
         // Side-effect: merge the normalized theme config in the original one
         context.siteConfig.themeConfig = {

package/lib/server/plugins/plugins.js

@@ -34,17 +34,19 @@ async function translatePluginContent({ plugin, content, context, }) {
     return translatedContent;
 }
 async function executePluginContentLoading({ plugin, context, }) {
-    return utils_1.PerfLogger.async(`Plugins - single plugin content loading - ${plugin.name}@${plugin.options.id}`, async () => {
-        let content = await plugin.loadContent?.();
-        content = await translatePluginContent({
+    return utils_1.PerfLogger.async(`Load ${(0, pluginsUtils_1.formatPluginName)(plugin)}`, async () => {
+        let content = await utils_1.PerfLogger.async('loadContent()', () => plugin.loadContent?.());
+        content = await utils_1.PerfLogger.async('translatePluginContent()', () => translatePluginContent({
             plugin,
             content,
             context,
-        });
+        }));
+        const defaultCodeTranslations = (await utils_1.PerfLogger.async('getDefaultCodeTranslationMessages()', () => plugin.getDefaultCodeTranslationMessages?.())) ?? {};
         if (!plugin.contentLoaded) {
             return {
                 ...plugin,
                 content,
+                defaultCodeTranslations,
                 routes: [],
                 globalData: undefined,
             };
@@ -55,25 +57,28 @@ async function executePluginContentLoading({ plugin, context, }) {
             baseUrl: context.siteConfig.baseUrl,
             trailingSlash: context.siteConfig.trailingSlash,
         });
-        await plugin.contentLoaded({
+        await utils_1.PerfLogger.async('contentLoaded()', () => 
+        // @ts-expect-error: should autofix with TS 5.4
+        plugin.contentLoaded({
             content,
             actions: pluginActionsUtils.getActions(),
-        });
+        }));
         return {
             ...plugin,
             content,
+            defaultCodeTranslations,
             routes: pluginActionsUtils.getRoutes(),
             globalData: pluginActionsUtils.getGlobalData(),
         };
     });
 }
 async function executeAllPluginsContentLoading({ plugins, context, }) {
-    return utils_1.PerfLogger.async(`Plugins - all plugins content loading`, () => {
+    return utils_1.PerfLogger.async(`Load plugins content`, () => {
         return Promise.all(plugins.map((plugin) => executePluginContentLoading({ plugin, context })));
     });
 }
 async function executePluginAllContentLoaded({ plugin, context, allContent, }) {
-    return utils_1.PerfLogger.async(`Plugins - allContentLoaded - ${plugin.name}@${plugin.options.id}`, async () => {
+    return utils_1.PerfLogger.async(`allContentLoaded() - ${(0, pluginsUtils_1.formatPluginName)(plugin)}`, async () => {
         if (!plugin.allContentLoaded) {
             return { routes: [], globalData: undefined };
         }
@@ -94,7 +99,7 @@ async function executePluginAllContentLoaded({ plugin, context, allContent, }) {
     });
 }
 async function executeAllPluginsAllContentLoaded({ plugins, context, }) {
-    return utils_1.PerfLogger.async(`Plugins - allContentLoaded`, async () => {
+    return utils_1.PerfLogger.async(`allContentLoaded()`, async () => {
         const allContent = (0, pluginsUtils_1.aggregateAllContent)(plugins);
         const routes = [];
         const globalData = {};
@@ -114,6 +119,9 @@ async function executeAllPluginsAllContentLoaded({ plugins, context, }) {
         return { routes, globalData };
     });
 }
+// This merges plugins routes and global data created from both lifecycles:
+// - contentLoaded()
+// - allContentLoaded()
 function mergeResults({ plugins, allContentLoadedResult, }) {
     const routes = [
         ...(0, pluginsUtils_1.aggregateRoutes)(plugins),
@@ -127,8 +135,8 @@ function mergeResults({ plugins, allContentLoadedResult, }) {
  * Initializes the plugins and run their lifecycle functions.
  */
 async function loadPlugins(context) {
-    return utils_1.PerfLogger.async('Plugins - loadPlugins', async () => {
-        const initializedPlugins = await utils_1.PerfLogger.async('Plugins - initPlugins', () => (0, init_1.initPlugins)(context));
+    return utils_1.PerfLogger.async('Load plugins', async () => {
+        const initializedPlugins = await utils_1.PerfLogger.async('Init plugins', () => (0, init_1.initPlugins)(context));
         // TODO probably not the ideal place to hardcode those plugins
         initializedPlugins.push((0, synthetic_1.createBootstrapPlugin)(context), (0, synthetic_1.createMDXFallbackPlugin)(context));
         const plugins = await executeAllPluginsContentLoading({
@@ -148,7 +156,7 @@ async function loadPlugins(context) {
 }
 exports.loadPlugins = loadPlugins;
 async function reloadPlugin({ pluginIdentifier, plugins: previousPlugins, context, }) {
-    return utils_1.PerfLogger.async('Plugins - reloadPlugin', async () => {
+    return utils_1.PerfLogger.async(`Reload plugin ${(0, pluginsUtils_1.formatPluginName)(pluginIdentifier)}`, async () => {
         const previousPlugin = (0, pluginsUtils_1.getPluginByIdentifier)({
             plugins: previousPlugins,
             pluginIdentifier,
@@ -158,12 +166,12 @@ async function reloadPlugin({ pluginIdentifier, plugins: previousPlugins, contex
             context,
         });
         /*
-        // TODO Docusaurus v4 - upgrade to Node 20, use array.with()
-        const plugins = previousPlugins.with(
-          previousPlugins.indexOf(previousPlugin),
-          plugin,
-        );
-         */
+      // TODO Docusaurus v4 - upgrade to Node 20, use array.with()
+      const plugins = previousPlugins.with(
+        previousPlugins.indexOf(previousPlugin),
+        plugin,
+      );
+       */
         const plugins = [...previousPlugins];
         plugins[previousPlugins.indexOf(previousPlugin)] = plugin;
         const allContentLoadedResult = await executeAllPluginsAllContentLoaded({

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

@@ -13,3 +13,4 @@ export declare function aggregateAllContent(loadedPlugins: LoadedPlugin[]): AllC
 export declare function aggregateRoutes(loadedPlugins: LoadedPlugin[]): RouteConfig[];
 export declare function aggregateGlobalData(loadedPlugins: LoadedPlugin[]): GlobalData;
 export declare function mergeGlobalData(...globalDataList: GlobalData[]): GlobalData;
+export declare function formatPluginName(plugin: InitializedPlugin | PluginIdentifier): string;

package/lib/server/plugins/pluginsUtils.js

@@ -6,14 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeGlobalData = exports.aggregateGlobalData = exports.aggregateRoutes = exports.aggregateAllContent = exports.getPluginByIdentifier = void 0;
+exports.formatPluginName = exports.mergeGlobalData = exports.aggregateGlobalData = exports.aggregateRoutes = exports.aggregateAllContent = exports.getPluginByIdentifier = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function getPluginByIdentifier({ plugins, pluginIdentifier, }) {
     const plugin = plugins.find((p) => p.name === pluginIdentifier.name && p.options.id === pluginIdentifier.id);
     if (!plugin) {
-        throw new Error(logger_1.default.interpolate `Plugin not found for identifier ${pluginIdentifier.name}@${pluginIdentifier.id}`);
+        throw new Error(logger_1.default.interpolate `Plugin not found for identifier ${formatPluginName(pluginIdentifier)}`);
     }
     return plugin;
 }
@@ -58,3 +58,18 @@ function mergeGlobalData(...globalDataList) {
     return result;
 }
 exports.mergeGlobalData = mergeGlobalData;
+// This is primarily useful for colored logging purpose
+// Do not rely on this for logic
+function formatPluginName(plugin) {
+    let formattedName = plugin.name;
+    // Hacky way to reduce string size for logging purpose
+    formattedName = formattedName.replace('docusaurus-plugin-content-', '');
+    formattedName = formattedName.replace('docusaurus-plugin-', '');
+    formattedName = formattedName.replace('docusaurus-theme-', '');
+    formattedName = formattedName.replace('-plugin', '');
+    formattedName = logger_1.default.name(formattedName);
+    const id = 'id' in plugin ? plugin.id : plugin.options.id;
+    const formattedId = logger_1.default.subdue(id);
+    return `${formattedName}@${formattedId}`;
+}
+exports.formatPluginName = formatPluginName;

package/lib/server/site.js

@@ -30,9 +30,12 @@ const routes_1 = require("./routes");
 async function loadContext(params) {
     const { siteDir, outDir: baseOutDir = utils_1.DEFAULT_BUILD_DIR_NAME, locale, config: customConfigFilePath, } = params;
     const generatedFilesDir = path_1.default.resolve(siteDir, utils_1.GENERATED_FILES_DIR_NAME);
-    const { siteConfig: initialSiteConfig, siteConfigPath } = await (0, config_1.loadSiteConfig)({
-        siteDir,
-        customConfigFilePath,
+    const { siteVersion, loadSiteConfig: { siteConfig: initialSiteConfig, siteConfigPath }, } = await (0, combine_promises_1.default)({
+        siteVersion: (0, siteMetadata_1.loadSiteVersion)(siteDir),
+        loadSiteConfig: (0, config_1.loadSiteConfig)({
+            siteDir,
+            customConfigFilePath,
+        }),
     });
     const i18n = await (0, i18n_1.loadI18n)(initialSiteConfig, { locale });
     const baseUrl = (0, utils_1.localizePath)({
@@ -52,6 +55,7 @@ async function loadContext(params) {
     const codeTranslations = await (0, translations_1.loadSiteCodeTranslations)({ localizationDir });
     return {
         siteDir,
+        siteVersion,
         generatedFilesDir,
         localizationDir,
         siteConfig,
@@ -63,24 +67,22 @@ async function loadContext(params) {
     };
 }
 exports.loadContext = loadContext;
-async function createSiteProps(params) {
+function createSiteProps(params) {
     const { plugins, routes, context } = params;
-    const { generatedFilesDir, siteDir, siteConfig, siteConfigPath, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, } = context;
+    const { generatedFilesDir, siteDir, siteVersion, siteConfig, siteConfigPath, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, } = context;
     const { headTags, preBodyTags, postBodyTags } = (0, htmlTags_1.loadHtmlTags)(plugins);
-    const { codeTranslations, siteMetadata } = await (0, combine_promises_1.default)({
-        // TODO code translations should be loaded as part of LoadedPlugin?
-        codeTranslations: utils_2.PerfLogger.async('Load - loadCodeTranslations', async () => ({
-            ...(await (0, translations_1.getPluginsDefaultCodeTranslationMessages)(plugins)),
-            ...siteCodeTranslations,
-        })),
-        siteMetadata: utils_2.PerfLogger.async('Load - loadSiteMetadata', () => (0, siteMetadata_1.loadSiteMetadata)({ plugins, siteDir })),
-    });
+    const siteMetadata = (0, siteMetadata_1.createSiteMetadata)({ plugins, siteVersion });
+    const codeTranslations = {
+        ...(0, translations_1.getPluginsDefaultCodeTranslations)({ plugins }),
+        ...siteCodeTranslations,
+    };
     (0, routes_1.handleDuplicateRoutes)(routes, siteConfig.onDuplicateRoutes);
     const routesPaths = (0, routes_1.getRoutesPaths)(routes, baseUrl);
     return {
         siteConfig,
         siteConfigPath,
         siteMetadata,
+        siteVersion,
         siteDir,
         outDir,
         baseUrl,
@@ -98,9 +100,9 @@ async function createSiteProps(params) {
 }
 // TODO global data should be part of site props?
 async function createSiteFiles({ site, globalData, }) {
-    return utils_2.PerfLogger.async('Load - createSiteFiles', async () => {
+    return utils_2.PerfLogger.async('Create site files', async () => {
         const { props: { plugins, generatedFilesDir, siteConfig, siteMetadata, i18n, codeTranslations, routes, baseUrl, }, } = site;
-        const clientModules = (0, clientModules_1.loadClientModules)(plugins);
+        const clientModules = (0, clientModules_1.getAllClientModules)(plugins);
         await (0, codegen_1.generateSiteFiles)({
             generatedFilesDir,
             clientModules,
@@ -121,12 +123,8 @@ async function createSiteFiles({ site, globalData, }) {
  * it generates temp files in the `.docusaurus` folder for the bundler.
  */
 async function loadSite(params) {
-    utils_2.PerfLogger.start('Load - loadContext');
-    const context = await loadContext(params);
-    utils_2.PerfLogger.end('Load - loadContext');
-    utils_2.PerfLogger.start('Load - loadPlugins');
+    const context = await utils_2.PerfLogger.async('Load context', () => loadContext(params));
     const { plugins, routes, globalData } = await (0, plugins_1.loadPlugins)(context);
-    utils_2.PerfLogger.end('Load - loadPlugins');
     const props = await createSiteProps({ plugins, routes, globalData, context });
     const site = { props, params };
     await createSiteFiles({

package/lib/server/siteMetadata.d.ts

@@ -5,8 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { LoadedPlugin, PluginVersionInformation, SiteMetadata } from '@docusaurus/types';
-export declare function getPluginVersion(pluginPath: string, siteDir: string): Promise<PluginVersionInformation>;
-export declare function loadSiteMetadata({ plugins, siteDir, }: {
+export declare function loadSiteVersion(siteDir: string): Promise<string | undefined>;
+export declare function loadPluginVersion(pluginPath: string, siteDir: string): Promise<PluginVersionInformation>;
+export declare function createSiteMetadata({ siteVersion, plugins, }: {
+    siteVersion: string | undefined;
     plugins: LoadedPlugin[];
-    siteDir: string;
-}): Promise<SiteMetadata>;
+}): SiteMetadata;

package/lib/server/siteMetadata.js

@@ -6,23 +6,27 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSiteMetadata = exports.getPluginVersion = void 0;
+exports.createSiteMetadata = exports.loadPluginVersion = exports.loadSiteVersion = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
-async function getPackageJsonVersion(packageJsonPath) {
+async function loadPackageJsonVersion(packageJsonPath) {
     if (await fs_extra_1.default.pathExists(packageJsonPath)) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
         return require(packageJsonPath).version;
     }
     return undefined;
 }
-async function getPackageJsonName(packageJsonPath) {
+async function loadPackageJsonName(packageJsonPath) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
     return require(packageJsonPath).name;
 }
-async function getPluginVersion(pluginPath, siteDir) {
+async function loadSiteVersion(siteDir) {
+    return loadPackageJsonVersion(path_1.default.join(siteDir, 'package.json'));
+}
+exports.loadSiteVersion = loadSiteVersion;
+async function loadPluginVersion(pluginPath, siteDir) {
     let potentialPluginPackageJsonDirectory = path_1.default.dirname(pluginPath);
     while (potentialPluginPackageJsonDirectory !== '/') {
         const packageJsonPath = path_1.default.join(potentialPluginPackageJsonDirectory, 'package.json');
@@ -35,8 +39,8 @@ async function getPluginVersion(pluginPath, siteDir) {
             }
             return {
                 type: 'package',
-                name: await getPackageJsonName(packageJsonPath),
-                version: await getPackageJsonVersion(packageJsonPath),
+                name: await loadPackageJsonName(packageJsonPath),
+                version: await loadPackageJsonVersion(packageJsonPath),
             };
         }
         potentialPluginPackageJsonDirectory = path_1.default.dirname(potentialPluginPackageJsonDirectory);
@@ -46,7 +50,7 @@ async function getPluginVersion(pluginPath, siteDir) {
     // script in the parent directory of the site.
     return { type: 'local' };
 }
-exports.getPluginVersion = getPluginVersion;
+exports.loadPluginVersion = loadPluginVersion;
 /**
  * We want all `@docusaurus/*` packages to have the exact same version!
  * @see https://github.com/facebook/docusaurus/issues/3371
@@ -65,10 +69,10 @@ Maybe you want to check, or regenerate your yarn.lock or package-lock.json file?
         }
     });
 }
-async function loadSiteMetadata({ plugins, siteDir, }) {
+function createSiteMetadata({ siteVersion, plugins, }) {
     const siteMetadata = {
         docusaurusVersion: utils_1.DOCUSAURUS_VERSION,
-        siteVersion: await getPackageJsonVersion(path_1.default.join(siteDir, 'package.json')),
+        siteVersion,
         pluginVersions: Object.fromEntries(plugins
             .filter(({ version: { type } }) => type !== 'synthetic')
             .map(({ name, version }) => [name, version])),
@@ -76,4 +80,4 @@ async function loadSiteMetadata({ plugins, siteDir, }) {
     checkDocusaurusPackagesVersion(siteMetadata);
     return siteMetadata;
 }
-exports.loadSiteMetadata = loadSiteMetadata;
+exports.createSiteMetadata = createSiteMetadata;

package/lib/server/translations/translations.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 type { TranslationFileContent, TranslationFile, CodeTranslations, InitializedPlugin } from '@docusaurus/types';
+import type { TranslationFileContent, TranslationFile, CodeTranslations, InitializedPlugin, LoadedPlugin } from '@docusaurus/types';
 export type WriteTranslationsOptions = {
     override?: boolean;
     messagePrefix?: string;
@@ -23,7 +23,11 @@ export declare function localizePluginTranslationFile({ localizationDir, plugin,
     plugin: InitializedPlugin;
     translationFile: TranslationFile;
 }): Promise<TranslationFile>;
-export declare function getPluginsDefaultCodeTranslationMessages(plugins: InitializedPlugin[]): Promise<CodeTranslations>;
+export declare function mergeCodeTranslations(codeTranslations: CodeTranslations[]): CodeTranslations;
+export declare function loadPluginsDefaultCodeTranslationMessages(plugins: InitializedPlugin[]): Promise<CodeTranslations>;
+export declare function getPluginsDefaultCodeTranslations({ plugins, }: {
+    plugins: LoadedPlugin[];
+}): CodeTranslations;
 export declare function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }: {
     extractedCodeTranslations: TranslationFileContent;
     defaultCodeMessages: CodeTranslations;

package/lib/server/translations/translations.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSiteCodeTranslations = exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = void 0;
+exports.loadSiteCodeTranslations = exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslations = exports.loadPluginsDefaultCodeTranslationMessages = exports.mergeCodeTranslations = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -145,11 +145,22 @@ async function localizePluginTranslationFile({ localizationDir, plugin, translat
     return translationFile;
 }
 exports.localizePluginTranslationFile = localizePluginTranslationFile;
-async function getPluginsDefaultCodeTranslationMessages(plugins) {
+function mergeCodeTranslations(codeTranslations) {
+    return codeTranslations.reduce((allCodeTranslations, current) => ({
+        ...allCodeTranslations,
+        ...current,
+    }), {});
+}
+exports.mergeCodeTranslations = mergeCodeTranslations;
+async function loadPluginsDefaultCodeTranslationMessages(plugins) {
     const pluginsMessages = await Promise.all(plugins.map((plugin) => plugin.getDefaultCodeTranslationMessages?.() ?? {}));
-    return pluginsMessages.reduce((allMessages, pluginMessages) => ({ ...allMessages, ...pluginMessages }), {});
+    return mergeCodeTranslations(pluginsMessages);
+}
+exports.loadPluginsDefaultCodeTranslationMessages = loadPluginsDefaultCodeTranslationMessages;
+function getPluginsDefaultCodeTranslations({ plugins, }) {
+    return mergeCodeTranslations(plugins.map((p) => p.defaultCodeTranslations));
 }
-exports.getPluginsDefaultCodeTranslationMessages = getPluginsDefaultCodeTranslationMessages;
+exports.getPluginsDefaultCodeTranslations = getPluginsDefaultCodeTranslations;
 function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMessages, }) {
     const unusedDefaultCodeMessages = lodash_1.default.difference(Object.keys(defaultCodeMessages), Object.keys(extractedCodeTranslations));
     if (unusedDefaultCodeMessages.length > 0) {

package/lib/ssg.js

@@ -27,11 +27,8 @@ const Concurrency = process.env.DOCUSAURUS_SSR_CONCURRENCY
         // See also https://github.com/sindresorhus/p-map/issues/24
         32;
 async function loadAppRenderer({ serverBundlePath, }) {
-    console.log(`SSG - Load server bundle`);
-    utils_1.PerfLogger.start(`SSG - Load server bundle`);
-    const source = await fs_extra_1.default.readFile(serverBundlePath);
-    utils_1.PerfLogger.end(`SSG - Load server bundle`);
-    utils_1.PerfLogger.log(`SSG - Server bundle size = ${(source.length / 1024000).toFixed(3)} MB`);
+    const source = await utils_1.PerfLogger.async(`Load server bundle`, () => fs_extra_1.default.readFile(serverBundlePath));
+    utils_1.PerfLogger.log(`Server bundle size = ${(source.length / 1024000).toFixed(3)} MB`);
     const filename = path_1.default.basename(serverBundlePath);
     const globals = {
         // When using "new URL('file.js', import.meta.url)", Webpack will emit
@@ -43,12 +40,10 @@ async function loadAppRenderer({ serverBundlePath, }) {
         // See also: https://github.com/pierrec/node-eval/issues/33
         require: (0, module_1.createRequire)(serverBundlePath),
     };
-    utils_1.PerfLogger.start(`SSG - Evaluate server bundle`);
-    const serverEntry = (0, eval_1.default)(source, 
+    const serverEntry = await utils_1.PerfLogger.async(`Evaluate server bundle`, () => (0, eval_1.default)(source, 
     /* filename: */ filename, 
     /* scope: */ globals, 
-    /* includeGlobals: */ true);
-    utils_1.PerfLogger.end(`SSG - Evaluate server bundle`);
+    /* includeGlobals: */ true));
     if (!serverEntry?.default || typeof serverEntry.default !== 'function') {
         throw new Error(`Server bundle export from "${filename}" must be a function that renders the Docusaurus React app.`);
     }

package/lib/utils.js

@@ -8,6 +8,7 @@ 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 async_hooks_1 = require("async_hooks");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 // For now this is a private env variable we use internally
 // But we'll want to expose this feature officially some day
@@ -17,6 +18,14 @@ const Thresholds = {
     yellow: 100,
     red: 1000,
 };
+const PerfPrefix = logger_1.default.yellow(`[PERF] `);
+// This is what enables to "see the parent stack" for each log
+// Parent1 > Parent2 > Parent3 > child trace
+const ParentPrefix = new async_hooks_1.AsyncLocalStorage();
+function applyParentPrefix(label) {
+    const parentPrefix = ParentPrefix.getStore();
+    return parentPrefix ? `${parentPrefix} > ${label}` : label;
+}
 function createPerfLogger() {
     if (!exports.PerfDebuggingEnabled) {
         const noop = () => { };
@@ -27,7 +36,6 @@ function createPerfLogger() {
             async: async (_label, asyncFn) => asyncFn(),
         };
     }
-    const prefix = logger_1.default.yellow(`[PERF] `);
     const formatDuration = (duration) => {
         if (duration > Thresholds.red) {
             return logger_1.default.red(`${(duration / 1000).toFixed(2)} seconds!`);
@@ -43,21 +51,21 @@ function createPerfLogger() {
         if (duration < Thresholds.min) {
             return;
         }
-        console.log(`${prefix + label} - ${formatDuration(duration)}`);
+        console.log(`${PerfPrefix + label} - ${formatDuration(duration)}`);
     };
     const start = (label) => performance.mark(label);
     const end = (label) => {
         const { duration } = performance.measure(label);
         performance.clearMarks(label);
-        logDuration(label, duration);
+        logDuration(applyParentPrefix(label), duration);
     };
-    const log = (label) => console.log(prefix + label);
+    const log = (label) => console.log(PerfPrefix + applyParentPrefix(label));
     const async = async (label, asyncFn) => {
-        start(label);
+        const finalLabel = applyParentPrefix(label);
         const before = performance.now();
-        const result = await asyncFn();
+        const result = await ParentPrefix.run(finalLabel, () => asyncFn());
         const duration = performance.now() - before;
-        logDuration(label, duration);
+        logDuration(finalLabel, duration);
         return result;
     };
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5872",
+  "version": "0.0.0-5878",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-5872",
-    "@docusaurus/logger": "0.0.0-5872",
-    "@docusaurus/mdx-loader": "0.0.0-5872",
+    "@docusaurus/cssnano-preset": "0.0.0-5878",
+    "@docusaurus/logger": "0.0.0-5878",
+    "@docusaurus/mdx-loader": "0.0.0-5878",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-5872",
-    "@docusaurus/utils-common": "0.0.0-5872",
-    "@docusaurus/utils-validation": "0.0.0-5872",
+    "@docusaurus/utils": "0.0.0-5878",
+    "@docusaurus/utils-common": "0.0.0-5878",
+    "@docusaurus/utils-validation": "0.0.0-5878",
     "@svgr/webpack": "^6.5.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
@@ -105,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5872",
-    "@docusaurus/types": "0.0.0-5872",
+    "@docusaurus/module-type-aliases": "0.0.0-5878",
+    "@docusaurus/types": "0.0.0-5878",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -126,5 +126,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "b059cfb578e4a80cdd8b5cf9a3c8978fb41693e3"
+  "gitHead": "d12884c09795e4d0a536df1840d86a0bcbcd9a99"
 }