@rspress/plugin-client-redirects 2.0.0-alpha.6 → 2.0.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/plugin-client-redirects",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "description": "A plugin for rspress to client redirect in docs.",
   "bugs": "https://github.com/web-infra-dev/rspress/issues",
   "repository": {
@@ -24,7 +24,7 @@
     "static"
   ],
   "dependencies": {
-    "@rspress/shared": "2.0.0-alpha.6"
+    "@rspress/shared": "2.0.0-alpha.7"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.1",
@@ -37,7 +37,7 @@
     "@rspress/config": "1.0.0"
   },
   "peerDependencies": {
-    "@rspress/runtime": "^2.0.0-alpha.6"
+    "@rspress/runtime": "^2.0.0-alpha.7"
   },
   "engines": {
     "node": ">=14.17.6"

package/static/Redirect.tsx

@@ -1,6 +1,6 @@
 import { useLocation } from '@rspress/runtime';
 import { isExternalUrl } from '@rspress/shared';
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 
 // these are types copied from src/types.ts
 type RedirectRule = {
@@ -13,31 +13,44 @@ type RedirectsOptions = {
 };
 
 export default function Redirect(props: RedirectsOptions = {}) {
-  const { pathname } = useLocation();
+  const { pathname, hash } = useLocation();
   const { redirects } = props;
 
+  // Use useMemo to preprocess redirect rules to avoid recreating RegExp objects every time you render
+  const processedRedirects = useMemo(() => {
+    if (!redirects?.length) return [];
+
+    return redirects.map(({ from, to }) => ({
+      to,
+      patterns: Array.isArray(from) ? from : [from],
+    }));
+  }, [redirects]);
+
   useEffect(() => {
-    if (redirects) {
-      for (const redirect of redirects) {
-        const { from, to } = redirect;
-        const fromPaths = Array.isArray(from) ? from : [from];
+    // If there is no redirect rule or if it is not in the browser environment, it will be returned
+    if (!processedRedirects.length || typeof window === 'undefined') {
+      return;
+    }
 
-        fromPaths.forEach(item => {
-          const regex = new RegExp(item);
+    for (const { patterns, to } of processedRedirects) {
+      for (const pattern of patterns) {
+        try {
+          const regex = new RegExp(pattern);
 
-          if (regex.test(pathname) && typeof window !== 'undefined') {
+          if (regex.test(pathname)) {
             if (isExternalUrl(to)) {
               window.location.replace(to);
             } else {
-              window.location.replace(
-                pathname.replace(regex, to) + location.hash,
-              );
+              window.location.replace(pathname.replace(regex, to) + hash);
             }
+            return;
           }
-        });
+        } catch (error) {
+          console.warn(`Invalid redirect pattern: ${pattern}`, error);
+        }
       }
     }
-  }, [pathname]);
+  }, [pathname, hash, processedRedirects]);
 
   return null;
 }