@docusaurus/core 0.0.0-5913 → 0.0.0-5920

package/lib/client/App.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+/// <reference types="@docusaurus/module-type-aliases" />
 /// <reference types="react" />
 import '@generated/client-modules';
 export default function App(): JSX.Element;

package/lib/commands/serve.js

@@ -15,9 +15,16 @@ const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
 const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
+const utils_common_1 = require("@docusaurus/utils-common");
 const config_1 = require("../server/config");
 const build_1 = require("./build");
 const getHostPort_1 = require("../server/getHostPort");
+function redirect(res, location) {
+    res.writeHead(302, {
+        Location: location,
+    });
+    res.end();
+}
 async function serve(siteDirParam = '.', cliOptions = {}) {
     const siteDir = await fs_extra_1.default.realpath(siteDirParam);
     const buildDir = cliOptions.dir ?? utils_1.DEFAULT_BUILD_DIR_NAME;
@@ -40,14 +47,22 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
     const server = http_1.default.createServer((req, res) => {
         // Automatically redirect requests to /baseUrl/
         if (!req.url?.startsWith(baseUrl)) {
-            res.writeHead(302, {
-                Location: baseUrl,
-            });
-            res.end();
+            redirect(res, baseUrl);
+            return;
+        }
+        // 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;
         }
         // Remove baseUrl before calling serveHandler, because /baseUrl/ should
         // serve /build/index.html, not /build/baseUrl/index.html (does not exist)
+        // Note server-handler is really annoying here:
+        // - no easy way to do rewrites such as "/baseUrl/:path" => "/:path"
+        // - no easy way to "reapply" the baseUrl to the redirect "Location" header
+        // See also https://github.com/facebook/docusaurus/pull/10090
         req.url = req.url.replace(baseUrl, '/');
         (0, serve_handler_1.default)(req, res, {
             cleanUrls: true,

package/lib/server/configValidation.js

@@ -18,7 +18,7 @@ exports.DEFAULT_I18N_CONFIG = {
     localeConfigs: {},
 };
 exports.DEFAULT_MARKDOWN_CONFIG = {
-    format: 'mdx',
+    format: 'mdx', // TODO change this to "detect" in Docusaurus v4?
     mermaid: false,
     preprocessor: undefined,
     parseFrontMatter: utils_1.DEFAULT_PARSE_FRONT_MATTER,
@@ -35,7 +35,7 @@ exports.DEFAULT_MARKDOWN_CONFIG = {
 exports.DEFAULT_CONFIG = {
     i18n: exports.DEFAULT_I18N_CONFIG,
     onBrokenLinks: 'throw',
-    onBrokenAnchors: 'warn',
+    onBrokenAnchors: 'warn', // TODO Docusaurus v4: change to throw
     onBrokenMarkdownLinks: 'warn',
     onDuplicateRoutes: 'warn',
     plugins: [],
@@ -150,7 +150,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     favicon: utils_validation_1.Joi.string().optional(),
     title: utils_validation_1.Joi.string().required(),
     url: SiteUrlSchema,
-    trailingSlash: utils_validation_1.Joi.boolean(),
+    trailingSlash: utils_validation_1.Joi.boolean(), // No default value! undefined = retrocompatible legacy behavior!
     i18n: I18N_CONFIG_SCHEMA,
     onBrokenLinks: utils_validation_1.Joi.string()
         .equal('ignore', 'log', 'warn', 'throw')

package/lib/ssg.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+/// <reference path="../src/deps.d.ts" />
 import type { AppRenderer, SiteCollectedData } from './common';
 import type { Manifest } from 'react-loadable-ssr-addon-v5-slorber';
 import type { SSRTemplateCompiled } from './templates/templates';

package/lib/webpack/base.js

@@ -88,9 +88,9 @@ async function createBaseConfig({ props, isServer, minify, }) {
         },
         devtool: isProd ? undefined : 'eval-cheap-module-source-map',
         resolve: {
-            unsafeCache: false,
+            unsafeCache: false, // Not enabled, does not seem to improve perf much
             extensions: ['.wasm', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
-            symlinks: true,
+            symlinks: true, // See https://github.com/facebook/docusaurus/issues/3272
             roots: [
                 // Allow resolution of url("/fonts/xyz.ttf") by webpack
                 // See https://webpack.js.org/configuration/resolve/#resolveroots

package/lib/webpack/utils.d.ts

@@ -18,9 +18,9 @@ export declare function getBabelOptions({ isServer, babelOptions, }?: {
     isServer?: boolean;
     babelOptions?: TransformOptions | string;
 }): TransformOptions;
-export declare const getCustomizableJSLoader: (jsLoader?: "babel" | ((isServer: boolean) => RuleSetRule)) => ({ isServer, babelOptions, }: {
+export declare const getCustomizableJSLoader: (jsLoader?: 'babel' | ((isServer: boolean) => RuleSetRule)) => ({ isServer, babelOptions, }: {
     isServer: boolean;
-    babelOptions?: string | TransformOptions | undefined;
+    babelOptions?: TransformOptions | string;
 }) => RuleSetRule;
 /**
  * Helper function to modify webpack config

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5913",
+  "version": "0.0.0-5920",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-5913",
-    "@docusaurus/logger": "0.0.0-5913",
-    "@docusaurus/mdx-loader": "0.0.0-5913",
-    "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-5913",
-    "@docusaurus/utils-common": "0.0.0-5913",
-    "@docusaurus/utils-validation": "0.0.0-5913",
+    "@docusaurus/cssnano-preset": "0.0.0-5920",
+    "@docusaurus/logger": "0.0.0-5920",
+    "@docusaurus/mdx-loader": "0.0.0-5920",
+    "@docusaurus/utils": "0.0.0-5920",
+    "@docusaurus/utils-common": "0.0.0-5920",
+    "@docusaurus/utils-validation": "0.0.0-5920",
     "@svgr/webpack": "^6.5.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
@@ -85,7 +84,7 @@
     "prompts": "^2.4.2",
     "react-dev-utils": "^12.0.1",
     "react-helmet-async": "^1.3.0",
-    "react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
+    "react-loadable": "npm:@docusaurus/react-loadable@6.0.0",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
     "react-router": "^5.3.4",
     "react-router-config": "^5.1.1",
@@ -105,8 +104,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5913",
-    "@docusaurus/types": "0.0.0-5913",
+    "@docusaurus/module-type-aliases": "0.0.0-5920",
+    "@docusaurus/types": "0.0.0-5920",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -126,5 +125,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "173e971bb8b24ba1a909ca8ea8f3a4d5f9163471"
+  "gitHead": "2eb0d5b1dfb69922a0881ba63c7294c3efbb799d"
 }