@docusaurus/plugin-client-redirects 3.10.2 → 4.0.0-canary-6809

package/lib/collectRedirects.js

@@ -14,6 +14,14 @@ const utils_common_1 = require("@docusaurus/utils-common");
 const extensionRedirects_1 = require("./extensionRedirects");
 const redirectValidation_1 = require("./redirectValidation");
 function collectRedirects(pluginContext, trailingSlash) {
+    function normalizeRedirectTo(to) {
+        return to.startsWith('/')
+            ? (0, utils_common_1.applyTrailingSlash)(to, {
+                trailingSlash,
+                baseUrl: pluginContext.baseUrl,
+            })
+            : to;
+    }
     // For each plugin config option, create the appropriate redirects
     const redirects = [
         ...(0, extensionRedirects_1.createFromExtensionsRedirects)(pluginContext.relativeRoutesPaths, pluginContext.options.fromExtensions),
@@ -31,10 +39,7 @@ function collectRedirects(pluginContext, trailingSlash) {
         //
         // It should be easy to toggle `trailingSlash` option without having to
         // change other configs
-        to: (0, utils_common_1.applyTrailingSlash)(redirect.to, {
-            trailingSlash,
-            baseUrl: pluginContext.baseUrl,
-        }),
+        to: normalizeRedirectTo(redirect.to),
     }));
     validateCollectedRedirects(redirects, pluginContext);
     return filterUnwantedRedirects(redirects, pluginContext);
