@docusaurus/plugin-client-redirects 2.0.0-beta.138b4c997 → 2.0.0-beta.14

package/lib/collectRedirects.js

@@ -11,10 +11,13 @@ const lodash_1 = require("lodash");
 const extensionRedirects_1 = require("./extensionRedirects");
 const redirectValidation_1 = require("./redirectValidation");
 const utils_common_1 = require("@docusaurus/utils-common");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 function collectRedirects(pluginContext, trailingSlash) {
     let redirects = doCollectRedirects(pluginContext);
-    redirects = applyRedirectsTrailingSlash(redirects, trailingSlash);
+    redirects = applyRedirectsTrailingSlash(redirects, {
+        trailingSlash,
+        baseUrl: pluginContext.baseUrl,
+    });
     validateCollectedRedirects(redirects, pluginContext);
     return filterUnwantedRedirects(redirects, pluginContext);
 }
@@ -23,19 +26,17 @@ exports.default = collectRedirects;
 // => we don't want to reject the to=/abc (as only /abc/ is an existing/valid path now)
 // => we want to redirect to=/abc/ without the user having to change all its redirect plugin options
 // It should be easy to toggle siteConfig.trailingSlash option without having to change other configs
-function applyRedirectsTrailingSlash(redirects, trailingSlash) {
-    return redirects.map((redirect) => {
-        return {
-            ...redirect,
-            to: utils_common_1.applyTrailingSlash(redirect.to, trailingSlash),
-        };
-    });
+function applyRedirectsTrailingSlash(redirects, params) {
+    return redirects.map((redirect) => ({
+        ...redirect,
+        to: (0, utils_common_1.applyTrailingSlash)(redirect.to, params),
+    }));
 }
 function validateCollectedRedirects(redirects, pluginContext) {
     const redirectValidationErrors = redirects
         .map((redirect) => {
         try {
-            redirectValidation_1.validateRedirect(redirect);
+            (0, redirectValidation_1.validateRedirect)(redirect);
             return undefined;
         }
         catch (e) {
@@ -50,7 +51,7 @@ function validateCollectedRedirects(redirects, pluginContext) {
     }
     const allowedToPaths = pluginContext.relativeRoutesPaths;
     const toPaths = redirects.map((redirect) => redirect.to);
-    const illegalToPaths = lodash_1.difference(toPaths, allowedToPaths);
+    const illegalToPaths = (0, lodash_1.difference)(toPaths, allowedToPaths);
     if (illegalToPaths.length > 0) {
         throw new Error(`You are trying to create client-side redirections to paths that do not exist:
 - ${illegalToPaths.join('\n- ')}
@@ -63,29 +64,25 @@ Valid paths you can redirect to:
 function filterUnwantedRedirects(redirects, pluginContext) {
     // we don't want to create twice the same redirect
     // that would lead to writing twice the same html redirection file
-    Object.entries(lodash_1.groupBy(redirects, (redirect) => redirect.from)).forEach(([from, groupedFromRedirects]) => {
+    Object.entries((0, lodash_1.groupBy)(redirects, (redirect) => redirect.from)).forEach(([from, groupedFromRedirects]) => {
         if (groupedFromRedirects.length > 1) {
-            console.error(chalk_1.default.red(`@docusaurus/plugin-client-redirects: multiple redirects are created with the same "from" pathname=${from}
-It is not possible to redirect the same pathname to multiple destinations:
-- ${groupedFromRedirects.map((r) => JSON.stringify(r)).join('\n- ')}
-`));
+            logger_1.default.error `name=${'@docusaurus/plugin-client-redirects'}: multiple redirects are created with the same "from" pathname: path=${from}
+It is not possible to redirect the same pathname to multiple destinations: ${groupedFromRedirects.map((r) => JSON.stringify(r))}`;
         }
     });
-    const collectedRedirects = lodash_1.uniqBy(redirects, (redirect) => redirect.from);
+    const collectedRedirects = (0, lodash_1.uniqBy)(redirects, (redirect) => redirect.from);
     // We don't want to override an already existing route with a redirect file!
     const redirectsOverridingExistingPath = collectedRedirects.filter((redirect) => pluginContext.relativeRoutesPaths.includes(redirect.from));
     if (redirectsOverridingExistingPath.length > 0) {
-        console.error(chalk_1.default.red(`@docusaurus/plugin-client-redirects: some redirects would override existing paths, and will be ignored:
-- ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r)).join('\n- ')}
-`));
+        logger_1.default.error `name=${'@docusaurus/plugin-client-redirects'}: some redirects would override existing paths, and will be ignored: ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r))}`;
     }
     return collectedRedirects.filter((redirect) => !pluginContext.relativeRoutesPaths.includes(redirect.from));
 }
 // For each plugin config option, create the appropriate redirects
 function doCollectRedirects(pluginContext) {
     return [
-        ...extensionRedirects_1.createFromExtensionsRedirects(pluginContext.relativeRoutesPaths, pluginContext.options.fromExtensions),
-        ...extensionRedirects_1.createToExtensionsRedirects(pluginContext.relativeRoutesPaths, pluginContext.options.toExtensions),
+        ...(0, extensionRedirects_1.createFromExtensionsRedirects)(pluginContext.relativeRoutesPaths, pluginContext.options.fromExtensions),
+        ...(0, extensionRedirects_1.createToExtensionsRedirects)(pluginContext.relativeRoutesPaths, pluginContext.options.toExtensions),
         ...createRedirectsOptionRedirects(pluginContext.options.redirects),
         ...createCreateRedirectsOptionRedirects(pluginContext.relativeRoutesPaths, pluginContext.options.createRedirects),
     ];
@@ -101,7 +98,7 @@ function createRedirectsOptionRedirects(redirectsOption) {
             to: option.to,
         }));
     }
-    return lodash_1.flatten(redirectsOption.map(optionToRedirects));
+    return redirectsOption.flatMap(optionToRedirects);
 }
 // Create redirects from the "createRedirects" fn provided by the user
 function createCreateRedirectsOptionRedirects(paths, createRedirects) {
@@ -110,12 +107,10 @@ function createCreateRedirectsOptionRedirects(paths, createRedirects) {
             ? createRedirects(path) || []
             : [];
         const froms = typeof fromsMixed === 'string' ? [fromsMixed] : fromsMixed;
-        return froms.map((from) => {
-            return {
-                from,
-                to: path,
-            };
-        });
+        return froms.map((from) => ({
+            from,
+            to: path,
+        }));
     }
-    return lodash_1.flatten(paths.map(createPathRedirects));
+    return paths.flatMap(createPathRedirects);
 }

package/lib/createRedirectPageContent.js

@@ -7,12 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const eta = tslib_1.__importStar(require("eta"));
-const redirectPage_template_html_1 = tslib_1.__importDefault(require("./templates/redirectPage.template.html"));
+const eta = (0, tslib_1.__importStar)(require("eta"));
+const redirectPage_template_html_1 = (0, tslib_1.__importDefault)(require("./templates/redirectPage.template.html"));
 const lodash_1 = require("lodash");
-const getCompiledRedirectPageTemplate = lodash_1.memoize(() => {
-    return eta.compile(redirectPage_template_html_1.default.trim());
-});
+const getCompiledRedirectPageTemplate = (0, lodash_1.memoize)(() => eta.compile(redirectPage_template_html_1.default.trim()));
 function renderRedirectPageTemplate(data) {
     const compiled = getCompiledRedirectPageTemplate();
     return compiled(data, eta.defaultConfig);

package/lib/extensionRedirects.js

@@ -7,7 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFromExtensionsRedirects = exports.createToExtensionsRedirects = void 0;
-const lodash_1 = require("lodash");
 const utils_1 = require("@docusaurus/utils");
 const ExtensionAdditionalMessage = 'If the redirect extension system is not good enough for your usecase, you can create redirects yourself with the "createRedirects" plugin option.';
 const validateExtension = (ext) => {
@@ -32,7 +31,7 @@ function createToExtensionsRedirects(paths, extensions) {
     const createPathRedirects = (path) => {
         const extensionFound = dottedExtensions.find((ext) => path.endsWith(ext));
         if (extensionFound) {
-            const routePathWithoutExtension = utils_1.removeSuffix(path, extensionFound);
+            const routePathWithoutExtension = (0, utils_1.removeSuffix)(path, extensionFound);
             return [routePathWithoutExtension].map((from) => ({
                 from,
                 to: path,
@@ -40,23 +39,34 @@ function createToExtensionsRedirects(paths, extensions) {
         }
         return [];
     };
-    return lodash_1.flatten(paths.map(createPathRedirects));
+    return paths.flatMap(createPathRedirects);
 }
 exports.createToExtensionsRedirects = createToExtensionsRedirects;
-// Create new /path.html that redirects to existing an /path
+// Create new /path.html/index.html that redirects to existing an /path
+// The filename pattern might look weird but it's on purpose (see https://github.com/facebook/docusaurus/issues/5055)
 function createFromExtensionsRedirects(paths, extensions) {
     extensions.forEach(validateExtension);
     const dottedExtensions = extensions.map(addLeadingDot);
     const alreadyEndsWithAnExtension = (str) => dottedExtensions.some((ext) => str.endsWith(ext));
     const createPathRedirects = (path) => {
-        if (path === '' || path.endsWith('/') || alreadyEndsWithAnExtension(path)) {
+        if (path === '' || path === '/' || alreadyEndsWithAnExtension(path)) {
             return [];
         }
+        // /path => /path.html
+        // /path/ => /path.html/
+        function getFrom(ext) {
+            if (path.endsWith('/')) {
+                return (0, utils_1.addTrailingSlash)(`${(0, utils_1.removeTrailingSlash)(path)}.${ext}`);
+            }
+            else {
+                return `${path}.${ext}`;
+            }
+        }
         return extensions.map((ext) => ({
-            from: `${path}.${ext}`,
+            from: getFrom(ext),
             to: path,
         }));
     };
-    return lodash_1.flatten(paths.map(createPathRedirects));
+    return paths.flatMap(createPathRedirects);
 }
 exports.createFromExtensionsRedirects = createFromExtensionsRedirects;

package/lib/index.js

@@ -7,34 +7,26 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const normalizePluginOptions_1 = tslib_1.__importDefault(require("./normalizePluginOptions"));
-const collectRedirects_1 = tslib_1.__importDefault(require("./collectRedirects"));
-const writeRedirectFiles_1 = tslib_1.__importStar(require("./writeRedirectFiles"));
+const normalizePluginOptions_1 = (0, tslib_1.__importDefault)(require("./normalizePluginOptions"));
+const collectRedirects_1 = (0, tslib_1.__importDefault)(require("./collectRedirects"));
+const writeRedirectFiles_1 = (0, tslib_1.__importStar)(require("./writeRedirectFiles"));
 const utils_1 = require("@docusaurus/utils");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 function pluginClientRedirectsPages(context, opts) {
     const { trailingSlash } = context.siteConfig;
-    const options = normalizePluginOptions_1.default(opts);
-    // Special case, when using trailingSlash=false we output /xyz.html files instead of /xyz/index.html
-    // It makes no sense to use option fromExtensions=["html"]: the redirect files would be the same as the original files
-    if (options.fromExtensions.includes('html') && trailingSlash === false) {
-        console.warn(chalk_1.default.yellow(`Using the Docusaurus redirect plugin with fromExtensions=['html'] and siteConfig.trailingSlash=false is prevented.
-It would lead the redirect plugin to override all the page.html files created by Docusaurus.`));
-        options.fromExtensions = options.fromExtensions.filter((ext) => ext !== 'html');
-    }
+    const options = (0, normalizePluginOptions_1.default)(opts);
     return {
         name: 'docusaurus-plugin-client-redirects',
         async postBuild(props) {
             const pluginContext = {
-                relativeRoutesPaths: props.routesPaths.map((path) => `${utils_1.addLeadingSlash(utils_1.removePrefix(path, props.baseUrl))}`),
+                relativeRoutesPaths: props.routesPaths.map((path) => `${(0, utils_1.addLeadingSlash)((0, utils_1.removePrefix)(path, props.baseUrl))}`),
                 baseUrl: props.baseUrl,
                 outDir: props.outDir,
                 options,
             };
-            const redirects = collectRedirects_1.default(pluginContext, trailingSlash);
-            const redirectFiles = writeRedirectFiles_1.toRedirectFilesMetadata(redirects, pluginContext, trailingSlash);
+            const redirects = (0, collectRedirects_1.default)(pluginContext, trailingSlash);
+            const redirectFiles = (0, writeRedirectFiles_1.toRedirectFilesMetadata)(redirects, pluginContext, trailingSlash);
             // Write files only at the end: make code more easy to test without IO
-            await writeRedirectFiles_1.default(redirectFiles);
+            await (0, writeRedirectFiles_1.default)(redirectFiles);
         },
     };
 }

package/lib/normalizePluginOptions.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultPluginOptions = void 0;
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const constants_1 = require("@docusaurus/core/lib/constants");
+const utils_1 = require("@docusaurus/utils");
 exports.DefaultPluginOptions = {
-    id: constants_1.DEFAULT_PLUGIN_ID,
+    id: utils_1.DEFAULT_PLUGIN_ID,
     fromExtensions: [],
     toExtensions: [],
     redirects: [],

package/lib/writeRedirectFiles.js

@@ -8,25 +8,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeRedirectFile = exports.toRedirectFilesMetadata = exports.createToUrl = 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"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const lodash_1 = require("lodash");
-const createRedirectPageContent_1 = tslib_1.__importDefault(require("./createRedirectPageContent"));
+const createRedirectPageContent_1 = (0, tslib_1.__importDefault)(require("./createRedirectPageContent"));
 const utils_1 = require("@docusaurus/utils");
 function createToUrl(baseUrl, to) {
-    return utils_1.normalizeUrl([baseUrl, to]);
+    return (0, utils_1.normalizeUrl)([baseUrl, to]);
 }
 exports.createToUrl = createToUrl;
+// Create redirect file path
+// Make sure this path has lower precedence over the original file path when served by host providers!
+// Otherwise it can produce infinite redirect loops!
+//
+// See https://github.com/facebook/docusaurus/issues/5055
+// See https://github.com/facebook/docusaurus/pull/5085
+// See https://github.com/facebook/docusaurus/pull/5102
+function getRedirectFilePath(fromPath, trailingSlash) {
+    const fileName = path_1.default.basename(fromPath);
+    const filePath = path_1.default.dirname(fromPath);
+    // Edge case for https://github.com/facebook/docusaurus/pull/5102
+    // If the redirect source path is /xyz, with file /xyz.html
+    // We can't write the redirect file at /xyz.html/index.html because for Unix FS, a file/folder can't have the same name "xyz.html"
+    // The only possible solution for a redirect file is thus /xyz.html.html (I know, looks suspicious)
+    if (trailingSlash === false && fileName.endsWith('.html')) {
+        return path_1.default.join(filePath, `${fileName}.html`);
+    }
+    // If the target path is /xyz, with file /xyz/index.html, we don't want the redirect file to be /xyz.html
+    // otherwise it would be picked in priority and the redirect file would redirect to itself
+    // We prefer the redirect file to be /xyz.html/index.html, served with lower priority for most static hosting tools
+    else {
+        return path_1.default.join(filePath, `${fileName}/index.html`);
+    }
+}
 function toRedirectFilesMetadata(redirects, pluginContext, trailingSlash) {
     // Perf: avoid rendering the template twice with the exact same "props"
     // We might create multiple redirect pages for the same destination url
     // note: the first fn arg is the cache key!
-    const createPageContentMemoized = lodash_1.memoize((toUrl) => {
-        return createRedirectPageContent_1.default({ toUrl });
-    });
+    const createPageContentMemoized = (0, lodash_1.memoize)((toUrl) => (0, createRedirectPageContent_1.default)({ toUrl }));
     const createFileMetadata = (redirect) => {
-        const filePath = utils_1.getFilePathForRoutePath(redirect.from, trailingSlash);
-        const fileAbsolutePath = path_1.default.join(pluginContext.outDir, filePath);
+        const fileRelativePath = getRedirectFilePath(redirect.from, trailingSlash);
+        const fileAbsolutePath = path_1.default.join(pluginContext.outDir, fileRelativePath);
         const toUrl = createToUrl(pluginContext.baseUrl, redirect.to);
         const fileContent = createPageContentMemoized(toUrl);
         return {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "2.0.0-beta.138b4c997",
+  "version": "2.0.0-beta.14",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
+  "types": "src/plugin-client-redirects.d.ts",
   "scripts": {
     "build": "tsc",
     "watch": "tsc --watch"
@@ -17,24 +18,26 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.138b4c997",
-    "@docusaurus/types": "2.0.0-beta.138b4c997",
-    "@docusaurus/utils": "2.0.0-beta.138b4c997",
-    "@docusaurus/utils-common": "2.0.0-beta.138b4c997",
-    "@docusaurus/utils-validation": "2.0.0-beta.138b4c997",
-    "chalk": "^4.1.1",
-    "eta": "^1.11.0",
+    "@docusaurus/core": "2.0.0-beta.14",
+    "@docusaurus/logger": "2.0.0-beta.14",
+    "@docusaurus/utils": "2.0.0-beta.14",
+    "@docusaurus/utils-common": "2.0.0-beta.14",
+    "@docusaurus/utils-validation": "2.0.0-beta.14",
+    "chalk": "^4.1.2",
+    "eta": "^1.12.3",
     "fs-extra": "^10.0.0",
-    "globby": "^11.0.2",
     "lodash": "^4.17.20",
-    "tslib": "^2.2.0"
+    "tslib": "^2.3.1"
+  },
+  "devDependencies": {
+    "@docusaurus/types": "2.0.0-beta.14"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=10.9.0"
+    "node": ">=14"
   },
-  "gitHead": "8cc620648710971acc459aabd2c6f505ef757701"
+  "gitHead": "c4824a8937d8f1aa0806667749cbc74058e2b294"
 }

package/src/collectRedirects.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {flatten, uniqBy, difference, groupBy} from 'lodash';
+import {uniqBy, difference, groupBy} from 'lodash';
 import {
   PluginContext,
   RedirectMetadata,
@@ -17,16 +17,24 @@ import {
   createToExtensionsRedirects,
 } from './extensionRedirects';
 import {validateRedirect} from './redirectValidation';
-import {applyTrailingSlash} from '@docusaurus/utils-common';
+import {
+  applyTrailingSlash,
+  ApplyTrailingSlashParams,
+} from '@docusaurus/utils-common';
 
-import chalk from 'chalk';
+import logger from '@docusaurus/logger';
 
 export default function collectRedirects(
   pluginContext: PluginContext,
   trailingSlash: boolean | undefined,
 ): RedirectMetadata[] {
   let redirects = doCollectRedirects(pluginContext);
-  redirects = applyRedirectsTrailingSlash(redirects, trailingSlash);
+
+  redirects = applyRedirectsTrailingSlash(redirects, {
+    trailingSlash,
+    baseUrl: pluginContext.baseUrl,
+  });
+
   validateCollectedRedirects(redirects, pluginContext);
   return filterUnwantedRedirects(redirects, pluginContext);
 }
@@ -37,27 +45,25 @@ export default function collectRedirects(
 // It should be easy to toggle siteConfig.trailingSlash option without having to change other configs
 function applyRedirectsTrailingSlash(
   redirects: RedirectMetadata[],
-  trailingSlash: boolean | undefined,
+  params: ApplyTrailingSlashParams,
 ) {
-  return redirects.map((redirect) => {
-    return {
-      ...redirect,
-      to: applyTrailingSlash(redirect.to, trailingSlash),
-    };
-  });
+  return redirects.map((redirect) => ({
+    ...redirect,
+    to: applyTrailingSlash(redirect.to, params),
+  }));
 }
 
 function validateCollectedRedirects(
   redirects: RedirectMetadata[],
   pluginContext: PluginContext,
 ) {
-  const redirectValidationErrors: string[] = redirects
+  const redirectValidationErrors = redirects
     .map((redirect) => {
       try {
         validateRedirect(redirect);
         return undefined;
       } catch (e) {
-        return e.message;
+        return (e as Error).message;
       }
     })
     .filter(Boolean);
@@ -93,14 +99,10 @@ function filterUnwantedRedirects(
   Object.entries(groupBy(redirects, (redirect) => redirect.from)).forEach(
     ([from, groupedFromRedirects]) => {
       if (groupedFromRedirects.length > 1) {
-        console.error(
-          chalk.red(
-            `@docusaurus/plugin-client-redirects: multiple redirects are created with the same "from" pathname=${from}
-It is not possible to redirect the same pathname to multiple destinations:
-- ${groupedFromRedirects.map((r) => JSON.stringify(r)).join('\n- ')}
-`,
-          ),
-        );
+        logger.error`name=${'@docusaurus/plugin-client-redirects'}: multiple redirects are created with the same "from" pathname: path=${from}
+It is not possible to redirect the same pathname to multiple destinations: ${groupedFromRedirects.map(
+          (r) => JSON.stringify(r),
+        )}`;
       }
     },
   );
@@ -111,13 +113,9 @@ It is not possible to redirect the same pathname to multiple destinations:
     (redirect) => pluginContext.relativeRoutesPaths.includes(redirect.from),
   );
   if (redirectsOverridingExistingPath.length > 0) {
-    console.error(
-      chalk.red(
-        `@docusaurus/plugin-client-redirects: some redirects would override existing paths, and will be ignored:
-- ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r)).join('\n- ')}
-`,
-      ),
-    );
+    logger.error`name=${'@docusaurus/plugin-client-redirects'}: some redirects would override existing paths, and will be ignored: ${redirectsOverridingExistingPath.map(
+      (r) => JSON.stringify(r),
+    )}`;
   }
   return collectedRedirects.filter(
     (redirect) => !pluginContext.relativeRoutesPaths.includes(redirect.from),
@@ -157,7 +155,7 @@ function createRedirectsOptionRedirects(
     }));
   }
 
-  return flatten(redirectsOption.map(optionToRedirects));
+  return redirectsOption.flatMap(optionToRedirects);
 }
 
 // Create redirects from the "createRedirects" fn provided by the user
@@ -173,13 +171,11 @@ function createCreateRedirectsOptionRedirects(
     const froms: string[] =
       typeof fromsMixed === 'string' ? [fromsMixed] : fromsMixed;
 
-    return froms.map((from) => {
-      return {
-        from,
-        to: path,
-      };
-    });
+    return froms.map((from) => ({
+      from,
+      to: path,
+    }));
   }
 
-  return flatten(paths.map(createPathRedirects));
+  return paths.flatMap(createPathRedirects);
 }

package/src/createRedirectPageContent.ts

@@ -13,9 +13,9 @@ type CreateRedirectPageOptions = {
   toUrl: string;
 };
 
-const getCompiledRedirectPageTemplate = memoize(() => {
-  return eta.compile(redirectPageTemplate.trim());
-});
+const getCompiledRedirectPageTemplate = memoize(() =>
+  eta.compile(redirectPageTemplate.trim()),
+);
 
 function renderRedirectPageTemplate(data: Record<string, unknown>) {
   const compiled = getCompiledRedirectPageTemplate();

package/src/extensionRedirects.ts

@@ -5,8 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {flatten} from 'lodash';
-import {removeSuffix} from '@docusaurus/utils';
+import {
+  addTrailingSlash,
+  removeSuffix,
+  removeTrailingSlash,
+} from '@docusaurus/utils';
 import {RedirectMetadata} from './types';
 
 const ExtensionAdditionalMessage =
@@ -58,10 +61,11 @@ export function createToExtensionsRedirects(
     return [];
   };
 
-  return flatten(paths.map(createPathRedirects));
+  return paths.flatMap(createPathRedirects);
 }
 
-// Create new /path.html that redirects to existing an /path
+// Create new /path.html/index.html that redirects to existing an /path
+// The filename pattern might look weird but it's on purpose (see https://github.com/facebook/docusaurus/issues/5055)
 export function createFromExtensionsRedirects(
   paths: string[],
   extensions: string[],
@@ -74,14 +78,25 @@ export function createFromExtensionsRedirects(
     dottedExtensions.some((ext) => str.endsWith(ext));
 
   const createPathRedirects = (path: string): RedirectMetadata[] => {
-    if (path === '' || path.endsWith('/') || alreadyEndsWithAnExtension(path)) {
+    if (path === '' || path === '/' || alreadyEndsWithAnExtension(path)) {
       return [];
     }
+
+    // /path => /path.html
+    // /path/ => /path.html/
+    function getFrom(ext: string) {
+      if (path.endsWith('/')) {
+        return addTrailingSlash(`${removeTrailingSlash(path)}.${ext}`);
+      } else {
+        return `${path}.${ext}`;
+      }
+    }
+
     return extensions.map((ext) => ({
-      from: `${path}.${ext}`,
+      from: getFrom(ext),
       to: path,
     }));
   };
 
-  return flatten(paths.map(createPathRedirects));
+  return paths.flatMap(createPathRedirects);
 }

package/src/index.ts

@@ -15,7 +15,6 @@ import writeRedirectFiles, {
   RedirectFileMetadata,
 } from './writeRedirectFiles';
 import {removePrefix, addLeadingSlash} from '@docusaurus/utils';
-import chalk from 'chalk';
 
 export default function pluginClientRedirectsPages(
   context: LoadContext,
@@ -25,18 +24,6 @@ export default function pluginClientRedirectsPages(
 
   const options = normalizePluginOptions(opts);
 
-  // Special case, when using trailingSlash=false we output /xyz.html files instead of /xyz/index.html
-  // It makes no sense to use option fromExtensions=["html"]: the redirect files would be the same as the original files
-  if (options.fromExtensions.includes('html') && trailingSlash === false) {
-    console.warn(
-      chalk.yellow(`Using the Docusaurus redirect plugin with fromExtensions=['html'] and siteConfig.trailingSlash=false is prevented.
-It would lead the redirect plugin to override all the page.html files created by Docusaurus.`),
-    );
-    options.fromExtensions = options.fromExtensions.filter(
-      (ext) => ext !== 'html',
-    );
-  }
-
   return {
     name: 'docusaurus-plugin-client-redirects',
     async postBuild(props: Props) {

package/src/normalizePluginOptions.ts

@@ -7,7 +7,7 @@
 
 import {PluginOptions, RedirectOption, UserPluginOptions} from './types';
 import {Joi, PathnameSchema} from '@docusaurus/utils-validation';
-import {DEFAULT_PLUGIN_ID} from '@docusaurus/core/lib/constants';
+import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 
 export const DefaultPluginOptions: PluginOptions = {
   id: DEFAULT_PLUGIN_ID, // TODO temporary

package/src/plugin-client-redirects.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 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.
+ */
+
+export type Options = import('./types').UserPluginOptions;