@docusaurus/core 0.0.0-5940 → 0.0.0-5942

package/lib/commands/build.js

@@ -17,6 +17,7 @@ const site_1 = require("../server/site");
 const brokenLinks_1 = require("../server/brokenLinks");
 const client_1 = require("../webpack/client");
 const server_1 = tslib_1.__importDefault(require("../webpack/server"));
+const configure_1 = require("../webpack/configure");
 const utils_2 = require("../webpack/utils");
 const utils_3 = require("../utils");
 const i18n_1 = require("../server/i18n");
@@ -194,11 +195,7 @@ async function getBuildClientConfig({ props, cliOptions, }) {
         bundleAnalyzer: cliOptions.bundleAnalyzer ?? false,
     });
     let { config } = result;
-    config = (0, utils_2.executePluginsConfigurePostCss)({
-        plugins,
-        config,
-    });
-    config = (0, utils_2.executePluginsConfigureWebpack)({
+    config = (0, configure_1.executePluginsConfigureWebpack)({
         plugins,
         config,
         isServer: false,
@@ -212,7 +209,7 @@ async function getBuildServerConfig({ props }) {
         props,
     });
     let { config } = result;
-    config = (0, utils_2.executePluginsConfigureWebpack)({
+    config = (0, configure_1.executePluginsConfigureWebpack)({
         plugins,
         config,
         isServer: true,

package/lib/commands/serve.js

@@ -52,10 +52,21 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
         }
         // We do the redirect ourselves for a good reason
         // server-handler is annoying and won't include /baseUrl/ in redirects
-        const normalizedUrl = (0, utils_common_1.applyTrailingSlash)(req.url, { trailingSlash, baseUrl });
-        if (req.url !== normalizedUrl) {
-            redirect(res, normalizedUrl);
-            return;
+        // See https://github.com/facebook/docusaurus/issues/10078#issuecomment-2084932934
+        if (baseUrl !== '/') {
+            // Not super robust, but should be good enough for our use case
+            // See https://github.com/facebook/docusaurus/pull/10090
+            const looksLikeAsset = !!req.url.match(/.[a-z]{1,4}$/);
+            if (!looksLikeAsset) {
+                const normalizedUrl = (0, utils_common_1.applyTrailingSlash)(req.url, {
+                    trailingSlash,
+                    baseUrl,
+                });
+                if (req.url !== normalizedUrl) {
+                    redirect(res, normalizedUrl);
+                    return;
+                }
+            }
         }
         // Remove baseUrl before calling serveHandler, because /baseUrl/ should
         // serve /build/index.html, not /build/baseUrl/index.html (does not exist)

package/lib/commands/start/webpack.js

@@ -16,6 +16,7 @@ const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server
 const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("react-dev-utils/evalSourceMapMiddleware"));
 const watcher_1 = require("./watcher");
 const utils_1 = require("../../webpack/utils");
+const configure_1 = require("../../webpack/configure");
 const client_1 = require("../../webpack/client");
 // E2E_TEST=true docusaurus start
 // Makes "docusaurus start" exit immediately on success/error, for E2E test
@@ -103,8 +104,7 @@ async function getStartClientConfig({ props, minify, poll, }) {
         minify,
         poll,
     });
-    config = (0, utils_1.executePluginsConfigurePostCss)({ plugins, config });
-    config = (0, utils_1.executePluginsConfigureWebpack)({
+    config = (0, configure_1.executePluginsConfigureWebpack)({
         plugins,
         config,
         isServer: false,

package/lib/webpack/configure.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 { Configuration, RuleSetRule } from 'webpack';
+import type { Plugin, LoadedPlugin } from '@docusaurus/types';
+/**
+ * Helper function to modify webpack config
+ * @param configureWebpack a webpack config or a function to modify config
+ * @param config initial webpack config
+ * @param isServer indicates if this is a server webpack configuration
+ * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
+ * @returns final/ modified webpack config
+ */
+export declare function applyConfigureWebpack(configureWebpack: NonNullable<Plugin['configureWebpack']>, config: Configuration, isServer: boolean, jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined, content: unknown): Configuration;
+export declare function applyConfigurePostCss(configurePostCss: NonNullable<Plugin['configurePostCss']>, config: Configuration): Configuration;
+export declare function executePluginsConfigureWebpack({ plugins, config, isServer, jsLoader, }: {
+    plugins: LoadedPlugin[];
+    config: Configuration;
+    isServer: boolean;
+    jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined;
+}): Configuration;

package/lib/webpack/configure.js

@@ -0,0 +1,100 @@
+"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.executePluginsConfigureWebpack = exports.applyConfigurePostCss = exports.applyConfigureWebpack = void 0;
+const webpack_merge_1 = require("webpack-merge");
+const utils_1 = require("./utils");
+/**
+ * Helper function to modify webpack config
+ * @param configureWebpack a webpack config or a function to modify config
+ * @param config initial webpack config
+ * @param isServer indicates if this is a server webpack configuration
+ * @param jsLoader custom js loader config
+ * @param content content loaded by the plugin
+ * @returns final/ modified webpack config
+ */
+function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, content) {
+    // Export some utility functions
+    const utils = {
+        getStyleLoaders: utils_1.getStyleLoaders,
+        getJSLoader: (0, utils_1.getCustomizableJSLoader)(jsLoader),
+    };
+    if (typeof configureWebpack === 'function') {
+        const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils, content) ?? {};
+        const customizeRules = mergeStrategy ?? {};
+        return (0, webpack_merge_1.mergeWithCustomize)({
+            customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
+            customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
+        })(config, res);
+    }
+    return config;
+}
+exports.applyConfigureWebpack = applyConfigureWebpack;
+function applyConfigurePostCss(configurePostCss, config) {
+    // Not ideal heuristic but good enough for our use-case?
+    function isPostCssLoader(loader) {
+        return !!loader?.options?.postcssOptions;
+    }
+    // Does not handle all edge cases, but good enough for now
+    function overridePostCssOptions(entry) {
+        if (isPostCssLoader(entry)) {
+            entry.options.postcssOptions = configurePostCss(entry.options.postcssOptions);
+        }
+        else if (Array.isArray(entry.oneOf)) {
+            entry.oneOf.forEach((r) => {
+                if (r) {
+                    overridePostCssOptions(r);
+                }
+            });
+        }
+        else if (Array.isArray(entry.use)) {
+            entry.use
+                .filter((u) => typeof u === 'object')
+                .forEach((rule) => overridePostCssOptions(rule));
+        }
+    }
+    config.module?.rules?.forEach((rule) => overridePostCssOptions(rule));
+    return config;
+}
+exports.applyConfigurePostCss = applyConfigurePostCss;
+// Plugin Lifecycle - configurePostCss()
+function executePluginsConfigurePostCss({ plugins, config, }) {
+    let resultConfig = config;
+    plugins.forEach((plugin) => {
+        const { configurePostCss } = plugin;
+        if (configurePostCss) {
+            resultConfig = applyConfigurePostCss(configurePostCss.bind(plugin), resultConfig);
+        }
+    });
+    return resultConfig;
+}
+// Plugin Lifecycle - configureWebpack()
+function executePluginsConfigureWebpack({ plugins, config, isServer, jsLoader, }) {
+    // Step1 - Configure Webpack
+    let resultConfig = config;
+    plugins.forEach((plugin) => {
+        const { configureWebpack } = plugin;
+        if (configureWebpack) {
+            resultConfig = applyConfigureWebpack(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
+            resultConfig, isServer, jsLoader, plugin.content);
+        }
+    });
+    // Step2 - For client code, configure PostCSS
+    // The order matters! We want to configure PostCSS on loaders
+    // that were potentially added by configureWebpack
+    // See https://github.com/facebook/docusaurus/issues/10106
+    // Note: it's useless to configure postCSS for the server
+    if (!isServer) {
+        resultConfig = executePluginsConfigurePostCss({
+            plugins,
+            config: resultConfig,
+        });
+    }
+    return resultConfig;
+}
+exports.executePluginsConfigureWebpack = executePluginsConfigureWebpack;

package/lib/webpack/utils.d.ts

@@ -7,7 +7,6 @@
 /// <reference types="node" />
 import webpack, { type Configuration, type RuleSetRule } from 'webpack';
 import type { TransformOptions } from '@babel/core';
-import type { Plugin, LoadedPlugin } 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?: {
@@ -22,27 +21,6 @@ export declare const getCustomizableJSLoader: (jsLoader?: 'babel' | ((isServer:
     isServer: boolean;
     babelOptions?: TransformOptions | string;
 }) => RuleSetRule;
-/**
- * Helper function to modify webpack config
- * @param configureWebpack a webpack config or a function to modify config
- * @param config initial webpack config
- * @param isServer indicates if this is a server webpack configuration
- * @param jsLoader custom js loader config
- * @param content content loaded by the plugin
- * @returns final/ modified webpack config
- */
-export declare function applyConfigureWebpack(configureWebpack: NonNullable<Plugin['configureWebpack']>, config: Configuration, isServer: boolean, jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined, content: unknown): Configuration;
-export declare function applyConfigurePostCss(configurePostCss: NonNullable<Plugin['configurePostCss']>, config: Configuration): Configuration;
-export declare function executePluginsConfigurePostCss({ plugins, config, }: {
-    plugins: LoadedPlugin[];
-    config: Configuration;
-}): Configuration;
-export declare function executePluginsConfigureWebpack({ plugins, config, isServer, jsLoader, }: {
-    plugins: LoadedPlugin[];
-    config: Configuration;
-    isServer: boolean;
-    jsLoader: 'babel' | ((isServer: boolean) => RuleSetRule) | undefined;
-}): Configuration;
 declare global {
     interface Error {
         /** @see https://webpack.js.org/api/node/#error-handling */

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.getHttpsConfig = exports.compile = exports.executePluginsConfigureWebpack = exports.executePluginsConfigurePostCss = exports.applyConfigurePostCss = exports.applyConfigureWebpack = exports.getCustomizableJSLoader = exports.getBabelOptions = exports.getCustomBabelConfigFilePath = exports.getStyleLoaders = exports.printStatsWarnings = exports.formatStatsErrorMessage = void 0;
+exports.getHttpsConfig = exports.compile = 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"));
@@ -14,7 +14,6 @@ const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const mini_css_extract_plugin_1 = tslib_1.__importDefault(require("mini-css-extract-plugin"));
-const webpack_merge_1 = require("webpack-merge");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const formatWebpackMessages_1 = tslib_1.__importDefault(require("react-dev-utils/formatWebpackMessages"));
 function formatStatsErrorMessage(statsJson) {
@@ -134,84 +133,6 @@ const getCustomizableJSLoader = (jsLoader = 'babel') => ({ isServer, babelOption
     ? getDefaultBabelLoader({ isServer, babelOptions })
     : jsLoader(isServer);
 exports.getCustomizableJSLoader = getCustomizableJSLoader;
-/**
- * Helper function to modify webpack config
- * @param configureWebpack a webpack config or a function to modify config
- * @param config initial webpack config
- * @param isServer indicates if this is a server webpack configuration
- * @param jsLoader custom js loader config
- * @param content content loaded by the plugin
- * @returns final/ modified webpack config
- */
-function applyConfigureWebpack(configureWebpack, config, isServer, jsLoader, content) {
-    // Export some utility functions
-    const utils = {
-        getStyleLoaders,
-        getJSLoader: (0, exports.getCustomizableJSLoader)(jsLoader),
-    };
-    if (typeof configureWebpack === 'function') {
-        const { mergeStrategy, ...res } = configureWebpack(config, isServer, utils, content) ?? {};
-        const customizeRules = mergeStrategy ?? {};
-        return (0, webpack_merge_1.mergeWithCustomize)({
-            customizeArray: (0, webpack_merge_1.customizeArray)(customizeRules),
-            customizeObject: (0, webpack_merge_1.customizeObject)(customizeRules),
-        })(config, res);
-    }
-    return config;
-}
-exports.applyConfigureWebpack = applyConfigureWebpack;
-function applyConfigurePostCss(configurePostCss, config) {
-    // Not ideal heuristic but good enough for our use-case?
-    function isPostCssLoader(loader) {
-        return !!loader?.options?.postcssOptions;
-    }
-    // Does not handle all edge cases, but good enough for now
-    function overridePostCssOptions(entry) {
-        if (isPostCssLoader(entry)) {
-            entry.options.postcssOptions = configurePostCss(entry.options.postcssOptions);
-        }
-        else if (Array.isArray(entry.oneOf)) {
-            entry.oneOf.forEach((r) => {
-                if (r) {
-                    overridePostCssOptions(r);
-                }
-            });
-        }
-        else if (Array.isArray(entry.use)) {
-            entry.use
-                .filter((u) => typeof u === 'object')
-                .forEach((rule) => overridePostCssOptions(rule));
-        }
-    }
-    config.module?.rules?.forEach((rule) => overridePostCssOptions(rule));
-    return config;
-}
-exports.applyConfigurePostCss = applyConfigurePostCss;
-// Plugin Lifecycle - configurePostCss()
-function executePluginsConfigurePostCss({ plugins, config, }) {
-    let resultConfig = config;
-    plugins.forEach((plugin) => {
-        const { configurePostCss } = plugin;
-        if (configurePostCss) {
-            resultConfig = applyConfigurePostCss(configurePostCss.bind(plugin), resultConfig);
-        }
-    });
-    return resultConfig;
-}
-exports.executePluginsConfigurePostCss = executePluginsConfigurePostCss;
-// Plugin Lifecycle - configureWebpack()
-function executePluginsConfigureWebpack({ plugins, config, isServer, jsLoader, }) {
-    let resultConfig = config;
-    plugins.forEach((plugin) => {
-        const { configureWebpack } = plugin;
-        if (configureWebpack) {
-            resultConfig = applyConfigureWebpack(configureWebpack.bind(plugin), // The plugin lifecycle may reference `this`.
-            resultConfig, isServer, jsLoader, plugin.content);
-        }
-    });
-    return resultConfig;
-}
-exports.executePluginsConfigureWebpack = executePluginsConfigureWebpack;
 function compile(config) {
     return new Promise((resolve, reject) => {
         const compiler = (0, webpack_1.default)(config);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5940",
+  "version": "0.0.0-5942",
   "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-5940",
-    "@docusaurus/logger": "0.0.0-5940",
-    "@docusaurus/mdx-loader": "0.0.0-5940",
-    "@docusaurus/utils": "0.0.0-5940",
-    "@docusaurus/utils-common": "0.0.0-5940",
-    "@docusaurus/utils-validation": "0.0.0-5940",
+    "@docusaurus/cssnano-preset": "0.0.0-5942",
+    "@docusaurus/logger": "0.0.0-5942",
+    "@docusaurus/mdx-loader": "0.0.0-5942",
+    "@docusaurus/utils": "0.0.0-5942",
+    "@docusaurus/utils-common": "0.0.0-5942",
+    "@docusaurus/utils-validation": "0.0.0-5942",
     "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-5940",
-    "@docusaurus/types": "0.0.0-5940",
+    "@docusaurus/module-type-aliases": "0.0.0-5942",
+    "@docusaurus/types": "0.0.0-5942",
     "@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": "4cb178f11c58280eef3865a03ffd8acf7b8bd5c7"
+  "gitHead": "5fd6daf54c03147eaf467a7038b9d9b345531f83"
 }