@docusaurus/plugin-client-redirects 3.10.1-canary-6655 → 3.10.1-canary-6803

package/lib/collectRedirects.js

@@ -70,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 { }
         }
         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 {
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "3.10.1-canary-6655",
+  "version": "3.10.1-canary-6803",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,18 +18,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.10.1-canary-6655",
-    "@docusaurus/logger": "3.10.1-canary-6655",
-    "@docusaurus/utils": "3.10.1-canary-6655",
-    "@docusaurus/utils-common": "3.10.1-canary-6655",
-    "@docusaurus/utils-validation": "3.10.1-canary-6655",
-    "eta": "^2.2.0",
+    "@docusaurus/core": "3.10.1-canary-6803",
+    "@docusaurus/logger": "3.10.1-canary-6803",
+    "@docusaurus/utils": "3.10.1-canary-6803",
+    "@docusaurus/utils-common": "3.10.1-canary-6803",
+    "@docusaurus/utils-validation": "3.10.1-canary-6803",
+    "eta": "^4.0.1",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
     "tslib": "^2.6.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "3.10.1-canary-6655"
+    "@docusaurus/types": "3.10.1-canary-6803"
   },
   "peerDependencies": {
     "react": "^19.2.5",
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=24.14"
   },
-  "gitHead": "6e93a3055178dd0af922ba627f787229dcdf948b"
+  "gitHead": "d2c7b381512bd4e7e90e33f56649e68d618eaa92"
 }

package/src/collectRedirects.ts

@@ -99,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 {}
+        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 {
+  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;
-}