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

package/lib/server/translations/translations.js

@@ -6,14 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = exports.getCodeTranslationsFilePath = exports.getTranslationsLocaleDirPath = exports.getTranslationsDirPath = exports.writeTranslationFileContent = exports.readTranslationFileContent = exports.ensureTranslationFileContent = void 0;
+exports.applyDefaultCodeTranslations = exports.getPluginsDefaultCodeTranslationMessages = exports.localizePluginTranslationFile = exports.writePluginTranslations = exports.writeCodeTranslations = exports.readCodeTranslationFileContent = exports.getTranslationsLocaleDirPath = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const path_1 = tslib_1.__importDefault(require("path"));
+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_validation_1 = require("@docusaurus/utils-validation");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const TranslationFileContentSchema = utils_validation_1.Joi.object()
     .pattern(utils_validation_1.Joi.string(), utils_validation_1.Joi.object({
     message: utils_validation_1.Joi.string().allow('').required(),
@@ -27,11 +27,10 @@ function ensureTranslationFileContent(content) {
         convert: false,
     });
 }
-exports.ensureTranslationFileContent = ensureTranslationFileContent;
 async function readTranslationFileContent(filePath) {
     if (await fs_extra_1.default.pathExists(filePath)) {
         try {
-            const content = JSON.parse(await fs_extra_1.default.readFile(filePath, 'utf8'));
+            const content = await fs_extra_1.default.readJSON(filePath);
             ensureTranslationFileContent(content);
             return content;
         }
@@ -42,26 +41,21 @@ async function readTranslationFileContent(filePath) {
     }
     return undefined;
 }
-exports.readTranslationFileContent = readTranslationFileContent;
 function mergeTranslationFileContent({ existingContent = {}, newContent, options, }) {
     // Apply messagePrefix to all messages
-    const newContentTransformed = lodash_1.default.mapValues(newContent, (value) => {
-        var _a;
-        return ({
-            ...value,
-            message: `${(_a = options.messagePrefix) !== null && _a !== void 0 ? _a : ''}${value.message}`,
-        });
-    });
+    const newContentTransformed = lodash_1.default.mapValues(newContent, (value) => ({
+        ...value,
+        message: `${options.messagePrefix ?? ''}${value.message}`,
+    }));
     const result = { ...existingContent };
     // We only add missing keys here, we don't delete existing ones
     Object.entries(newContentTransformed).forEach(([key, { message, description }]) => {
-        var _a, _b;
         result[key] = {
             // If messages already exist, we don't override them (unless requested)
             message: options.override
                 ? message
-                : (_b = (_a = existingContent[key]) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : message,
-            description, // description
+                : existingContent[key]?.message ?? message,
+            description,
         };
     });
     return result;
@@ -69,7 +63,7 @@ function mergeTranslationFileContent({ existingContent = {}, newContent, options
 async function writeTranslationFileContent({ filePath, content: newContent, options = {}, }) {
     const existingContent = await readTranslationFileContent(filePath);
     // Warn about potential legacy keys
-    const unknownKeys = lodash_1.default.difference(Object.keys(existingContent !== null && existingContent !== void 0 ? existingContent : {}), Object.keys(newContent));
+    const unknownKeys = lodash_1.default.difference(Object.keys(existingContent ?? {}), Object.keys(newContent));
     if (unknownKeys.length > 0) {
         logger_1.default.warn `Some translation keys looks unknown to us in file path=${filePath}.
 Maybe you should remove them? ${unknownKeys}`;
@@ -82,24 +76,17 @@ Maybe you should remove them? ${unknownKeys}`;
     // Avoid creating empty translation files
     if (Object.keys(mergedContent).length > 0) {
         logger_1.default.info `number=${Object.keys(mergedContent).length} translations will be written at path=${(0, utils_1.toMessageRelativeFilePath)(filePath)}.`;
-        await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
-        await fs_extra_1.default.writeFile(filePath, `${JSON.stringify(mergedContent, null, 2)}\n`);
+        await fs_extra_1.default.outputFile(filePath, `${JSON.stringify(mergedContent, null, 2)}\n`);
     }
 }
-exports.writeTranslationFileContent = writeTranslationFileContent;
-// should we make this configurable?
-function getTranslationsDirPath(context) {
-    return path_1.default.resolve(path_1.default.join(context.siteDir, `i18n`));
-}
-exports.getTranslationsDirPath = getTranslationsDirPath;
+// Should we make this configurable?
 function getTranslationsLocaleDirPath(context) {
-    return path_1.default.join(getTranslationsDirPath(context), context.locale);
+    return path_1.default.join(context.siteDir, utils_1.I18N_DIR_NAME, context.locale);
 }
 exports.getTranslationsLocaleDirPath = getTranslationsLocaleDirPath;
 function getCodeTranslationsFilePath(context) {
-    return path_1.default.join(getTranslationsLocaleDirPath(context), 'code.json');
+    return path_1.default.join(getTranslationsLocaleDirPath(context), utils_1.CODE_TRANSLATIONS_FILE_NAME);
 }
-exports.getCodeTranslationsFilePath = getCodeTranslationsFilePath;
 async function readCodeTranslationFileContent(context) {
     return readTranslationFileContent(getCodeTranslationsFilePath(context));
 }
@@ -154,7 +141,7 @@ async function localizePluginTranslationFile({ siteDir, plugin, locale, translat
     });
     const localizedContent = await readTranslationFileContent(filePath);
     if (localizedContent) {
-        // localized messages "override" default unlocalized messages
+        // Localized messages "override" default unlocalized messages
         return {
             path: translationFile.path,
             content: {
@@ -167,7 +154,7 @@ async function localizePluginTranslationFile({ siteDir, plugin, locale, translat
 }
 exports.localizePluginTranslationFile = localizePluginTranslationFile;
 async function getPluginsDefaultCodeTranslationMessages(plugins) {
-    const pluginsMessages = await Promise.all(plugins.map((plugin) => { var _a, _b; return (_b = (_a = plugin.getDefaultCodeTranslationMessages) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : {}; }));
+    const pluginsMessages = await Promise.all(plugins.map((plugin) => plugin.getDefaultCodeTranslationMessages?.() ?? {}));
     return pluginsMessages.reduce((allMessages, pluginMessages) => ({ ...allMessages, ...pluginMessages }), {});
 }
 exports.getPluginsDefaultCodeTranslationMessages = getPluginsDefaultCodeTranslationMessages;
@@ -177,12 +164,9 @@ function applyDefaultCodeTranslations({ extractedCodeTranslations, defaultCodeMe
         logger_1.default.warn `Unused default message codes found.
 Please report this Docusaurus issue. name=${unusedDefaultCodeMessages}`;
     }
-    return lodash_1.default.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => {
-        var _a;
-        return ({
-            ...messageTranslation,
-            message: (_a = defaultCodeMessages[messageId]) !== null && _a !== void 0 ? _a : messageTranslation.message,
-        });
-    });
+    return lodash_1.default.mapValues(extractedCodeTranslations, (messageTranslation, messageId) => ({
+        ...messageTranslation,
+        message: defaultCodeMessages[messageId] ?? messageTranslation.message,
+    }));
 }
 exports.applyDefaultCodeTranslations = applyDefaultCodeTranslations;

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

@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type TransformOptions } from '@babel/core';
-import type { InitializedPlugin, TranslationFileContent, TranslationMessage } from '@docusaurus/types';
+import type { InitializedPlugin, TranslationFileContent } from '@docusaurus/types';
 export declare function globSourceCodeFilePaths(dirPaths: string[]): Promise<string[]>;
 export declare function extractSiteSourceCodeTranslations(siteDir: string, plugins: InitializedPlugin[], babelOptions: TransformOptions, extraSourceCodeFilePaths?: string[]): Promise<TranslationFileContent>;
 declare type SourceCodeFileTranslations = {
     sourceCodeFilePath: string;
-    translations: Record<string, TranslationMessage>;
+    translations: TranslationFileContent;
     warnings: string[];
 };
 export declare function extractAllSourceCodeFileTranslations(sourceCodeFilePaths: string[], babelOptions: TransformOptions): Promise<SourceCodeFileTranslations[]>;

package/lib/server/translations/translationsExtractor.js

@@ -8,12 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractSourceCodeFileTranslations = exports.extractAllSourceCodeFileTranslations = exports.extractSiteSourceCodeTranslations = exports.globSourceCodeFilePaths = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const traverse_1 = (0, tslib_1.__importDefault)(require("@babel/traverse"));
-const generator_1 = (0, tslib_1.__importDefault)(require("@babel/generator"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
+const generator_1 = tslib_1.__importDefault(require("@babel/generator"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const core_1 = require("@babel/core");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("../utils");
 // We only support extracting source code translations from these kind of files
@@ -34,18 +34,17 @@ function getSiteSourceCodeFilePaths(siteDir) {
     return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
 }
 function getPluginSourceCodeFilePaths(plugin) {
-    var _a, _b, _c;
     // The getPathsToWatch() generally returns the js/jsx/ts/tsx/md/mdx file paths
     // We can use this method as well to know which folders we should try to
     // extract translations from. Hacky/implicit, but do we want to introduce a
     // new lifecycle method just for that???
-    const codePaths = (_b = (_a = plugin.getPathsToWatch) === null || _a === void 0 ? void 0 : _a.call(plugin)) !== null && _b !== void 0 ? _b : [];
+    const codePaths = plugin.getPathsToWatch?.() ?? [];
     // We also include theme code
-    const themePath = (_c = plugin.getThemePath) === null || _c === void 0 ? void 0 : _c.call(plugin);
+    const themePath = plugin.getThemePath?.();
     if (themePath) {
         codePaths.push(themePath);
     }
-    return codePaths;
+    return codePaths.map((p) => path_1.default.resolve(plugin.path, p));
 }
 async function globSourceCodeFilePaths(dirPaths) {
     const filePaths = await (0, utils_2.safeGlobby)(dirPaths);
@@ -119,8 +118,7 @@ https://github.com/pugjs/babel-walk
  */
 function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
     function sourceWarningPart(node) {
-        var _a;
-        return `File: ${sourceCodeFilePath} at line ${(_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line}
+        return `File: ${sourceCodeFilePath} at line ${node.loc?.start.line}
 Full code: ${(0, generator_1.default)(node).code}`;
     }
     const translations = {};
@@ -142,8 +140,8 @@ Full code: ${(0, generator_1.default)(node).code}`;
                     .node.name === 'translate' ||
                     specifier.get('imported')
                         .node.value === 'translate'));
-            translateComponentName = defaultImport === null || defaultImport === void 0 ? void 0 : defaultImport.get('local').node.name;
-            translateFunctionName = callbackImport === null || callbackImport === void 0 ? void 0 : callbackImport.get('local').node.name;
+            translateComponentName = defaultImport?.get('local').node.name;
+            translateFunctionName = callbackImport?.get('local').node.name;
         },
     });
     (0, traverse_1.default)(ast, {
@@ -205,15 +203,14 @@ ${sourceWarningPart(path.node)}`);
                     .filter((children) => !(children.isJSXText() &&
                     children.node.value.replace('\n', '').trim() === ''))
                     .pop();
-                const isJSXText = singleChildren && singleChildren.isJSXText();
-                const isJSXExpressionContainer = singleChildren &&
-                    singleChildren.isJSXExpressionContainer() &&
+                const isJSXText = singleChildren?.isJSXText();
+                const isJSXExpressionContainer = singleChildren?.isJSXExpressionContainer() &&
                     singleChildren.get('expression').evaluate().confident;
                 if (isJSXText || isJSXExpressionContainer) {
                     message = isJSXText
                         ? singleChildren.node.value.trim().replace(/\s+/g, ' ')
                         : singleChildren.get('expression').evaluate().value;
-                    translations[id !== null && id !== void 0 ? id : message] = {
+                    translations[id ?? message] = {
                         message,
                         ...(description && { description }),
                     };
@@ -237,8 +234,8 @@ ${sourceWarningPart(path.node)}`);
                     if (firstArgEvaluated.confident &&
                         typeof firstArgEvaluated.value === 'object') {
                         const { message, id, description } = firstArgEvaluated.value;
-                        translations[id !== null && id !== void 0 ? id : message] = {
-                            message: message !== null && message !== void 0 ? message : id,
+                        translations[id ?? message] = {
+                            message: message ?? id,
                             ...(description && { description }),
                         };
                     }

package/lib/server/utils.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.safeGlobby = exports.getAllFinalRoutes = 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");
 // Recursively get the final routes (routes with no subroutes)
 function getAllFinalRoutes(routeConfig) {

package/lib/webpack/aliases/index.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { LoadedPlugin } from '@docusaurus/types';
+/**
+ * Aliases used for Webpack resolution (useful for implementing swizzling)
+ */
+declare type ThemeAliases = {
+    [alias: string]: string;
+};
+/**
+ * Order of Webpack aliases is important because one alias can shadow another.
+ * This ensures `@theme/NavbarItem` alias is after
+ * `@theme/NavbarItem/LocaleDropdown`.
+ *
+ * @see https://github.com/facebook/docusaurus/pull/3922
+ * @see https://github.com/facebook/docusaurus/issues/5382
+ */
+export declare function sortAliases(aliases: ThemeAliases): ThemeAliases;
+export declare function createAliasesForTheme(themePath: string, addOriginalAlias: boolean): Promise<ThemeAliases>;
+export declare function loadThemeAliases({ siteDir, plugins, }: {
+    siteDir: string;
+    plugins: LoadedPlugin[];
+}): Promise<ThemeAliases>;
+/**
+ * Note: a `@docusaurus` alias would also catch `@docusaurus/theme-common`, so
+ * instead of naively aliasing this to `client/exports`, we use fine-grained
+ * aliases instead.
+ */
+export declare function loadDocusaurusAliases(): Promise<ThemeAliases>;
+export {};

package/lib/webpack/aliases/index.js

@@ -0,0 +1,106 @@
+"use strict";
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadDocusaurusAliases = exports.loadThemeAliases = exports.createAliasesForTheme = exports.sortAliases = 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");
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const ThemeFallbackDir = path_1.default.join(__dirname, '../../client/theme-fallback');
+/**
+ * Order of Webpack aliases is important because one alias can shadow another.
+ * This ensures `@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]) => 
+    // eslint-disable-next-line no-nested-ternary
+    alias1.includes(`${alias2}/`) ? -1 : alias2.includes(`${alias1}/`) ? 1 : 0);
+    return Object.fromEntries(entries);
+}
+exports.sortAliases = sortAliases;
+async function createAliasesForTheme(themePath, addOriginalAlias) {
+    if (!(await fs_extra_1.default.pathExists(themePath))) {
+        return {};
+    }
+    const themeComponentFiles = await (0, utils_1.Globby)(['**/*.{js,jsx,ts,tsx}'], {
+        cwd: themePath,
+    });
+    const aliases = {};
+    themeComponentFiles.forEach((relativeSource) => {
+        const filePath = path_1.default.join(themePath, relativeSource);
+        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 = (0, utils_1.posixPath)((0, utils_1.normalizeUrl)(['@theme-original', fileName]).replace(/\/$/, ''));
+            aliases[originalAliasName] = filePath;
+        }
+    });
+    return sortAliases(aliases);
+}
+exports.createAliasesForTheme = createAliasesForTheme;
+async function createThemeAliases(themePaths, userThemePaths) {
+    const aliases = {};
+    for (const themePath of themePaths) {
+        const themeAliases = await createAliasesForTheme(themePath, true);
+        Object.entries(themeAliases).forEach(([aliasKey, alias]) => {
+            // 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] = alias;
+        });
+    }
+    for (const themePath of userThemePaths) {
+        const userThemeAliases = await createAliasesForTheme(themePath, false);
+        Object.assign(aliases, userThemeAliases);
+    }
+    return sortAliases(aliases);
+}
+function loadThemeAliases({ siteDir, plugins, }) {
+    const pluginThemes = plugins
+        .map((plugin) => plugin.getThemePath && path_1.default.resolve(plugin.path, plugin.getThemePath()))
+        .filter((x) => Boolean(x));
+    const userTheme = path_1.default.resolve(siteDir, utils_1.THEME_PATH);
+    return createThemeAliases([ThemeFallbackDir, ...pluginThemes], [userTheme]);
+}
+exports.loadThemeAliases = loadThemeAliases;
+/**
+ * Note: a `@docusaurus` alias would also catch `@docusaurus/theme-common`, so
+ * instead of naively aliasing this to `client/exports`, we use fine-grained
+ * aliases instead.
+ */
+async function loadDocusaurusAliases() {
+    const dirPath = path_1.default.resolve(__dirname, '../../client/exports');
+    const extensions = ['.js', '.ts', '.tsx'];
+    const aliases = {};
+    (await fs_extra_1.default.readdir(dirPath))
+        .filter((fileName) => extensions.includes(path_1.default.extname(fileName)))
+        .forEach((fileName) => {
+        const fileNameWithoutExtension = path_1.default.basename(fileName, path_1.default.extname(fileName));
+        const aliasName = `@docusaurus/${fileNameWithoutExtension}`;
+        aliases[aliasName] = path_1.default.resolve(dirPath, fileName);
+    });
+    return aliases;
+}
+exports.loadDocusaurusAliases = loadDocusaurusAliases;

package/lib/webpack/base.d.ts

@@ -8,5 +8,4 @@ import type { Configuration } from 'webpack';
 import type { Props } from '@docusaurus/types';
 export declare const clientDir: string;
 export declare function excludeJS(modulePath: string): boolean;
-export declare function getDocusaurusAliases(): Promise<Record<string, string>>;
 export declare function createBaseConfig(props: Props, isServer: boolean, minify?: boolean): Promise<Configuration>;

package/lib/webpack/base.js

@@ -6,23 +6,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBaseConfig = exports.getDocusaurusAliases = exports.excludeJS = exports.clientDir = void 0;
+exports.createBaseConfig = exports.excludeJS = exports.clientDir = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const mini_css_extract_plugin_1 = (0, tslib_1.__importDefault)(require("mini-css-extract-plugin"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const mini_css_extract_plugin_1 = tslib_1.__importDefault(require("mini-css-extract-plugin"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("./utils");
-const themes_1 = require("../server/themes");
+const aliases_1 = require("./aliases");
 const utils_2 = require("@docusaurus/utils");
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
 const LibrariesToTranspile = [
-    'copy-text-to-clipboard', // contains optional catch binding, incompatible with recent versions of Edge
+    'copy-text-to-clipboard', // Contains optional catch binding, incompatible with recent versions of Edge
 ];
 const LibrariesToTranspileRegex = new RegExp(LibrariesToTranspile.map((libName) => `(node_modules/${libName})`).join('|'));
 function excludeJS(modulePath) {
-    // always transpile client dir
+    // Always transpile client dir
     if (modulePath.startsWith(exports.clientDir)) {
         return false;
     }
@@ -32,22 +32,7 @@ function excludeJS(modulePath) {
         !LibrariesToTranspileRegex.test(modulePath));
 }
 exports.excludeJS = excludeJS;
-async function getDocusaurusAliases() {
-    const dirPath = path_1.default.resolve(__dirname, '../client/exports');
-    const extensions = ['.js', '.ts', '.tsx'];
-    const aliases = {};
-    (await fs_extra_1.default.readdir(dirPath))
-        .filter((fileName) => extensions.includes(path_1.default.extname(fileName)))
-        .forEach((fileName) => {
-        const fileNameWithoutExtension = path_1.default.basename(fileName, path_1.default.extname(fileName));
-        const aliasName = `@docusaurus/${fileNameWithoutExtension}`;
-        aliases[aliasName] = path_1.default.resolve(dirPath, fileName);
-    });
-    return aliases;
-}
-exports.getDocusaurusAliases = getDocusaurusAliases;
 async function createBaseConfig(props, isServer, minify = true) {
-    var _a;
     const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
@@ -56,7 +41,7 @@ async function createBaseConfig(props, isServer, minify = true) {
     const fileLoaderUtils = (0, utils_2.getFileLoaderUtils)();
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
-    const themeAliases = await (0, themes_1.loadPluginsThemeAliases)({ siteDir, plugins });
+    const themeAliases = await (0, aliases_1.loadThemeAliases)({ siteDir, plugins });
     return {
         mode,
         name,
@@ -117,10 +102,7 @@ async function createBaseConfig(props, isServer, minify = true) {
             alias: {
                 '@site': siteDir,
                 '@generated': generatedFilesDir,
-                // Note: a @docusaurus alias would also catch @docusaurus/theme-common,
-                // so we use fine-grained aliases instead
-                // '@docusaurus': path.resolve(__dirname, '../client/exports'),
-                ...(await getDocusaurusAliases()),
+                ...(await (0, aliases_1.loadDocusaurusAliases)()),
                 ...themeAliases,
             },
             // This allows you to set a fallback for where Webpack should look for
@@ -153,7 +135,7 @@ async function createBaseConfig(props, isServer, minify = true) {
                     // include [name] in the filenames
                     name: false,
                     cacheGroups: {
-                        // disable the built-in cacheGroups
+                        // Disable the built-in cacheGroups
                         default: false,
                         common: {
                             name: 'common',
@@ -185,7 +167,7 @@ async function createBaseConfig(props, isServer, minify = true) {
                     test: /\.[jt]sx?$/i,
                     exclude: excludeJS,
                     use: [
-                        (0, utils_1.getCustomizableJSLoader)((_a = siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader)({
+                        (0, utils_1.getCustomizableJSLoader)(siteConfig.webpack?.jsLoader)({
                             isServer,
                             babelOptions: await (0, utils_1.getCustomBabelConfigFilePath)(siteDir),
                         }),
@@ -224,7 +206,7 @@ async function createBaseConfig(props, isServer, minify = true) {
                 chunkFilename: isProd
                     ? 'assets/css/[name].[contenthash:8].css'
                     : '[name].css',
-                // remove css order warnings if css imports are not sorted
+                // Remove css order warnings if css imports are not sorted
                 // alphabetically. See https://github.com/webpack-contrib/mini-css-extract-plugin/pull/422
                 // for more reasoning
                 ignoreOrder: true,

package/lib/webpack/client.js

@@ -7,18 +7,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const base_1 = require("./base");
-const ChunkAssetPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/ChunkAssetPlugin"));
-const LogPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/LogPlugin"));
+const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
+const LogPlugin_1 = tslib_1.__importDefault(require("./plugins/LogPlugin"));
 async function createClientConfig(props, minify = true) {
-    var _a;
     const isBuilding = process.argv[2] === 'build';
     const config = await (0, base_1.createBaseConfig)(props, false, minify);
     const clientConfig = (0, webpack_merge_1.default)(config, {
-        // useless, disabled on purpose (errors on existing sites with no
+        // Useless, disabled on purpose (errors on existing sites with no
         // browserslist config)
         // target: 'browserslist',
         entry: path_1.default.resolve(__dirname, '../client/clientEntry.js'),
@@ -38,7 +37,7 @@ async function createClientConfig(props, minify = true) {
     // When building, include the plugin to force terminate building if errors
     // happened in the client bundle.
     if (isBuilding) {
-        (_a = clientConfig.plugins) === null || _a === void 0 ? void 0 : _a.push({
+        clientConfig.plugins?.push({
             apply: (compiler) => {
                 compiler.hooks.done.tap('client:done', (stats) => {
                     if (stats.hasErrors()) {

package/lib/webpack/plugins/ChunkAssetPlugin.js

@@ -6,7 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = require("webpack");
+const tslib_1 = require("tslib");
+const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const pluginName = 'chunk-asset-plugin';
 /**
  * We modify webpack runtime to add an extra function called
@@ -24,11 +25,10 @@ class ChunkAssetPlugin {
         compiler.hooks.thisCompilation.tap(pluginName, ({ mainTemplate }) => {
             mainTemplate.hooks.requireExtensions.tap(pluginName, (source, chunk) => {
                 const chunkIdToName = chunk.getChunkMaps(false).name;
-                const chunkNameToId = Object.create(null);
-                Object.keys(chunkIdToName).forEach((chunkId) => {
-                    const chunkName = chunkIdToName[chunkId];
-                    chunkNameToId[chunkName] = chunkId;
-                });
+                const chunkNameToId = Object.fromEntries(Object.entries(chunkIdToName).map(([chunkId, chunkName]) => [
+                    chunkName,
+                    chunkId,
+                ]));
                 const buf = [source];
                 buf.push('// function to get chunk asset');
                 buf.push(
@@ -43,7 +43,7 @@ class ChunkAssetPlugin {
                 // prefetching
                 // Note: we previously used jsonpScriptSrc (Webpack 4)
                 `__webpack_require__.gca = function(chunkId) { chunkId = ${JSON.stringify(chunkNameToId)}[chunkId]||chunkId; return __webpack_require__.p + __webpack_require__.u(chunkId); };`);
-                return webpack_1.Template.asString(buf);
+                return webpack_1.default.Template.asString(buf);
             });
         });
     }

package/lib/webpack/plugins/CleanWebpackPlugin.d.ts

@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 import type { Compiler, Stats } from 'webpack';
-export interface Options {
+export declare type Options = {
     /**
      * Write Logs to Console
      * (Always enabled when dry is true)
@@ -53,7 +53,7 @@ export interface Options {
      * default: ['**\/*']
      */
     cleanOnceBeforeBuildPatterns?: string[];
-}
+};
 export default class CleanWebpackPlugin {
     private readonly verbose;
     private readonly cleanStaleWebpackAssets;

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -7,7 +7,7 @@
  */
 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 del_1 = require("del");
 class CleanWebpackPlugin {
     constructor(options = {}) {
@@ -86,7 +86,7 @@ class CleanWebpackPlugin {
         const statsAssets = stats.toJson({
             all: false,
             assets: true,
-        }).assets || [];
+        }).assets ?? [];
         const assets = statsAssets.map((asset) => asset.name);
         /**
          * Get all files that were in the previous build but not the current

package/lib/webpack/plugins/LogPlugin.js

@@ -7,8 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const webpackbar_1 = (0, tslib_1.__importDefault)(require("webpackbar"));
-const formatWebpackMessages_1 = (0, tslib_1.__importDefault)(require("react-dev-utils/formatWebpackMessages"));
+const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
+const formatWebpackMessages_1 = tslib_1.__importDefault(require("react-dev-utils/formatWebpackMessages"));
 function showError(arr) {
     console.log(`\n\n${arr.join('\n')}`);
 }

package/lib/webpack/plugins/WaitPlugin.d.ts

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Compiler } from 'webpack';
-interface WaitPluginOptions {
+declare type WaitPluginOptions = {
     filepath: string;
-}
+};
 export default class WaitPlugin {
     filepath: string;
     constructor(options: WaitPluginOptions);