@docusaurus/core 2.4.1 → 3.0.0-beta.0

package/lib/commands/deploy.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type LoadContextOptions } from '../server';
-export declare type DeployCLIOptions = Pick<LoadContextOptions, 'config' | 'locale' | 'outDir'> & {
+export type DeployCLIOptions = Pick<LoadContextOptions, 'config' | 'locale' | 'outDir'> & {
     skipBuild?: boolean;
 };
 export declare function deploy(siteDirParam?: string, cliOptions?: Partial<DeployCLIOptions>): Promise<void>;

package/lib/commands/deploy.js

@@ -151,6 +151,14 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
             throw err;
         }
         shellExecLog('git add --all');
+        const gitUserName = process.env.GIT_USER_NAME;
+        if (gitUserName) {
+            shellExecLog(`git config user.name "${gitUserName}"`);
+        }
+        const gitUserEmail = process.env.GIT_USER_EMAIL;
+        if (gitUserEmail) {
+            shellExecLog(`git config user.email "${gitUserEmail}"`);
+        }
         const commitMessage = process.env.CUSTOM_COMMIT_MESSAGE ??
             `Deploy website - based on ${currentCommit}`;
         const commitResults = shellExecLog(`git commit -m "${commitMessage}"`);

package/lib/commands/serve.d.ts

@@ -6,7 +6,7 @@
  */
 import { type HostPortOptions } from '../server/getHostPort';
 import type { LoadContextOptions } from '../server';