@@ -65,10 +70,10 @@ function validateCollectedRedirects(redirects, pluginContext) {
         // See https://github.com/facebook/docusaurus/issues/6845
         .map((to) => {
         if (to.startsWith('/')) {
-            try {
-                return decodeURI(new URL(to, 'https://example.com').pathname);
+            const url = URL.parse(to, 'https://example.com');
+            if (url) {
+                return decodeURI(url.pathname);
             }
-            catch (e) { }
         }
         return undefined;
     })

package/lib/createRedirectPageContent.js

@@ -9,24 +9,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = createRedirectPageContent;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const eta = tslib_1.__importStar(require("eta"));
+const eta_1 = require("eta");
 const redirectPage_template_html_1 = tslib_1.__importDefault(require("./templates/redirectPage.template.html"));
+const eta = new eta_1.Eta();
 const getCompiledRedirectPageTemplate = lodash_1.default.memoize(() => eta.compile(redirectPage_template_html_1.default.trim()));
 function renderRedirectPageTemplate(data) {
     const compiled = getCompiledRedirectPageTemplate();
-    return compiled(data, eta.defaultConfig);
+    return eta.render(compiled, data);
 }
 // if the target url does not include ?search#anchor,
 // we forward search/anchor that the redirect page receives
 function searchAnchorForwarding(toUrl) {
-    try {
-        const url = new URL(toUrl, 'https://example.com');
-        const containsSearchOrAnchor = url.search || url.hash;
-        return !containsSearchOrAnchor;
-    }
-    catch (e) {
+    const url = URL.parse(toUrl, 'https://example.com');
+    if (url === null) {
         return false;
     }
+    const containsSearchOrAnchor = url.search || url.hash;
+    return !containsSearchOrAnchor;
 }
 function createRedirectPageContent({ toUrl, }) {
     return renderRedirectPageTemplate({

package/lib/templates/redirectPage.template.html.d.ts

@@ -4,5 +4,5 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-declare const _default: "\n<!DOCTYPE html>\n<html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <meta http-equiv=\"refresh\" content=\"0; url=<%= it.toUrl %>\">\n    <link rel=\"canonical\" href=\"<%= it.toUrl %>\" />\n  </head>\n  <script>\n    window.location.href = '<%= it.toUrl %>'<%= it.searchAnchorForwarding ? ' + window.location.search + window.location.hash' : '' %>;\n  </script>\n</html>\n";
+declare const _default = "\n<!DOCTYPE html>\n<html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <meta http-equiv=\"refresh\" content=\"0; url=<%= it.toUrl %>\">\n    <link rel=\"canonical\" href=\"<%= it.toUrl %>\" />\n  </head>\n  <script>\n    window.location.href = '<%= it.toUrl %>'<%= it.searchAnchorForwarding ? ' + window.location.search + window.location.hash' : '' %>;\n  </script>\n</html>\n";
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "3.10.2",
+  "version": "4.0.0-canary-6809",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,25 +18,25 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.10.2",
-    "@docusaurus/logger": "3.10.2",
-    "@docusaurus/utils": "3.10.2",
-    "@docusaurus/utils-common": "3.10.2",
-    "@docusaurus/utils-validation": "3.10.2",
-    "eta": "^2.2.0",
-    "fs-extra": "^11.1.1",
-    "lodash": "^4.17.21",
-    "tslib": "^2.6.0"
+    "@docusaurus/core": "4.0.0-canary-6809",
+    "@docusaurus/logger": "4.0.0-canary-6809",
+    "@docusaurus/utils": "4.0.0-canary-6809",
+    "@docusaurus/utils-common": "4.0.0-canary-6809",
+    "@docusaurus/utils-validation": "4.0.0-canary-6809",
+    "eta": "^4.6.0",
+    "fs-extra": "^11.4.0",
+    "lodash": "^4.18.1",
+    "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "3.10.2"
+    "@docusaurus/types": "4.0.0-canary-6809"
   },
   "peerDependencies": {
-    "react": "^18.0.0 || ^19.0.0",
-    "react-dom": "^18.0.0 || ^19.0.0"
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=24.14"
   },
-  "gitHead": "f37f9035584917a97a260b91fc2842cba4f8b94f"
+  "gitHead": "db942b07f3529b5359bcae27ab3796cb07dec10e"
 }

package/src/collectRedirects.ts

@@ -24,6 +24,15 @@ export default function collectRedirects(
   pluginContext: PluginContext,
   trailingSlash: boolean | undefined,
 ): RedirectItem[] {
+  function normalizeRedirectTo(to: string) {
+    return to.startsWith('/')
+      ? applyTrailingSlash(to, {
+          trailingSlash,
+          baseUrl: pluginContext.baseUrl,
+        })
+      : to;
+  }
+
   // For each plugin config option, create the appropriate redirects
   const redirects = [
     ...createFromExtensionsRedirects(
@@ -50,10 +59,7 @@ export default function collectRedirects(
     //
     // It should be easy to toggle `trailingSlash` option without having to
     // change other configs
-    to: applyTrailingSlash(redirect.to, {
-      trailingSlash,
-      baseUrl: pluginContext.baseUrl,
-    }),
+    to: normalizeRedirectTo(redirect.to),
   }));
 
   validateCollectedRedirects(redirects, pluginContext);
@@ -93,9 +99,10 @@ function validateCollectedRedirects(
     // See https://github.com/facebook/docusaurus/issues/6845
     .map((to) => {
       if (to.startsWith('/')) {
-        try {
-          return decodeURI(new URL(to, 'https://example.com').pathname);
-        } catch (e) {}
+        const url = URL.parse(to, 'https://example.com');
+        if (url) {
+          return decodeURI(url.pathname);
+        }
       }
       return undefined;
     })

package/src/createRedirectPageContent.ts

@@ -6,9 +6,11 @@
  */
 
 import _ from 'lodash';
-import * as eta from 'eta';
+import {Eta} from 'eta';
 import redirectPageTemplate from './templates/redirectPage.template.html';
 
+const eta = new Eta();
+
 const getCompiledRedirectPageTemplate = _.memoize(() =>
   eta.compile(redirectPageTemplate.trim()),
 );
@@ -18,19 +20,18 @@ function renderRedirectPageTemplate(data: {
   searchAnchorForwarding: boolean;
 }) {
   const compiled = getCompiledRedirectPageTemplate();
-  return compiled(data, eta.defaultConfig);
+  return eta.render(compiled, data);
 }
 
 // if the target url does not include ?search#anchor,
 // we forward search/anchor that the redirect page receives
 function searchAnchorForwarding(toUrl: string): boolean {
-  try {
-    const url = new URL(toUrl, 'https://example.com');
-    const containsSearchOrAnchor = url.search || url.hash;
-    return !containsSearchOrAnchor;
-  } catch (e) {
+  const url = URL.parse(toUrl, 'https://example.com');
+  if (url === null) {
     return false;
   }
+  const containsSearchOrAnchor = url.search || url.hash;
+  return !containsSearchOrAnchor;
 }
 
 export default function createRedirectPageContent({

package/src/deps.d.ts

@@ -4,13 +4,3 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-// TODO incompatible declaration file
-declare module 'eta' {
-  export const defaultConfig: object;
-
-  export function compile(
-    template: string,
-    options?: object,
-  ): (data: object, config: object) => string;
-}