@docusaurus/core 2.0.0-beta.1 → 2.0.0-beta.10

package/lib/server/translations/translationsExtractor.js

@@ -1,22 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractSourceCodeFileTranslations = exports.extractAllSourceCodeFileTranslations = exports.extractSiteSourceCodeTranslations = exports.globSourceCodeFilePaths = void 0;
-const tslib_1 = require("tslib");
 /**
  * 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.
  */
-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 chalk_1 = tslib_1.__importDefault(require("chalk"));
+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 chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const core_1 = require("@babel/core");
-const lodash_1 = require("lodash");
-const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../constants");
-const utils_1 = require("../utils");
+const path_1 = (0, 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
 const TranslatableSourceCodeExtension = new Set([
     '.js',
@@ -32,7 +31,7 @@ function isTranslatableSourceCodePath(filePath) {
     return TranslatableSourceCodeExtension.has(path_1.default.extname(filePath));
 }
 function getSiteSourceCodeFilePaths(siteDir) {
-    return [path_1.default.join(siteDir, constants_1.SRC_DIR_NAME)];
+    return [path_1.default.join(siteDir, utils_1.SRC_DIR_NAME)];
 }
 function getPluginSourceCodeFilePaths(plugin) {
     var _a, _b, _c;
@@ -48,7 +47,7 @@ function getPluginSourceCodeFilePaths(plugin) {
     return codePaths;
 }
 async function globSourceCodeFilePaths(dirPaths) {
-    const filePaths = await utils_1.safeGlobby(dirPaths);
+    const filePaths = await (0, utils_2.safeGlobby)(dirPaths);
     return filePaths.filter(isTranslatableSourceCodePath);
 }
 exports.globSourceCodeFilePaths = globSourceCodeFilePaths;
@@ -57,19 +56,21 @@ async function getSourceCodeFilePaths(siteDir, plugins) {
     // 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 for that???
-    const pluginsPaths = lodash_1.flatten(plugins.map(getPluginSourceCodeFilePaths));
+    const pluginsPaths = plugins.flatMap(getPluginSourceCodeFilePaths);
     const allPaths = [...sitePaths, ...pluginsPaths];
     return globSourceCodeFilePaths(allPaths);
 }
-async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions) {
+async function extractSiteSourceCodeTranslations(siteDir, plugins, babelOptions, extraSourceCodeFilePaths = []) {
     // Should we warn here if the same translation "key" is found in multiple source code files?
     function toTranslationFileContent(sourceCodeFileTranslations) {
-        return sourceCodeFileTranslations.reduce((acc, item) => {
-            return { ...acc, ...item.translations };
-        }, {});
+        return sourceCodeFileTranslations.reduce((acc, item) => ({ ...acc, ...item.translations }), {});
     }
     const sourceCodeFilePaths = await getSourceCodeFilePaths(siteDir, plugins);
-    const sourceCodeFilesTranslations = await extractAllSourceCodeFileTranslations(sourceCodeFilePaths, babelOptions);
+    const allSourceCodeFilePaths = [
+        ...sourceCodeFilePaths,
+        ...extraSourceCodeFilePaths,
+    ];
+    const sourceCodeFilesTranslations = await extractAllSourceCodeFileTranslations(allSourceCodeFilePaths, babelOptions);
     logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations);
     return toTranslationFileContent(sourceCodeFilesTranslations);
 }
@@ -82,23 +83,26 @@ function logSourceCodeFileTranslationsWarnings(sourceCodeFilesTranslations) {
     });
 }
 async function extractAllSourceCodeFileTranslations(sourceCodeFilePaths, babelOptions) {
-    return lodash_1.flatten(await Promise.all(sourceCodeFilePaths.map((sourceFilePath) => extractSourceCodeFileTranslations(sourceFilePath, babelOptions))));
+    return Promise.all(sourceCodeFilePaths.flatMap((sourceFilePath) => extractSourceCodeFileTranslations(sourceFilePath, babelOptions)));
 }
 exports.extractAllSourceCodeFileTranslations = extractAllSourceCodeFileTranslations;
 async function extractSourceCodeFileTranslations(sourceCodeFilePath, babelOptions) {
     try {
         const code = await fs_extra_1.default.readFile(sourceCodeFilePath, 'utf8');
-        const ast = core_1.parse(code, {
+        const ast = (0, core_1.parse)(code, {
             ...babelOptions,
             ast: true,
             // filename is important, because babel does not process the same files according to their js/ts extensions
             // see  see https://twitter.com/NicoloRibaudo/status/1321130735605002243
             filename: sourceCodeFilePath,
         });
-        return await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
+        const translations = await extractSourceCodeAstTranslations(ast, sourceCodeFilePath);
+        return translations;
     }
     catch (e) {
-        e.message = `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}\n${e.message}`;
+        if (e instanceof Error) {
+            e.message = `Error while attempting to extract Docusaurus translations from source code file at path=${sourceCodeFilePath}\n${e.message}`;
+        }
         throw e;
     }
 }
@@ -112,20 +116,14 @@ https://github.com/formatjs/formatjs/blob/main/packages/babel-plugin-formatjs/in
 https://github.com/pugjs/babel-walk
  */
 function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
-    function staticTranslateJSXWarningPart() {
-        return 'Translate content could not be extracted.\nIt has to be a static string and use optional but static props, like <Translate id="my-id" description="my-description">text</Translate>.';
-    }
-    function sourceFileWarningPart(node) {
+    function sourceWarningPart(node) {
         var _a;
-        return `File=${sourceCodeFilePath} at line=${(_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line}`;
-    }
-    function generateCode(node) {
-        return generator_1.default(node).code;
+        return `File: ${sourceCodeFilePath} at ${(_a = node.loc) === null || _a === void 0 ? void 0 : _a.start.line} line\nFull code: ${(0, generator_1.default)(node).code}`;
     }
     const translations = {};
     const warnings = [];
     // TODO we should check the presence of the correct @docusaurus imports here!
-    traverse_1.default(ast, {
+    (0, traverse_1.default)(ast, {
         JSXElement(path) {
             if (!path
                 .get('openingElement')
@@ -150,41 +148,52 @@ function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
                         return attributeValueEvaluated.value;
                     }
                     else {
-                        warnings.push(`<Translate> prop=${propName} should be a statically evaluable object.\nExample: <Translate id="optional.id" description="optional description">Message</Translate>\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                        warnings.push(`<Translate> prop=${propName} should be a statically evaluable object.\nExample: <Translate id="optional.id" description="optional description">Message</Translate>\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceWarningPart(path.node)}`);
                     }
                 }
                 return undefined;
             }
-            // We only handle the optimistic case where we have a single non-empty content
-            const singleChildren = path
-                .get('children')
+            const id = evaluateJSXProp('id');
+            const description = evaluateJSXProp('description');
+            let message;
+            const childrenPath = path.get('children');
+            // Handle empty content
+            if (!childrenPath.length) {
+                if (!id) {
+                    warnings.push(`
+            <Translate> without children must have id prop.\nExample: <Translate id="my-id" />\n${sourceWarningPart(path.node)}
+          `);
+                }
+                else {
+                    translations[id] = {
+                        message: message !== null && message !== void 0 ? message : id,
+                        ...(description && { description }),
+                    };
+                }
+                return;
+            }
+            // Handle single non-empty content
+            const singleChildren = childrenPath
                 // Remove empty/useless text nodes that might be around our translation!
                 // Makes the translation system more reliable to JSX formatting issues
-                .filter((childrenPath) => !(childrenPath.isJSXText() &&
-                childrenPath.node.value.replace('\n', '').trim() === ''))
+                .filter((children) => !(children.isJSXText() &&
+                children.node.value.replace('\n', '').trim() === ''))
                 .pop();
-            if (singleChildren && singleChildren.isJSXText()) {
-                const message = singleChildren.node.value.trim().replace(/\s+/g, ' ');
-                const id = evaluateJSXProp('id');
-                const description = evaluateJSXProp('description');
-                translations[id !== null && id !== void 0 ? id : message] = {
-                    message,
-                    ...(description && { description }),
-                };
-            }
-            else if (singleChildren &&
+            const isJSXText = singleChildren && singleChildren.isJSXText();
+            const isJSXExpressionContainer = singleChildren &&
                 singleChildren.isJSXExpressionContainer() &&
-                singleChildren.get('expression').evaluate().confident) {
-                const message = singleChildren.get('expression').evaluate().value;
-                const id = evaluateJSXProp('id');
-                const description = evaluateJSXProp('description');
+                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] = {
                     message,
                     ...(description && { description }),
                 };
             }
             else {
-                warnings.push(`${staticTranslateJSXWarningPart()}\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                warnings.push(`Translate content could not be extracted. It has to be a static string and use optional but static props, like <Translate id="my-id" description="my-description">text</Translate>.\n${sourceWarningPart(path.node)}`);
             }
         },
         CallExpression(path) {
@@ -202,16 +211,16 @@ function extractSourceCodeAstTranslations(ast, sourceCodeFilePath) {
                     typeof firstArgEvaluated.value === 'object') {
                     const { message, id, description } = firstArgEvaluated.value;
                     translations[id !== null && id !== void 0 ? id : message] = {
-                        message,
+                        message: message !== null && message !== void 0 ? message : id,
                         ...(description && { description }),
                     };
                 }
                 else {
-                    warnings.push(`translate() first arg should be a statically evaluable object.\nExample: translate({message: "text",id: "optional.id",description: "optional description"}\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                    warnings.push(`translate() first arg should be a statically evaluable object.\nExample: translate({message: "text",id: "optional.id",description: "optional description"}\nDynamically constructed values are not allowed, because they prevent translations to be extracted.\n${sourceWarningPart(path.node)}`);
                 }
             }
             else {
-                warnings.push(`translate() function only takes 1 or 2 args\n${sourceFileWarningPart(path.node)}\n${generateCode(path.node)}`);
+                warnings.push(`translate() function only takes 1 or 2 args\n${sourceWarningPart(path.node)}`);
             }
         },
     });

package/lib/server/utils.d.ts

@@ -1,4 +1,10 @@
+/**
+ * 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 { RouteConfig } from '@docusaurus/types';
-import globby from 'globby';
+import { Globby } from '@docusaurus/utils';
 export declare function getAllFinalRoutes(routeConfig: RouteConfig[]): RouteConfig[];
-export declare function safeGlobby(patterns: string[], options?: globby.GlobbyOptions): Promise<string[]>;
+export declare function safeGlobby(patterns: string[], options?: Globby.GlobbyOptions): Promise<string[]>;

package/lib/server/utils.js

@@ -1,23 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeGlobby = exports.getAllFinalRoutes = void 0;
-const tslib_1 = require("tslib");
 /**
  * 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.
  */
-const lodash_1 = require("lodash");
-const globby_1 = tslib_1.__importDefault(require("globby"));
-const path_1 = tslib_1.__importDefault(require("path"));
+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 utils_1 = require("@docusaurus/utils");
 // Recursively get the final routes (routes with no subroutes)
 function getAllFinalRoutes(routeConfig) {
     function getFinalRoutes(route) {
-        return route.routes ? lodash_1.flatMap(route.routes, getFinalRoutes) : [route];
+        return route.routes ? route.routes.flatMap(getFinalRoutes) : [route];
     }
-    return lodash_1.flatMap(routeConfig, getFinalRoutes);
+    return routeConfig.flatMap(getFinalRoutes);
 }
 exports.getAllFinalRoutes = getAllFinalRoutes;
 // Globby that fix Windows path patterns
@@ -25,7 +23,7 @@ exports.getAllFinalRoutes = getAllFinalRoutes;
 async function safeGlobby(patterns, options) {
     // Required for Windows support, as paths using \ should not be used by globby
     // (also using the windows hard drive prefix like c: is not a good idea)
-    const globPaths = patterns.map((dirPath) => utils_1.posixPath(path_1.default.relative(process.cwd(), dirPath)));
-    return globby_1.default(globPaths, options);
+    const globPaths = patterns.map((dirPath) => (0, utils_1.posixPath)(path_1.default.relative(process.cwd(), dirPath)));
+    return (0, utils_1.Globby)(globPaths, options);
 }
 exports.safeGlobby = safeGlobby;

package/lib/server/versions/__tests/index.test.js

@@ -10,16 +10,16 @@ const __1 = require("..");
 const path_1 = require("path");
 describe('getPluginVersion', () => {
     it('Can detect external packages plugins versions of correctly.', () => {
-        expect(__1.getPluginVersion(path_1.join(__dirname, '..', '__fixtures__', 'dummy-plugin.js'), 
+        expect((0, __1.getPluginVersion)((0, path_1.join)(__dirname, '..', '__fixtures__', 'dummy-plugin.js'), 
         // Make the plugin appear external.
-        path_1.join(__dirname, '..', '..', '..', '..', '..', '..', 'website'))).toEqual({ type: 'package', version: 'random-version' });
+        (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', '..', 'website'))).toEqual({ type: 'package', version: 'random-version' });
     });
     it('Can detect project plugins versions correctly.', () => {
-        expect(__1.getPluginVersion(path_1.join(__dirname, '..', '__fixtures__', 'dummy-plugin.js'), 
+        expect((0, __1.getPluginVersion)((0, path_1.join)(__dirname, '..', '__fixtures__', 'dummy-plugin.js'), 
         // Make the plugin appear project local.
-        path_1.join(__dirname, '..', '__fixtures__'))).toEqual({ type: 'project' });
+        (0, path_1.join)(__dirname, '..', '__fixtures__'))).toEqual({ type: 'project' });
     });
     it('Can detect local packages versions correctly.', () => {
-        expect(__1.getPluginVersion('/', '/')).toEqual({ type: 'local' });
+        expect((0, __1.getPluginVersion)('/', '/')).toEqual({ type: 'local' });
     });
 });

package/lib/server/versions/index.js

@@ -10,7 +10,7 @@ exports.getPluginVersion = exports.getPackageJsonName = exports.getPackageJsonVe
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 function getPackageJsonVersion(packageJsonPath) {
-    if (fs_extra_1.existsSync(packageJsonPath)) {
+    if ((0, fs_extra_1.existsSync)(packageJsonPath)) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
         const { version } = require(packageJsonPath);
         return typeof version === 'string' ? version : undefined;
@@ -19,7 +19,7 @@ function getPackageJsonVersion(packageJsonPath) {
 }
 exports.getPackageJsonVersion = getPackageJsonVersion;
 function getPackageJsonName(packageJsonPath) {
-    if (fs_extra_1.existsSync(packageJsonPath)) {
+    if ((0, fs_extra_1.existsSync)(packageJsonPath)) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
         const { name } = require(packageJsonPath);
         return typeof name === 'string' ? name : undefined;
@@ -28,10 +28,10 @@ function getPackageJsonName(packageJsonPath) {
 }
 exports.getPackageJsonName = getPackageJsonName;
 function getPluginVersion(pluginPath, siteDir) {
-    let potentialPluginPackageJsonDirectory = path_1.dirname(pluginPath);
+    let potentialPluginPackageJsonDirectory = (0, path_1.dirname)(pluginPath);
     while (potentialPluginPackageJsonDirectory !== '/') {
-        const packageJsonPath = path_1.join(potentialPluginPackageJsonDirectory, 'package.json');
-        if (fs_extra_1.existsSync(packageJsonPath) && fs_extra_1.lstatSync(packageJsonPath).isFile()) {
+        const packageJsonPath = (0, path_1.join)(potentialPluginPackageJsonDirectory, 'package.json');
+        if ((0, fs_extra_1.existsSync)(packageJsonPath) && (0, fs_extra_1.lstatSync)(packageJsonPath).isFile()) {
             if (potentialPluginPackageJsonDirectory === siteDir) {
                 // If the plugin belongs to the same docusaurus project, we classify it as local plugin.
                 return { type: 'project' };
@@ -42,7 +42,7 @@ function getPluginVersion(pluginPath, siteDir) {
                 version: getPackageJsonVersion(packageJsonPath),
             };
         }
-        potentialPluginPackageJsonDirectory = path_1.dirname(potentialPluginPackageJsonDirectory);
+        potentialPluginPackageJsonDirectory = (0, path_1.dirname)(potentialPluginPackageJsonDirectory);
     }
     // In rare cases where a plugin is a path where no parent directory contains package.json, we can only classify it as local.
     return { type: 'local' };

package/lib/webpack/base.js

@@ -8,12 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBaseConfig = exports.getDocusaurusAliases = exports.excludeJS = exports.clientDir = void 0;
 const tslib_1 = require("tslib");
-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 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 utils_1 = require("./utils");
-const constants_1 = require("../constants");
-const sharedModuleAliases_1 = tslib_1.__importDefault(require("./sharedModuleAliases"));
+const themes_1 = require("../server/themes");
+const utils_2 = require("@docusaurus/utils");
 const CSS_REGEX = /\.css$/;
 const CSS_MODULE_REGEX = /\.module\.css$/;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
@@ -48,32 +48,39 @@ function getDocusaurusAliases() {
 exports.getDocusaurusAliases = getDocusaurusAliases;
 function createBaseConfig(props, isServer, minify = true) {
     var _a;
-    const { outDir, siteDir, siteConfig, baseUrl, generatedFilesDir, routesPaths, siteMetadata, } = props;
+    const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
     const minimizeEnabled = minify && isProd && !isServer;
     const useSimpleCssMinifier = process.env.USE_SIMPLE_CSS_MINIFIER === 'true';
-    const fileLoaderUtils = utils_1.getFileLoaderUtils();
+    const fileLoaderUtils = (0, utils_2.getFileLoaderUtils)();
     const name = isServer ? 'server' : 'client';
     const mode = isProd ? 'production' : 'development';
+    const themeAliases = (0, themes_1.loadPluginsThemeAliases)({ siteDir, plugins });
     return {
         mode,
         name,
         cache: {
-            // TODO temporary env variable to reduce risk of Webpack 5 release
-            // maybe expose an official api, once this is solved? https://github.com/webpack/webpack/issues/13034
-            type: process.env.DOCUSAURUS_WEBPACK_CACHE_TYPE ||
-                'filesystem',
+            type: 'filesystem',
             // Can we share the same cache across locales?
             // Exploring that question at https://github.com/webpack/webpack/issues/13034
             // name: `${name}-${mode}`,
             name: `${name}-${mode}-${props.i18n.currentLocale}`,
-            version: siteMetadata.docusaurusVersion,
+            // When version string changes, cache is evicted
+            version: [
+                siteMetadata.docusaurusVersion,
+                // Webpack does not evict the cache correctly on alias/swizzle change, so we force eviction.
+                // See https://github.com/webpack/webpack/issues/13627
+                (0, utils_2.md5Hash)(JSON.stringify(themeAliases)),
+            ].join('-'),
+            // When one of those modules/dependencies change (including transitive deps), cache is invalidated
             buildDependencies: {
-                // When one of dependencies change, cache is invalidated
                 config: [
                     __filename,
                     path_1.default.join(__dirname, isServer ? 'server.js' : 'client.js'),
+                    // Docusaurus config changes can affect MDX/JSX compilation, so we'd rather evict the cache.
+                    // See https://github.com/questdb/questdb.io/issues/493
+                    siteConfigPath,
                 ],
             },
         },
@@ -85,6 +92,7 @@ function createBaseConfig(props, isServer, minify = true) {
                 ? 'assets/js/[name].[contenthash:8].js'
                 : '[name].js',
             publicPath: baseUrl,
+            hashFunction: 'xxhash64',
         },
         // Don't throw warning when asset created is over 250kb
         performance: {
@@ -99,18 +107,18 @@ function createBaseConfig(props, isServer, minify = true) {
                 // Allow resolution of url("/fonts/xyz.ttf") by webpack
                 // See https://webpack.js.org/configuration/resolve/#resolveroots
                 // See https://github.com/webpack-contrib/css-loader/issues/1256
-                path_1.default.join(siteDir, constants_1.STATIC_DIR_NAME),
+                ...siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
                 siteDir,
                 process.cwd(),
             ],
             alias: {
-                ...sharedModuleAliases_1.default,
                 '@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'),
                 ...getDocusaurusAliases(),
+                ...themeAliases,
             },
             // This allows you to set a fallback for where Webpack should look for modules.
             // We want `@docusaurus/core` own dependencies/`node_modules` to "win" if there is conflict
@@ -130,7 +138,7 @@ function createBaseConfig(props, isServer, minify = true) {
             // Only minimize client bundle in production because server bundle is only used for static site generation
             minimize: minimizeEnabled,
             minimizer: minimizeEnabled
-                ? utils_1.getMinimizer(useSimpleCssMinifier)
+                ? (0, utils_1.getMinimizer)(useSimpleCssMinifier)
                 : undefined,
             splitChunks: isServer
                 ? false
@@ -170,16 +178,16 @@ function createBaseConfig(props, isServer, minify = true) {
                     test: /\.(j|t)sx?$/,
                     exclude: excludeJS,
                     use: [
-                        utils_1.getCustomizableJSLoader((_a = siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader)({
+                        (0, utils_1.getCustomizableJSLoader)((_a = siteConfig.webpack) === null || _a === void 0 ? void 0 : _a.jsLoader)({
                             isServer,
-                            babelOptions: utils_1.getCustomBabelConfigFilePath(siteDir),
+                            babelOptions: (0, utils_1.getCustomBabelConfigFilePath)(siteDir),
                         }),
                     ],
                 },
                 {
                     test: CSS_REGEX,
                     exclude: CSS_MODULE_REGEX,
-                    use: utils_1.getStyleLoaders(isServer, {
+                    use: (0, utils_1.getStyleLoaders)(isServer, {
                         importLoaders: 1,
                         sourceMap: !isProd,
                     }),
@@ -188,11 +196,11 @@ function createBaseConfig(props, isServer, minify = true) {
                 // using the extension .module.css
                 {
                     test: CSS_MODULE_REGEX,
-                    use: utils_1.getStyleLoaders(isServer, {
+                    use: (0, utils_1.getStyleLoaders)(isServer, {
                         modules: {
                             localIdentName: isProd
                                 ? `[local]_[contenthash:base64:4]`
-                                : `[local]_[path]`,
+                                : `[local]_[path][name]`,
                             exportOnlyLocals: isServer,
                         },
                         importLoaders: 1,

package/lib/webpack/client.js

@@ -7,28 +7,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const webpack_merge_1 = (0, tslib_1.__importDefault)(require("webpack-merge"));
 const base_1 = require("./base");
-const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
-const LogPlugin_1 = tslib_1.__importDefault(require("./plugins/LogPlugin"));
+const ChunkAssetPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/ChunkAssetPlugin"));
+const LogPlugin_1 = (0, tslib_1.__importDefault)(require("./plugins/LogPlugin"));
 function createClientConfig(props, minify = true) {
     var _a;
-    const isProd = process.env.NODE_ENV === 'production';
     const isBuilding = process.argv[2] === 'build';
-    const config = base_1.createBaseConfig(props, false, minify);
-    const clientConfig = webpack_merge_1.default(config, {
+    const config = (0, base_1.createBaseConfig)(props, false, minify);
+    const clientConfig = (0, webpack_merge_1.default)(config, {
         // target: 'browserslist', //  useless, disabled on purpose (errors on existing sites with no browserslist cfg)
-        entry: [
-            // Instead of the default WebpackDevServer client, we use a custom one
-            // like CRA to bring better experience.
-            // note: the one in ./dev is modified to work with Docusaurus
-            // !isProd && require.resolve('react-dev-utils/hotDevServer.js'),
-            !isProd &&
-                require.resolve('./react-dev-utils-webpack5/webpackHotDevClient.js'),
-            path_1.default.resolve(__dirname, '../client/clientEntry.js'),
-        ].filter(Boolean),
+        entry: path_1.default.resolve(__dirname, '../client/clientEntry.js'),
         optimization: {
             // Keep the runtime chunk separated to enable long term caching
             // https://twitter.com/wSokra/status/969679223278505985

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const del_1 = require("del");
 class CleanWebpackPlugin {
     constructor(options = {}) {
@@ -41,7 +41,6 @@ class CleanWebpackPlugin {
     }
     apply(compiler) {
         if (!compiler.options.output || !compiler.options.output.path) {
-            // eslint-disable-next-line no-console
             console.warn('clean-webpack-plugin: options.output.path not defined. Plugin disabled...');
             return;
         }
@@ -76,7 +75,6 @@ class CleanWebpackPlugin {
          */
         if (stats.hasErrors()) {
             if (this.verbose) {
-                // eslint-disable-next-line no-console
                 console.warn('clean-webpack-plugin: pausing due to webpack errors');
             }
             return;
@@ -88,17 +86,13 @@ class CleanWebpackPlugin {
             all: false,
             assets: true,
         }).assets || [];
-        const assets = statsAssets.map((asset) => {
-            return asset.name;
-        });
+        const assets = statsAssets.map((asset) => asset.name);
         /**
          * Get all files that were in the previous build but not the current
          *
          * (relies on del's cwd: outputPath option)
          */
-        const staleFiles = this.currentAssets.filter((previousAsset) => {
-            return assets.includes(previousAsset) === false;
-        });
+        const staleFiles = this.currentAssets.filter((previousAsset) => assets.includes(previousAsset) === false);
         /**
          * Save assets for next compilation
          */
@@ -116,7 +110,7 @@ class CleanWebpackPlugin {
     }
     removeFiles(patterns) {
         try {
-            const deleted = del_1.sync(patterns, {
+            const deleted = (0, del_1.sync)(patterns, {
                 force: false,
                 // Change context to build directory
                 cwd: this.outputPath,
@@ -135,7 +129,6 @@ class CleanWebpackPlugin {
                      * https://github.com/webpack/webpack/issues/1904
                      * https://github.com/johnagan/clean-webpack-plugin/issues/11
                      */
-                    // eslint-disable-next-line no-console
                     console.warn(`clean-webpack-plugin: removed ${filename}`);
                 });
             }

package/lib/webpack/plugins/LogPlugin.js

@@ -1,15 +1,14 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 /**
  * 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.
  */
-const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
-// import formatWebpackMessages from 'react-dev-utils/formatWebpackMessages';
-const formatWebpackMessages_1 = tslib_1.__importDefault(require("../react-dev-utils-webpack5/formatWebpackMessages"));
+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"));
 function showError(arr) {
     console.log(`\n\n${arr.join('\n')}`);
 }
@@ -23,7 +22,7 @@ class LogPlugin extends webpackbar_1.default {
                 // TODO do we really want to keep this legacy logic?
                 // let's wait and see how the react-dev-utils support Webpack5
                 // we probably want to print the error stacktraces here
-                const messages = formatWebpackMessages_1.default(errorsWarnings);
+                const messages = (0, formatWebpackMessages_1.default)(errorsWarnings);
                 if (messages.errors.length) {
                     showError(messages.errors);
                 }

package/lib/webpack/plugins/WaitPlugin.js

@@ -7,9 +7,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const wait_on_1 = tslib_1.__importDefault(require("wait-on"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const wait_on_1 = (0, tslib_1.__importDefault)(require("wait-on"));
 class WaitPlugin {
     constructor(options) {
         this.filepath = options.filepath;
@@ -20,7 +20,7 @@ class WaitPlugin {
             // To prevent 'waitFile' error on waiting non-existing directory
             fs_extra_1.default.ensureDir(path_1.default.dirname(this.filepath), {}, () => {
                 // Wait until file exist
-                wait_on_1.default({
+                (0, wait_on_1.default)({
                     resources: [this.filepath],
                     interval: 300,
                 })