-export declare type ServeCLIOptions = HostPortOptions & Pick<LoadContextOptions, 'config'> & {
+export type ServeCLIOptions = HostPortOptions & Pick<LoadContextOptions, 'config'> & {
     dir?: string;
     build?: boolean;
     open?: boolean;

package/lib/commands/start.d.ts

@@ -6,7 +6,7 @@
  */
 import { type LoadContextOptions } from '../server';
 import { type HostPortOptions } from '../server/getHostPort';
-export declare type StartCLIOptions = HostPortOptions & Pick<LoadContextOptions, 'locale' | 'config'> & {
+export type StartCLIOptions = HostPortOptions & Pick<LoadContextOptions, 'locale' | 'config'> & {
     hotOnly?: boolean;
     open?: boolean;
     poll?: boolean | number;

package/lib/commands/start.js

@@ -89,7 +89,7 @@ async function start(siteDirParam = '.', cliOptions = {}) {
         ...{ pollingOptions },
     });
     ['add', 'change', 'unlink', 'addDir', 'unlinkDir'].forEach((event) => fsWatcher.on(event, reload));
-    let config = (0, webpack_merge_1.default)(await (0, client_1.default)(props, cliOptions.minify), {
+    let config = (0, webpack_merge_1.default)(await (0, client_1.default)(props, cliOptions.minify, false), {
         watchOptions: {
             ignored: /node_modules\/(?!@docusaurus)/,
             poll: cliOptions.poll,
@@ -124,16 +124,22 @@ async function start(siteDirParam = '.', cliOptions = {}) {
         }
     });
     const compiler = (0, webpack_1.default)(config);
-    if (process.env.E2E_TEST) {
-        compiler.hooks.done.tap('done', (stats) => {
+    compiler.hooks.done.tap('done', (stats) => {
+        const errorsWarnings = stats.toJson('errors-warnings');
+        const statsErrorMessage = (0, utils_2.formatStatsErrorMessage)(errorsWarnings);
+        if (statsErrorMessage) {
+            console.error(statsErrorMessage);
+        }
+        (0, utils_2.printStatsWarnings)(errorsWarnings);
+        if (process.env.E2E_TEST) {
             if (stats.hasErrors()) {
                 logger_1.default.error('E2E_TEST: Project has compiler errors.');
                 process.exit(1);
             }
             logger_1.default.success('E2E_TEST: Project can compile.');
             process.exit(0);
-        });
-    }
+        }
+    });
     // https://webpack.js.org/configuration/dev-server
     const defaultDevServerConfig = {
         hot: cliOptions.hotOnly ? 'only' : true,
@@ -144,6 +150,10 @@ async function start(siteDirParam = '.', cliOptions = {}) {
                 warnings: false,
                 errors: true,
             },
+            webSocketURL: {
+                hostname: '0.0.0.0',
+                port: 0,
+            },
         },
         headers: {
             'access-control-allow-origin': '*',

package/lib/commands/swizzle/actions.d.ts

@@ -8,13 +8,13 @@ import type { SwizzleAction, SwizzleComponentConfig } from '@docusaurus/types';
 import type { SwizzleCLIOptions } from './common';
 export declare const SwizzleActions: SwizzleAction[];
 export declare function getAction(componentConfig: SwizzleComponentConfig, options: Pick<SwizzleCLIOptions, 'wrap' | 'eject'>): Promise<SwizzleAction>;
-export declare type ActionParams = {
+export type ActionParams = {
     siteDir: string;
     themePath: string;
     componentName: string;
     typescript: boolean;
 };
-export declare type ActionResult = {
+export type ActionResult = {
     createdFiles: string[];
 };
 export declare function eject({ siteDir, themePath, componentName, typescript, }: ActionParams): Promise<ActionResult>;

package/lib/commands/swizzle/common.d.ts

@@ -14,14 +14,14 @@ export declare function actionStatusColor(status: SwizzleActionStatus, str: stri
 export declare function actionStatusSuffix(status: SwizzleActionStatus, options?: {
     partiallySafe?: boolean;
 }): string;
-export declare type SwizzlePlugin = {
+export type SwizzlePlugin = {
     instance: InitializedPlugin;
     plugin: NormalizedPluginConfig;
 };
-export declare type SwizzleContext = {
+export type SwizzleContext = {
     plugins: SwizzlePlugin[];
 };
-export declare type SwizzleCLIOptions = {
+export type SwizzleCLIOptions = {
     typescript: boolean;
     danger: boolean;
     list: boolean;

package/lib/commands/swizzle/components.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { SwizzleAction, SwizzleActionStatus, SwizzleComponentConfig, SwizzleConfig } from '@docusaurus/types';
-export declare type ThemeComponents = {
+export type ThemeComponents = {
     themeName: string;
     all: string[];
     getConfig: (component: string) => SwizzleComponentConfig;

package/lib/commands/writeTranslations.d.ts

@@ -6,5 +6,5 @@
  */
 import { type LoadContextOptions } from '../server';
 import { type WriteTranslationsOptions } from '../server/translations/translations';
-export declare type WriteTranslationsCLIOptions = Pick<LoadContextOptions, 'config' | 'locale'> & WriteTranslationsOptions;
+export type WriteTranslationsCLIOptions = Pick<LoadContextOptions, 'config' | 'locale'> & WriteTranslationsOptions;
 export declare function writeTranslations(siteDirParam?: string, options?: Partial<WriteTranslationsCLIOptions>): Promise<void>;

package/lib/server/configValidation.js

@@ -36,7 +36,14 @@ exports.DEFAULT_CONFIG = {
     baseUrlIssueBanner: true,
     staticDirectories: [utils_1.DEFAULT_STATIC_DIR_NAME],
     markdown: {
+        format: 'mdx',
         mermaid: false,
+        preprocessor: undefined,
+        mdx1Compat: {
+            comments: true,
+            admonitions: true,
+            headingIds: true,
+        },
     },
 };
 function createPluginSchema(theme) {
@@ -125,7 +132,10 @@ const SiteUrlSchema = utils_validation_1.Joi.string()
 });
 // TODO move to @docusaurus/utils-validation
 exports.ConfigSchema = utils_validation_1.Joi.object({
-    baseUrl: utils_validation_1.Joi.string()
+    baseUrl: utils_validation_1.Joi
+        // Weird Joi trick needed, otherwise value '' is not normalized...
+        .alternatives()
+        .try(utils_validation_1.Joi.string().required().allow(''))
         .required()
         .custom((value) => (0, utils_1.addLeadingSlash)((0, utils_1.addTrailingSlash)(value))),
     baseUrlIssueBanner: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.baseUrlIssueBanner),
@@ -201,7 +211,19 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
             .optional(),
     }).optional(),
     markdown: utils_validation_1.Joi.object({
+        format: utils_validation_1.Joi.string()
+            .equal('mdx', 'md', 'detect')
+            .default(exports.DEFAULT_CONFIG.markdown.format),
         mermaid: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mermaid),
+        preprocessor: utils_validation_1.Joi.function()
+            .arity(1)
+            .optional()
+            .default(() => exports.DEFAULT_CONFIG.markdown.preprocessor),
+        mdx1Compat: utils_validation_1.Joi.object({
+            comments: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.comments),
+            admonitions: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.admonitions),
+            headingIds: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.headingIds),
+        }).default(exports.DEFAULT_CONFIG.markdown.mdx1Compat),
     }).default(exports.DEFAULT_CONFIG.markdown),
 }).messages({
     'docusaurus.configValidationWarning': 'Docusaurus config validation warning. Field {#label}: {#warningMessage}',

package/lib/server/getHostPort.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.
  */
-export declare type HostPortOptions = {
+export type HostPortOptions = {
     host?: string;
     port?: string;
 };

package/lib/server/index.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { LoadContext, Props } from '@docusaurus/types';
-export declare type LoadContextOptions = {
+export type LoadContextOptions = {
     /** Usually the CWD; can be overridden with command argument. */
     siteDir: string;
     /** Custom output directory. Can be customized with `--out-dir` option */

package/lib/server/index.js

@@ -102,14 +102,16 @@ export default ${JSON.stringify(siteConfig, null, 2)};
 ${clientModules
         // Use `require()` because `import()` is async but client modules can have CSS
         // and the order matters for loading CSS.
-        .map((clientModule) => `  require('${(0, utils_1.escapePath)(clientModule)}'),`)
+        .map((clientModule) => `  require("${(0, utils_1.escapePath)(clientModule)}"),`)
         .join('\n')}
 ];
 `);
     const genRegistry = (0, utils_1.generate)(generatedFilesDir, 'registry.js', `export default {
 ${Object.entries(registry)
         .sort((a, b) => a[0].localeCompare(b[0]))
-        .map(([chunkName, modulePath]) => `  '${chunkName}': [() => import(/* webpackChunkName: '${chunkName}' */ '${modulePath}'), '${modulePath}', require.resolveWeak('${modulePath}')],`)
+        .map(([chunkName, modulePath]) => 
+    // modulePath is already escaped by escapePath
+    `  "${chunkName}": [() => import(/* webpackChunkName: "${chunkName}" */ "${modulePath}"), "${modulePath}", require.resolveWeak("${modulePath}")],`)
         .join('\n')}};
 `);
     const genRoutesChunkNames = (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));

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

@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { LoadContext, PluginModule, PluginOptions } from '@docusaurus/types';
-declare type ImportedPluginModule = PluginModule & {
+type ImportedPluginModule = PluginModule & {
     default?: PluginModule;
 };
-export declare type NormalizedPluginConfig = {
+export type NormalizedPluginConfig = {
     /**
      * The default export of the plugin module, or alternatively, what's provided
      * in the config file as inline plugins. Note that if a file is like:

package/lib/server/plugins/routeConfig.js

@@ -48,7 +48,9 @@ function sortConfig(routeConfigs, baseUrl = '/') {
         return a.path.localeCompare(b.path);
     });
     routeConfigs.forEach((routeConfig) => {
-        routeConfig.routes?.sort((a, b) => a.path.localeCompare(b.path));
+        if (routeConfig.routes) {
+            sortConfig(routeConfig.routes, baseUrl);
+        }
     });
 }
 exports.sortConfig = sortConfig;

package/lib/server/plugins/synthetic.js

@@ -68,7 +68,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
         version: { type: 'synthetic' },
         // Synthetic, the path doesn't matter much
         path: '.',
-        configureWebpack(config, isServer, { getJSLoader }) {
+        configureWebpack(config) {
             // We need the mdx fallback loader to exclude files that were already
             // processed by content plugins mdx loaders. This works, but a bit
             // hacky... Not sure there's a way to handle that differently in webpack
@@ -96,7 +96,6 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
                             test: /\.mdx?$/i,
                             exclude: getMDXFallbackExcludedPaths(),
                             use: [
-                                getJSLoader({ isServer }),
                                 {
                                     loader: require.resolve('@docusaurus/mdx-loader'),
                                     options: mdxLoaderOptions,

package/lib/server/routes.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { RouteConfig, RouteChunkNames, ReportingSeverity } from '@docusaurus/types';
-declare type LoadedRoutes = {
+type LoadedRoutes = {
     /** Serialized routes config that can be directly emitted into temp file. */
     routesConfig: string;
     /** @see {ChunkNames} */

package/lib/server/routes.js

@@ -74,24 +74,8 @@ ${indent(subroutesCodeStrings.join(',\n'))}
 ]`);
     }
     Object.entries(props).forEach(([propName, propValue]) => {
-        // Inspired by https://github.com/armanozak/should-quote/blob/main/packages/should-quote/src/lib/should-quote.ts
-        const shouldQuote = ((key) => {
-            // Pre-sanitation to prevent injection
-            if (/[.,;:}/\s]/.test(key)) {
-                return true;
-            }
-            try {
-                // If this key can be used in an expression like ({a:0}).a
-                // eslint-disable-next-line no-eval
-                eval(`({${key}:0}).${key}`);
-                return false;
-            }
-            catch {
-                return true;
-            }
-        })(propName);
-        // Escape quotes as well
-        const key = shouldQuote ? JSON.stringify(propName) : propName;
+        const isIdentifier = /^[$_\p{ID_Start}][$\u200c\u200d\p{ID_Continue}]*$/u.test(propName);
+        const key = isIdentifier ? propName : JSON.stringify(propName);
         parts.push(`${key}: ${JSON.stringify(propValue)}`);
     });
     return `{

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

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { TranslationFileContent, TranslationFile, CodeTranslations, InitializedPlugin } from '@docusaurus/types';
-export declare type WriteTranslationsOptions = {
+export type WriteTranslationsOptions = {
     override?: boolean;
     messagePrefix?: string;
 };
-declare type TranslationContext = {
+type TranslationContext = {
     localizationDir: string;
 };
 export declare function readCodeTranslationFileContent(context: TranslationContext): Promise<TranslationFileContent | undefined>;

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

@@ -8,7 +8,7 @@ import { type TransformOptions } from '@babel/core';
 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 = {
+type SourceCodeFileTranslations = {
     sourceCodeFilePath: string;
     translations: TranslationFileContent;
     warnings: string[];

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

@@ -8,7 +8,7 @@ import type { LoadedPlugin } from '@docusaurus/types';
 /**
  * Aliases used for Webpack resolution (useful for implementing swizzling)
  */
-declare type ThemeAliases = {
+type ThemeAliases = {
     [alias: string]: string;
 };
 /**

package/lib/webpack/client.d.ts

@@ -6,4 +6,4 @@
  */
 import type { Props } from '@docusaurus/types';
 import type { Configuration } from 'webpack';
-export default function createClientConfig(props: Props, minify?: boolean): Promise<Configuration>;
+export default function createClientConfig(props: Props, minify?: boolean, hydrate?: boolean): Promise<Configuration>;

package/lib/webpack/client.js

@@ -10,10 +10,12 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
+const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
+const webpack_1 = require("webpack");
 const base_1 = require("./base");
 const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
-const LogPlugin_1 = tslib_1.__importDefault(require("./plugins/LogPlugin"));
-async function createClientConfig(props, minify = true) {
+const utils_1 = require("./utils");
+async function createClientConfig(props, minify = true, hydrate = true) {
     const isBuilding = process.argv[2] === 'build';
     const config = await (0, base_1.createBaseConfig)(props, false, minify);
     const clientConfig = (0, webpack_merge_1.default)(config, {
@@ -27,9 +29,12 @@ async function createClientConfig(props, minify = true) {
             runtimeChunk: true,
         },
         plugins: [
+            new webpack_1.DefinePlugin({
+                'process.env.HYDRATE_CLIENT_ENTRY': JSON.stringify(hydrate),
+            }),
             new ChunkAssetPlugin_1.default(),
             // Show compilation progress bar and build time.
-            new LogPlugin_1.default({
+            new webpackbar_1.default({
                 name: 'Client',
             }),
         ],
@@ -41,7 +46,8 @@ async function createClientConfig(props, minify = true) {
             apply: (compiler) => {
                 compiler.hooks.done.tap('client:done', (stats) => {
                     if (stats.hasErrors()) {
-                        logger_1.default.error('Client bundle compiled with errors therefore further build is impossible.');
+                        const errorsWarnings = stats.toJson('errors-warnings');
+                        logger_1.default.error(`Client bundle compiled with errors therefore further build is impossible.\n${(0, utils_1.formatStatsErrorMessage)(errorsWarnings)}`);
                         process.exit(1);
                     }
                 });

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Compiler, Stats } from 'webpack';
-export declare type Options = {
+export type Options = {
     /**
      * Write Logs to Console
      * (Always enabled when dry is true)

package/lib/webpack/plugins/CleanWebpackPlugin.js

@@ -30,6 +30,7 @@ const tslib_1 = require("tslib");
 // Modified to optimize performance for Docusaurus specific use case
 // More context: https://github.com/facebook/docusaurus/pull/1839
 const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const del_1 = require("del");
 class CleanWebpackPlugin {
     constructor(options = {}) {
@@ -89,6 +90,13 @@ class CleanWebpackPlugin {
         if (this.initialClean) {
             return;
         }
+        if (
+        // eslint-disable-next-line no-restricted-properties
+        fs_extra_1.default.pathExistsSync(this.outputPath) &&
+            // eslint-disable-next-line no-restricted-properties
+            fs_extra_1.default.statSync(this.outputPath).isFile()) {
+            throw new Error(`A file '${this.outputPath}' already exists. Docusaurus needs this directory to save the build output. Either remove/change the file or choose a different build directory via '--out-dir'.`);
+        }
         this.initialClean = true;
         this.removeFiles(this.cleanOnceBeforeBuildPatterns);
     }

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

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

package/lib/webpack/server.js

@@ -12,9 +12,9 @@ const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const utils_1 = require("@docusaurus/utils");
 // Forked for Docusaurus: https://github.com/slorber/static-site-generator-webpack-plugin
 const static_site_generator_webpack_plugin_1 = tslib_1.__importDefault(require("@slorber/static-site-generator-webpack-plugin"));
+const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
 const base_1 = require("./base");
 const WaitPlugin_1 = tslib_1.__importDefault(require("./plugins/WaitPlugin"));
-const LogPlugin_1 = tslib_1.__importDefault(require("./plugins/LogPlugin"));
 const ssr_html_template_1 = tslib_1.__importDefault(require("./templates/ssr.html.template"));
 async function createServerConfig({ props, onLinksCollected, onHeadTagsCollected, }) {
     const { baseUrl, routesPaths, generatedFilesDir, headTags, preBodyTags, postBodyTags, siteConfig: { noIndex, trailingSlash, ssrTemplate }, } = props;
@@ -72,7 +72,7 @@ async function createServerConfig({ props, onLinksCollected, onHeadTagsCollected
                     : undefined,
             }),
             // Show compilation progress bar.
-            new LogPlugin_1.default({
+            new webpackbar_1.default({
                 name: 'Server',
                 color: 'yellow',
             }),

package/lib/webpack/templates/ssr.html.template.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-declare const _default: "\n<!DOCTYPE html>\n<html <%~ it.htmlAttributes %>>\n  <head>\n    <meta charset=\"UTF-8\">\n    <meta name=\"generator\" content=\"Docusaurus v<%= it.version %>\">\n    <% it.metaAttributes.forEach((metaAttribute) => { %>\n      <%~ metaAttribute %>\n    <% }); %>\n    <%~ it.headTags %>\n    <% it.stylesheets.forEach((stylesheet) => { %>\n      <link rel=\"stylesheet\" href=\"<%= it.baseUrl %><%= stylesheet %>\" />\n    <% }); %>\n    <% it.scripts.forEach((script) => { %>\n      <link rel=\"preload\" href=\"<%= it.baseUrl %><%= script %>\" as=\"script\">\n    <% }); %>\n  </head>\n  <body <%~ it.bodyAttributes %>>\n    <%~ it.preBodyTags %>\n    <div id=\"__docusaurus\">\n      <%~ it.appHtml %>\n    </div>\n    <% it.scripts.forEach((script) => { %>\n      <script src=\"<%= it.baseUrl %><%= script %>\"></script>\n    <% }); %>\n    <%~ it.postBodyTags %>\n  </body>\n</html>\n";
+declare const _default: "\n<!DOCTYPE html>\n<html <%~ it.htmlAttributes %>>\n  <head>\n    <meta charset=\"UTF-8\">\n    <meta name=\"generator\" content=\"Docusaurus v<%= it.version %>\">\n    <% it.metaAttributes.forEach((metaAttribute) => { %>\n      <%~ metaAttribute %>\n    <% }); %>\n    <%~ it.headTags %>\n    <% it.stylesheets.forEach((stylesheet) => { %>\n      <link rel=\"stylesheet\" href=\"<%= it.baseUrl %><%= stylesheet %>\" />\n    <% }); %>\n    <% it.scripts.forEach((script) => { %>\n      <script src=\"<%= it.baseUrl %><%= script %>\" defer></script>\n    <% }); %>\n  </head>\n  <body <%~ it.bodyAttributes %>>\n    <%~ it.preBodyTags %>\n    <div id=\"__docusaurus\"><%~ it.appHtml %></div>\n    <%~ it.postBodyTags %>\n  </body>\n</html>\n";
 export default _default;

package/lib/webpack/templates/ssr.html.template.js

@@ -20,17 +20,12 @@ exports.default = `
       <link rel="stylesheet" href="<%= it.baseUrl %><%= stylesheet %>" />
     <% }); %>
     <% it.scripts.forEach((script) => { %>
-      <link rel="preload" href="<%= it.baseUrl %><%= script %>" as="script">
+      <script src="<%= it.baseUrl %><%= script %>" defer></script>
     <% }); %>
   </head>
   <body <%~ it.bodyAttributes %>>
     <%~ it.preBodyTags %>
-    <div id="__docusaurus">
-      <%~ it.appHtml %>
-    </div>
-    <% it.scripts.forEach((script) => { %>
-      <script src="<%= it.baseUrl %><%= script %>"></script>
-    <% }); %>
+    <div id="__docusaurus"><%~ it.appHtml %></div>
     <%~ it.postBodyTags %>
   </body>
 </html>

package/lib/webpack/utils.d.ts

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="node" />
-import { type Configuration, type RuleSetRule, type WebpackPluginInstance } from 'webpack';
+import webpack, { type Configuration, type RuleSetRule, type WebpackPluginInstance } from 'webpack';
 import type { TransformOptions } from '@babel/core';
 import type { Plugin } from '@docusaurus/types';
+export declare function formatStatsErrorMessage(statsJson: ReturnType<webpack.Stats['toJson']> | undefined): string | undefined;
+export declare function printStatsWarnings(statsJson: ReturnType<webpack.Stats['toJson']> | undefined): void;
 export declare function getStyleLoaders(isServer: boolean, cssOptionsArg?: {
     [key: string]: unknown;
 }): RuleSetRule[];

package/lib/webpack/utils.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimizer = exports.getHttpsConfig = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = void 0;
+exports.getMinimizer = exports.getHttpsConfig = exports.compile = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = exports.printStatsWarnings = exports.formatStatsErrorMessage = 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"));
@@ -18,6 +18,28 @@ const webpack_merge_1 = require("webpack-merge");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-plugin"));
 const css_minimizer_webpack_plugin_1 = tslib_1.__importDefault(require("css-minimizer-webpack-plugin"));
+const formatWebpackMessages_1 = tslib_1.__importDefault(require("react-dev-utils/formatWebpackMessages"));
+function formatStatsErrorMessage(statsJson) {
+    if (statsJson?.errors?.length) {
+        // TODO formatWebpackMessages does not print stack-traces
+        // Also the error causal chain is lost here
+        // We log the stacktrace inside serverEntry.tsx for now (not ideal)
+        const { errors } = (0, formatWebpackMessages_1.default)(statsJson);
+        return errors
+            .map((str) => logger_1.default.red(str))
+            .join(`\n\n${logger_1.default.yellow('--------------------------')}\n\n`);
+    }
+    return undefined;
+}
+exports.formatStatsErrorMessage = formatStatsErrorMessage;
+function printStatsWarnings(statsJson) {
+    if (statsJson?.warnings?.length) {
+        statsJson.warnings?.forEach((warning) => {
+            logger_1.default.warn(warning);
+        });
+    }
+}
+exports.printStatsWarnings = printStatsWarnings;
 // Utility method to get style loaders
 function getStyleLoaders(isServer, cssOptionsArg = {}) {
     const cssOptions = {
@@ -151,7 +173,11 @@ function applyConfigurePostCss(configurePostCss, config) {
             entry.options.postcssOptions = configurePostCss(entry.options.postcssOptions);
         }
         else if (Array.isArray(entry.oneOf)) {
-            entry.oneOf.forEach(overridePostCssOptions);
+            entry.oneOf.forEach((r) => {
+                if (r) {
+                    overridePostCssOptions(r);
+                }
+            });
         }
         else if (Array.isArray(entry.use)) {
             entry.use
@@ -177,13 +203,10 @@ function compile(config) {
             // Let plugins consume all the stats
             const errorsWarnings = stats?.toJson('errors-warnings');
             if (stats?.hasErrors()) {
-                reject(new Error('Failed to compile with errors.'));
-            }
-            if (errorsWarnings && stats?.hasWarnings()) {
-                errorsWarnings.warnings?.forEach((warning) => {
-                    logger_1.default.warn(warning);
-                });
+                const statsErrorMessage = formatStatsErrorMessage(errorsWarnings);
+                reject(new Error(`Failed to compile due to Webpack errors.\n${statsErrorMessage}`));
             }
+            printStatsWarnings(errorsWarnings);
             // Webpack 5 requires calling close() so that persistent caching works
             // See https://github.com/webpack/webpack.js.org/pull/4775
             compiler.close((errClose) => {
@@ -273,7 +296,6 @@ function getMinimizer(useSimpleCssMinifier = false) {
                 },
                 compress: {
                     ecma: 5,
-                    warnings: false,
                 },
                 mangle: {
                     safari10: true,