@docusaurus/plugin-client-redirects 0.0.0-4518 → 0.0.0-4524

package/lib/collectRedirects.js

@@ -23,9 +23,12 @@ function collectRedirects(pluginContext, trailingSlash) {
 }
 exports.default = collectRedirects;
 // If users wants to redirect to=/abc and they enable trailingSlash=true then
-// => 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
+// => 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, params) {
     return redirects.map((redirect) => ({
         ...redirect,

package/lib/extensionRedirects.js

@@ -52,18 +52,12 @@ function createFromExtensionsRedirects(paths, extensions) {
         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: getFrom(ext),
+            // /path => /path.html
+            // /path/ => /path.html/
+            from: path.endsWith('/')
+                ? (0, utils_1.addTrailingSlash)(`${(0, utils_1.removeTrailingSlash)(path)}.${ext}`)
+                : `${path}.${ext}`,
             to: path,
         }));
     };

package/lib/writeRedirectFiles.js

@@ -18,7 +18,8 @@ function createToUrl(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!
+// 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
@@ -29,17 +30,19 @@ function getRedirectFilePath(fromPath, trailingSlash) {
     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)
+    // 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`);
-    }
+    // 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
+    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"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "0.0.0-4518",
+  "version": "0.0.0-4524",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-client-redirects.d.ts",
@@ -18,18 +18,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4518",
-    "@docusaurus/logger": "0.0.0-4518",
-    "@docusaurus/utils": "0.0.0-4518",
-    "@docusaurus/utils-common": "0.0.0-4518",
-    "@docusaurus/utils-validation": "0.0.0-4518",
+    "@docusaurus/core": "0.0.0-4524",
+    "@docusaurus/logger": "0.0.0-4524",
+    "@docusaurus/utils": "0.0.0-4524",
+    "@docusaurus/utils-common": "0.0.0-4524",
+    "@docusaurus/utils-validation": "0.0.0-4524",
     "eta": "^1.12.3",
     "fs-extra": "^10.0.0",
     "lodash": "^4.17.20",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "0.0.0-4518"
+    "@docusaurus/types": "0.0.0-4524"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "734bca0f3ea8d04fa3b908d56ea0fb159ab47ab3"
+  "gitHead": "41a6bff3a67446f7d2a2972cbe4d05fec7378a15"
 }

package/src/collectRedirects.ts

@@ -39,9 +39,12 @@ export default function collectRedirects(
 }
 
 // If users wants to redirect to=/abc and they enable trailingSlash=true then
-// => 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
+// => 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: RedirectMetadata[],
   params: ApplyTrailingSlashParams,

package/src/extensionRedirects.ts

@@ -81,19 +81,12 @@ export function createFromExtensionsRedirects(
     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: getFrom(ext),
+      // /path => /path.html
+      // /path/ => /path.html/
+      from: path.endsWith('/')
+        ? addTrailingSlash(`${removeTrailingSlash(path)}.${ext}`)
+        : `${path}.${ext}`,
       to: path,
     }));
   };

package/src/writeRedirectFiles.ts

@@ -25,7 +25,8 @@ export function createToUrl(baseUrl: string, to: string): string {
 }
 
 // Create redirect file path
-// Make sure this path has lower precedence over the original file path when served by host providers!
+// 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
@@ -39,17 +40,19 @@ function getRedirectFilePath(
   const filePath = path.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)
+  // 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.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.join(filePath, `${fileName}/index.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
+  return path.join(filePath, `${fileName}/index.html`);
 }
 
 export function toRedirectFilesMetadata(