@docusaurus/core 0.0.0-5945 → 0.0.0-5946

package/lib/client/clientEntry.js

@@ -6,12 +6,16 @@
  */
 import React, { startTransition } from 'react';
 import ReactDOM from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
 import { HelmetProvider } from 'react-helmet-async';
+import { BrowserRouter, HashRouter } from 'react-router-dom';
+import siteConfig from '@generated/docusaurus.config';
 import ExecutionEnvironment from './exports/ExecutionEnvironment';
 import App from './App';
 import preload from './preload';
 import docusaurus from './docusaurus';
+function Router({ children }) {
+    return siteConfig.future.experimental_router === 'hash' ? (<HashRouter>{children}</HashRouter>) : (<BrowserRouter>{children}</BrowserRouter>);
+}
 const hydrate = Boolean(process.env.HYDRATE_CLIENT_ENTRY);
 // Client-side render (e.g: running in browser) to become single-page
 // application (SPA).
@@ -19,9 +23,9 @@ if (ExecutionEnvironment.canUseDOM) {
     window.docusaurus = docusaurus;
     const container = document.getElementById('__docusaurus');
     const app = (<HelmetProvider>
-      <BrowserRouter>
+      <Router>
         <App />
-      </BrowserRouter>
+      </Router>
     </HelmetProvider>);
     const onRecoverableError = (error, errorInfo) => {
         console.error('Docusaurus React Root onRecoverableError:', error, errorInfo);

package/lib/client/exports/Link.js

@@ -19,7 +19,9 @@ import { useBaseUrlUtils } from './useBaseUrl';
 // like "introduction" to "/baseUrl/introduction" => bad behavior to fix
 const shouldAddBaseUrlAutomatically = (to) => to.startsWith('/');
 function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLinkCheck': noBrokenLinkCheck, autoAddBaseUrl = true, ...props }, forwardedRef) {
-    const { siteConfig: { trailingSlash, baseUrl }, } = useDocusaurusContext();
+    const { siteConfig } = useDocusaurusContext();
+    const { trailingSlash, baseUrl } = siteConfig;
+    const router = siteConfig.future.experimental_router;
     const { withBaseUrl } = useBaseUrlUtils();
     const brokenLinks = useBrokenLinks();
     const innerRef = useRef(null);
@@ -47,6 +49,14 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     let targetLink = typeof targetLinkWithoutPathnameProtocol !== 'undefined'
         ? maybeAddBaseUrl(targetLinkWithoutPathnameProtocol)
         : undefined;
+    // TODO find a way to solve this problem properly
+    // Fix edge case when useBaseUrl is used on a link
+    // "./" is useful for images and other resources
+    // But we don't need it for <Link>
+    // unfortunately we can't really make the difference :/
+    if (router === 'hash' && targetLink?.startsWith('./')) {
+        targetLink = targetLink?.slice(1);
+    }
     if (targetLink && isInternal) {
         targetLink = applyTrailingSlash(targetLink, { trailingSlash, baseUrl });
     }
@@ -103,7 +113,7 @@ function Link({ isNavLink, to, href, activeClassName, isActive, 'data-noBrokenLi
     // https://github.com/remix-run/react-router/blob/v5/packages/react-router-dom/modules/Link.js#L47
     const hasInternalTarget = !props.target || props.target === '_self';
     // Should we use a regular <a> tag instead of React-Router Link component?
-    const isRegularHtmlLink = !targetLink || !isInternal || !hasInternalTarget || isAnchorLink;
+    const isRegularHtmlLink = !targetLink || !isInternal || !hasInternalTarget;
     if (!noBrokenLinkCheck && (isAnchorLink || !isRegularHtmlLink)) {
         brokenLinks.collectLink(targetLink);
     }

package/lib/client/exports/useBaseUrl.d.ts

@@ -6,5 +6,13 @@
  */
 /// <reference types="@docusaurus/module-type-aliases" />
 import type { BaseUrlOptions, BaseUrlUtils } from '@docusaurus/useBaseUrl';
+import type { RouterType } from '@docusaurus/types';
+export declare function addBaseUrl({ siteUrl, baseUrl, url, options: { forcePrependBaseUrl, absolute }, router, }: {
+    siteUrl: string;
+    baseUrl: string;
+    url: string;
+    router: RouterType;
+    options?: BaseUrlOptions;
+}): string;
 export declare function useBaseUrlUtils(): BaseUrlUtils;
 export default function useBaseUrl(url: string, options?: BaseUrlOptions): string;

package/lib/client/exports/useBaseUrl.js

@@ -7,12 +7,18 @@
 import { useCallback } from 'react';
 import useDocusaurusContext from './useDocusaurusContext';
 import { hasProtocol } from './isInternalUrl';
-function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolute = false } = {}) {
+export function addBaseUrl({ siteUrl, baseUrl, url, options: { forcePrependBaseUrl = false, absolute = false } = {}, router, }) {
     // It never makes sense to add base url to a local anchor url, or one with a
     // protocol
     if (!url || url.startsWith('#') || hasProtocol(url)) {
         return url;
     }
+    // TODO hash router + /baseUrl/ is unlikely to work well in all situations
+    // This will support most cases, but not all
+    // See https://github.com/facebook/docusaurus/pull/9859
+    if (router === 'hash') {
+        return url.startsWith('/') ? `.${url}` : `./${url}`;
+    }
     if (forcePrependBaseUrl) {
         return baseUrl + url.replace(/^\//, '');
     }
@@ -27,8 +33,10 @@ function addBaseUrl(siteUrl, baseUrl, url, { forcePrependBaseUrl = false, absolu
     return absolute ? siteUrl + basePath : basePath;
 }
 export function useBaseUrlUtils() {
-    const { siteConfig: { baseUrl, url: siteUrl }, } = useDocusaurusContext();
-    const withBaseUrl = useCallback((url, options) => addBaseUrl(siteUrl, baseUrl, url, options), [siteUrl, baseUrl]);
+    const { siteConfig } = useDocusaurusContext();
+    const { baseUrl, url: siteUrl } = siteConfig;
+    const router = siteConfig.future.experimental_router;
+    const withBaseUrl = useCallback((url, options) => addBaseUrl({ siteUrl, baseUrl, url, options, router }), [siteUrl, baseUrl, router]);
     return {
         withBaseUrl,
     };

package/lib/commands/build.js

@@ -111,7 +111,8 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         localizePath: cliOptions.locale ? false : undefined,
     }));
     const { props } = site;
-    const { outDir, plugins } = props;
+    const { outDir, plugins, siteConfig } = props;
+    const router = siteConfig.future.experimental_router;
     // We can build the 2 configs in parallel
     const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await utils_3.PerfLogger.async('Creating webpack configs', () => Promise.all([
         getBuildClientConfig({
@@ -123,11 +124,19 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         }),
     ]));
     // Run webpack to build JS bundle (client) and static html files (server).
-    await utils_3.PerfLogger.async('Bundling with Webpack', () => (0, utils_2.compile)([clientConfig, serverConfig]));
+    await utils_3.PerfLogger.async('Bundling with Webpack', () => {
+        if (router === 'hash') {
+            return (0, utils_2.compile)([clientConfig]);
+        }
+        else {
+            return (0, utils_2.compile)([clientConfig, serverConfig]);
+        }
+    });
     const { collectedData } = await utils_3.PerfLogger.async('SSG', () => executeSSG({
         props,
         serverBundlePath,
         clientManifestPath,
+        router,
     }));
     // Remove server.bundle.js because it is not needed.
     await utils_3.PerfLogger.async('Deleting server bundle', () => ensureUnlink(serverBundlePath));
@@ -138,27 +147,35 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     logger_1.default.success `Generated static files in path=${path_1.default.relative(process.cwd(), outDir)}.`;
     return outDir;
 }
-async function executeSSG({ props, serverBundlePath, clientManifestPath, }) {
+async function executeSSG({ props, serverBundlePath, clientManifestPath, router, }) {
     const manifest = await utils_3.PerfLogger.async('Read client manifest', () => fs_extra_1.default.readJSON(clientManifestPath, 'utf-8'));
     const ssrTemplate = await utils_3.PerfLogger.async('Compile SSR template', () => (0, templates_1.compileSSRTemplate)(props.siteConfig.ssrTemplate ?? ssr_html_template_1.default));
+    const params = {
+        trailingSlash: props.siteConfig.trailingSlash,
+        outDir: props.outDir,
+        baseUrl: props.baseUrl,
+        manifest,
+        headTags: props.headTags,
+        preBodyTags: props.preBodyTags,
+        postBodyTags: props.postBodyTags,
+        ssrTemplate,
+        noIndex: props.siteConfig.noIndex,
+        DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
+    };
+    if (router === 'hash') {
+        utils_3.PerfLogger.start('Generate Hash Router entry point');
+        const content = (0, templates_1.renderHashRouterTemplate)({ params });
+        await (0, ssg_1.generateHashRouterEntrypoint)({ content, params });
+        utils_3.PerfLogger.end('Generate Hash Router entry point');
+        return { collectedData: {} };
+    }
     const renderer = await utils_3.PerfLogger.async('Load App renderer', () => (0, ssg_1.loadAppRenderer)({
         serverBundlePath,
     }));
     const ssgResult = await utils_3.PerfLogger.async('Generate static files', () => (0, ssg_1.generateStaticFiles)({
         pathnames: props.routesPaths,
         renderer,
-        params: {
-            trailingSlash: props.siteConfig.trailingSlash,
-            outDir: props.outDir,
-            baseUrl: props.baseUrl,
-            manifest,
-            headTags: props.headTags,
-            preBodyTags: props.preBodyTags,
-            postBodyTags: props.postBodyTags,
-            ssrTemplate,
-            noIndex: props.siteConfig.noIndex,
-            DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
-        },
+        params,
     }));
     return ssgResult;
 }

package/lib/commands/start/utils.d.ts

@@ -6,12 +6,13 @@
  */
 import _ from 'lodash';
 import type { StartCLIOptions } from './start';
-import type { LoadedPlugin } from '@docusaurus/types';
+import type { LoadedPlugin, RouterType } from '@docusaurus/types';
 export type OpenUrlContext = {
     host: string;
     port: number;
-    getOpenUrl: ({ baseUrl }: {
+    getOpenUrl: ({ baseUrl, router, }: {
         baseUrl: string;
+        router: RouterType;
     }) => string;
 };
 export declare function createOpenUrlContext({ cliOptions, }: {

package/lib/commands/start/utils.js

@@ -23,9 +23,13 @@ async function createOpenUrlContext({ cliOptions, }) {
     if (port === null) {
         return process.exit();
     }
-    const getOpenUrl = ({ baseUrl }) => {
+    const getOpenUrl = ({ baseUrl, router }) => {
         const urls = (0, WebpackDevServerUtils_1.prepareUrls)(protocol, host, port);
-        return (0, utils_1.normalizeUrl)([urls.localUrlForBrowser, baseUrl]);
+        return (0, utils_1.normalizeUrl)([
+            urls.localUrlForBrowser,
+            router === 'hash' ? '/#/' : '',
+            baseUrl,
+        ]);
     };
     return { host, port, getOpenUrl };
 }
@@ -47,6 +51,7 @@ async function createReloadableSite(startParams) {
     const get = () => site;
     const getOpenUrl = () => openUrlContext.getOpenUrl({
         baseUrl: site.props.baseUrl,
+        router: site.props.siteConfig.future.experimental_router,
     });
     const printOpenUrlMessage = () => {
         logger_1.default.success `Docusaurus website is running at: url=${getOpenUrl()}`;

package/lib/commands/start/webpack.js

@@ -61,7 +61,7 @@ async function createDevServerConfig({ cliOptions, props, host, port, }) {
             'access-control-allow-origin': '*',
         },
         devMiddleware: {
-            publicPath: baseUrl,
+            publicPath: siteConfig.future.experimental_router === 'hash' ? 'auto' : baseUrl,
             // Reduce log verbosity, see https://github.com/facebook/docusaurus/pull/5420#issuecomment-906613105
             stats: 'summary',
         },

package/lib/server/configValidation.js

@@ -23,6 +23,7 @@ exports.DEFAULT_STORAGE_CONFIG = {
 };
 exports.DEFAULT_FUTURE_CONFIG = {
     experimental_storage: exports.DEFAULT_STORAGE_CONFIG,
+    experimental_router: 'browser',
 };
 exports.DEFAULT_MARKDOWN_CONFIG = {
     format: 'mdx', // TODO change this to "detect" in Docusaurus v4?
@@ -140,6 +141,9 @@ const STORAGE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     .default(exports.DEFAULT_STORAGE_CONFIG);
 const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     experimental_storage: STORAGE_CONFIG_SCHEMA,
+    experimental_router: utils_validation_1.Joi.string()
+        .equal('browser', 'hash')
+        .default(exports.DEFAULT_FUTURE_CONFIG.experimental_router),
 })
     .optional()
     .default(exports.DEFAULT_FUTURE_CONFIG);

package/lib/server/htmlTags.d.ts

@@ -4,9 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { Props, LoadedPlugin } from '@docusaurus/types';
+import type { Props, LoadedPlugin, RouterType } from '@docusaurus/types';
 /**
  * Runs the `injectHtmlTags` lifecycle, and aggregates all plugins' tags into
  * directly render-able HTML markup.
  */
-export declare function loadHtmlTags(plugins: LoadedPlugin[]): Pick<Props, 'headTags' | 'preBodyTags' | 'postBodyTags'>;
+export declare function loadHtmlTags({ plugins, router, }: {
+    plugins: LoadedPlugin[];
+    router: RouterType;
+}): Pick<Props, 'headTags' | 'preBodyTags' | 'postBodyTags'>;

package/lib/server/htmlTags.js

@@ -23,16 +23,25 @@ function assertIsHtmlTagObject(val) {
         throw new Error(`Error loading ${JSON.stringify(val)}, "${val.tagName}" is not a valid HTML tag.`);
     }
 }
-function htmlTagObjectToString(tag) {
+function hashRouterAbsoluteToRelativeTagAttribute(name, value) {
+    if ((name === 'src' || name === 'href') && value.startsWith('/')) {
+        return `.${value}`;
+    }
+    return value;
+}
+function htmlTagObjectToString({ tag, router, }) {
     assertIsHtmlTagObject(tag);
     const isVoidTag = void_1.default.includes(tag.tagName);
     const tagAttributes = tag.attributes ?? {};
     const attributes = Object.keys(tagAttributes)
         .map((attr) => {
-        const value = tagAttributes[attr];
+        let value = tagAttributes[attr];
         if (typeof value === 'boolean') {
             return value ? attr : undefined;
         }
+        if (router === 'hash') {
+            value = hashRouterAbsoluteToRelativeTagAttribute(attr, value);
+        }
         return `${attr}="${(0, escape_html_1.default)(value)}"`;
     })
         .filter((str) => Boolean(str));
@@ -41,21 +50,21 @@ function htmlTagObjectToString(tag) {
     const closingTag = isVoidTag ? '' : `</${tag.tagName}>`;
     return openingTag + innerHTML + closingTag;
 }
-function createHtmlTagsString(tags) {
+function createHtmlTagsString({ tags, router, }) {
     return (Array.isArray(tags) ? tags : [tags])
         .filter(Boolean)
-        .map((val) => (typeof val === 'string' ? val : htmlTagObjectToString(val)))
+        .map((val) => typeof val === 'string' ? val : htmlTagObjectToString({ tag: val, router }))
         .join('\n');
 }
 /**
  * Runs the `injectHtmlTags` lifecycle, and aggregates all plugins' tags into
  * directly render-able HTML markup.
  */
-function loadHtmlTags(plugins) {
+function loadHtmlTags({ plugins, router, }) {
     const pluginHtmlTags = plugins.map((plugin) => plugin.injectHtmlTags?.({ content: plugin.content }) ?? {});
     const tagTypes = ['headTags', 'preBodyTags', 'postBodyTags'];
     return Object.fromEntries(lodash_1.default.zip(tagTypes, tagTypes.map((type) => pluginHtmlTags
-        .map((tags) => createHtmlTagsString(tags[type]))
+        .map((tags) => createHtmlTagsString({ tags: tags[type], router }))
         .join('\n')
         .trim())));
 }

package/lib/server/site.js

@@ -73,7 +73,10 @@ exports.loadContext = loadContext;
 function createSiteProps(params) {
     const { plugins, routes, context } = params;
     const { generatedFilesDir, siteDir, siteVersion, siteConfig, siteConfigPath, siteStorage, outDir, baseUrl, i18n, localizationDir, codeTranslations: siteCodeTranslations, } = context;
-    const { headTags, preBodyTags, postBodyTags } = (0, htmlTags_1.loadHtmlTags)(plugins);
+    const { headTags, preBodyTags, postBodyTags } = (0, htmlTags_1.loadHtmlTags)({
+        plugins,
+        router: siteConfig.future.experimental_router,
+    });
     const siteMetadata = (0, siteMetadata_1.createSiteMetadata)({ plugins, siteVersion });
     const codeTranslations = {
         ...(0, translations_1.getPluginsDefaultCodeTranslations)({ plugins }),

package/lib/ssg.d.ts

@@ -30,3 +30,7 @@ export declare function generateStaticFiles({ pathnames, renderer, params, }: {
 }): Promise<{
     collectedData: SiteCollectedData;
 }>;
+export declare function generateHashRouterEntrypoint({ content, params, }: {
+    content: string;
+    params: SSGParams;
+}): Promise<void>;

package/lib/ssg.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateStaticFiles = exports.loadAppRenderer = void 0;
+exports.generateHashRouterEntrypoint = exports.generateStaticFiles = exports.loadAppRenderer = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const module_1 = require("module");
@@ -133,6 +133,14 @@ It might also require to wrap your client code in ${logger_1.default.code('useEf
     }
     return parts.join('\n');
 }
+async function generateHashRouterEntrypoint({ content, params, }) {
+    await writeStaticFile({
+        pathname: '/',
+        content,
+        params,
+    });
+}
+exports.generateHashRouterEntrypoint = generateHashRouterEntrypoint;
 async function writeStaticFile({ content, pathname, params, }) {
     function removeBaseUrl(p, baseUrl) {
         return baseUrl === '/' ? p : p.replace(new RegExp(`^${baseUrl}`), '/');

package/lib/templates/templates.d.ts

@@ -26,3 +26,6 @@ export declare function renderSSRTemplate({ params, result, }: {
     params: SSGParams;
     result: AppRenderResult;
 }): string;
+export declare function renderHashRouterTemplate({ params, }: {
+    params: SSGParams;
+}): string;

package/lib/templates/templates.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSSRTemplate = exports.compileSSRTemplate = void 0;
+exports.renderHashRouterTemplate = exports.renderSSRTemplate = exports.compileSSRTemplate = void 0;
 const tslib_1 = require("tslib");
 const eta = tslib_1.__importStar(require("eta"));
 const react_loadable_ssr_addon_v5_slorber_1 = require("react-loadable-ssr-addon-v5-slorber");
@@ -61,3 +61,28 @@ function renderSSRTemplate({ params, result, }) {
     return ssrTemplate(data);
 }
 exports.renderSSRTemplate = renderSSRTemplate;
+function renderHashRouterTemplate({ params, }) {
+    const { 
+    // baseUrl,
+    headTags, preBodyTags, postBodyTags, manifest, DOCUSAURUS_VERSION, ssrTemplate, } = params;
+    const { scripts, stylesheets } = getScriptsAndStylesheets({
+        manifest,
+        modules: [],
+    });
+    const data = {
+        appHtml: '',
+        baseUrl: './',
+        htmlAttributes: '',
+        bodyAttributes: '',
+        headTags,
+        preBodyTags,
+        postBodyTags,
+        metaAttributes: [],
+        scripts,
+        stylesheets,
+        noIndex: false,
+        version: DOCUSAURUS_VERSION,
+    };
+    return ssrTemplate(data);
+}
+exports.renderHashRouterTemplate = renderHashRouterTemplate;

package/lib/webpack/base.js

@@ -79,7 +79,7 @@ async function createBaseConfig({ props, isServer, minify, }) {
             chunkFilename: isProd
                 ? 'assets/js/[name].[contenthash:8].js'
                 : '[name].js',
-            publicPath: baseUrl,
+            publicPath: siteConfig.future.experimental_router === 'hash' ? 'auto' : baseUrl,
             hashFunction: 'xxhash64',
         },
         // Don't throw warning when asset created is over 250kb

package/lib/webpack/client.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuildClientConfig = exports.createStartClientConfig = void 0;
 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 = tslib_1.__importDefault(require("webpack"));
@@ -18,21 +17,9 @@ const react_loadable_ssr_addon_v5_slorber_1 = tslib_1.__importDefault(require("r
 const html_webpack_plugin_1 = tslib_1.__importDefault(require("html-webpack-plugin"));
 const base_1 = require("./base");
 const ChunkAssetPlugin_1 = tslib_1.__importDefault(require("./plugins/ChunkAssetPlugin"));
-const utils_1 = require("./utils");
 const CleanWebpackPlugin_1 = tslib_1.__importDefault(require("./plugins/CleanWebpackPlugin"));
-// When building, include the plugin to force terminate building if errors
-// happened in the client bundle.
-class ForceTerminatePlugin {
-    apply(compiler) {
-        compiler.hooks.done.tap('client:done', (stats) => {
-            if (stats.hasErrors()) {
-                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);
-            }
-        });
-    }
-}
+const ForceTerminatePlugin_1 = tslib_1.__importDefault(require("./plugins/ForceTerminatePlugin"));
+const StaticDirectoriesCopyPlugin_1 = require("./plugins/StaticDirectoriesCopyPlugin");
 async function createBaseClientConfig({ props, hydrate, minify, }) {
     const baseConfig = await (0, base_1.createBaseConfig)({ props, isServer: false, minify });
     return (0, webpack_merge_1.default)(baseConfig, {
@@ -54,6 +41,7 @@ async function createBaseClientConfig({ props, hydrate, minify, }) {
             new webpackbar_1.default({
                 name: 'Client',
             }),
+            await (0, StaticDirectoriesCopyPlugin_1.createStaticDirectoriesCopyPlugin)({ props }),
         ],
     });
 }
@@ -93,11 +81,15 @@ exports.createStartClientConfig = createStartClientConfig;
 // client config when running "docusaurus build"
 async function createBuildClientConfig({ props, minify, bundleAnalyzer, }) {
     // Apply user webpack config.
-    const { generatedFilesDir } = props;
+    const { generatedFilesDir, siteConfig } = props;
+    const router = siteConfig.future.experimental_router;
+    // With the hash router, we don't hydrate the React app, even in build mode!
+    // This is because it will always be a client-rendered React app
+    const hydrate = router !== 'hash';
     const clientManifestPath = path_1.default.join(generatedFilesDir, 'client-manifest.json');
-    const config = (0, webpack_merge_1.default)(await createBaseClientConfig({ props, minify, hydrate: true }), {
+    const config = (0, webpack_merge_1.default)(await createBaseClientConfig({ props, minify, hydrate }), {
         plugins: [
-            new ForceTerminatePlugin(),
+            new ForceTerminatePlugin_1.default(),
             // Remove/clean build folders before building bundles.
             new CleanWebpackPlugin_1.default({ verbose: false }),
             // Visualize size of webpack output files with an interactive zoomable

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

@@ -0,0 +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 type webpack from 'webpack';
+export default class ForceTerminatePlugin implements webpack.WebpackPluginInstance {
+    apply(compiler: webpack.Compiler): void;
+}

package/lib/webpack/plugins/ForceTerminatePlugin.js

@@ -0,0 +1,25 @@
+"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 });
+const tslib_1 = require("tslib");
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const utils_1 = require("../utils");
+// When building, include the plugin to force terminate building if errors
+// happened in the client bundle.
+class ForceTerminatePlugin {
+    apply(compiler) {
+        compiler.hooks.done.tap('client:done', (stats) => {
+            if (stats.hasErrors()) {
+                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);
+            }
+        });
+    }
+}
+exports.default = ForceTerminatePlugin;

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

@@ -0,0 +1,11 @@
+/**
+ * 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 CopyWebpackPlugin from 'copy-webpack-plugin';
+import type { Props } from '@docusaurus/types';
+export declare function createStaticDirectoriesCopyPlugin({ props, }: {
+    props: Props;
+}): Promise<CopyWebpackPlugin | undefined>;

package/lib/webpack/plugins/StaticDirectoriesCopyPlugin.js

@@ -0,0 +1,39 @@
+"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.createStaticDirectoriesCopyPlugin = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
+async function createStaticDirectoriesCopyPlugin({ props, }) {
+    const { outDir, siteDir, siteConfig: { staticDirectories: staticDirectoriesOption }, } = props;
+    // The staticDirectories option can contain empty directories, or non-existent
+    // directories (e.g. user deleted `static`). Instead of issuing an error, we
+    // just silently filter them out, because user could have never configured it
+    // in the first place (the default option should always "work").
+    const staticDirectories = (await Promise.all(staticDirectoriesOption.map(async (dir) => {
+        const staticDir = path_1.default.resolve(siteDir, dir);
+        if ((await fs_extra_1.default.pathExists(staticDir)) &&
+            (await fs_extra_1.default.readdir(staticDir)).length > 0) {
+            return staticDir;
+        }
+        return '';
+    }))).filter(Boolean);
+    if (staticDirectories.length === 0) {
+        return undefined;
+    }
+    return new copy_webpack_plugin_1.default({
+        patterns: staticDirectories.map((dir) => ({
+            from: dir,
+            to: outDir,
+            toType: 'dir',
+        })),
+    });
+}
+exports.createStaticDirectoriesCopyPlugin = createStaticDirectoriesCopyPlugin;

package/lib/webpack/server.js

@@ -8,11 +8,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 webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const utils_1 = require("@docusaurus/utils");
 const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
-const copy_webpack_plugin_1 = tslib_1.__importDefault(require("copy-webpack-plugin"));
 const base_1 = require("./base");
 async function createServerConfig(params) {
     const { props } = params;
@@ -41,34 +39,8 @@ async function createServerConfig(params) {
                 name: 'Server',
                 color: 'yellow',
             }),
-            await createStaticDirectoriesCopyPlugin(params),
         ].filter(Boolean),
     });
     return { config, serverBundlePath };
 }
 exports.default = createServerConfig;
-async function createStaticDirectoriesCopyPlugin({ props }) {
-    const { outDir, siteDir, siteConfig: { staticDirectories: staticDirectoriesOption }, } = props;
-    // The staticDirectories option can contain empty directories, or non-existent
-    // directories (e.g. user deleted `static`). Instead of issuing an error, we
-    // just silently filter them out, because user could have never configured it
-    // in the first place (the default option should always "work").
-    const staticDirectories = (await Promise.all(staticDirectoriesOption.map(async (dir) => {
-        const staticDir = path_1.default.resolve(siteDir, dir);
-        if ((await fs_extra_1.default.pathExists(staticDir)) &&
-            (await fs_extra_1.default.readdir(staticDir)).length > 0) {
-            return staticDir;
-        }
-        return '';
-    }))).filter(Boolean);
-    if (staticDirectories.length === 0) {
-        return undefined;
-    }
-    return new copy_webpack_plugin_1.default({
-        patterns: staticDirectories.map((dir) => ({
-            from: dir,
-            to: outDir,
-            toType: 'dir',
-        })),
-    });
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5945",
+  "version": "0.0.0-5946",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-5945",
-    "@docusaurus/logger": "0.0.0-5945",
-    "@docusaurus/mdx-loader": "0.0.0-5945",
-    "@docusaurus/utils": "0.0.0-5945",
-    "@docusaurus/utils-common": "0.0.0-5945",
-    "@docusaurus/utils-validation": "0.0.0-5945",
+    "@docusaurus/cssnano-preset": "0.0.0-5946",
+    "@docusaurus/logger": "0.0.0-5946",
+    "@docusaurus/mdx-loader": "0.0.0-5946",
+    "@docusaurus/utils": "0.0.0-5946",
+    "@docusaurus/utils-common": "0.0.0-5946",
+    "@docusaurus/utils-validation": "0.0.0-5946",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -103,8 +103,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5945",
-    "@docusaurus/types": "0.0.0-5945",
+    "@docusaurus/module-type-aliases": "0.0.0-5946",
+    "@docusaurus/types": "0.0.0-5946",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -124,5 +124,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "93d26c046a449a18fd39d96f34d08518f833cdf3"
+  "gitHead": "22332e32d47aea6bc27ca36b2ef50f12cd1427c8"
 }