fix: wirte route bug when has redirect (#2467)

umijs · May 25, 2019 · 5502704 · 5502704
1 parent 116e1c7
commit 5502704
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.js b/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.js
@@ -4,6 +4,10 @@ export default {
       path: '/aa',
       component: 'aa',
       routes: [
+        {
+          path: '/aa',
+          redirect: '/testredirect',
+        },
         {
           path: '/aa/vv',
           name: 'dd',

diff --git a/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.result.js b/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.result.js
@@ -4,6 +4,10 @@ export default {
       path: '/aa',
       component: 'aa',
       routes: [
+        {
+          path: '/aa',
+          redirect: '/testredirect',
+        },
         {
           path: '/aa/vv',
           name: 'dd',

diff --git a/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.resultWithLayout.js b/packages/umi-build-dev/src/utils/fixtures/exportDefaultRoutes.resultWithLayout.js
@@ -4,6 +4,10 @@ export default {
       path: '/aa',
       component: 'aa',
       routes: [
+        {
+          path: '/aa',
+          redirect: '/testredirect',
+        },
         {
           path: '/aa/vv',
           name: 'dd',

diff --git a/packages/umi-build-dev/src/utils/writeNewRoute.js b/packages/umi-build-dev/src/utils/writeNewRoute.js
@@ -130,6 +130,12 @@ export function writeRouteNode(targetNode, newRoute, currentPath = '/') {
       return false;
     }
     const { properties } = ele;
+    const redirect = properties.find(p => {
+      return p.key.name === 'redirect';
+    });
+    if (redirect) {
+      return false;
+    }
     const pathProp = properties.find(p => {
       return p.key.name === 'path';
     });
@@ -146,7 +152,7 @@ export function writeRouteNode(targetNode, newRoute, currentPath = '/') {
   debug('paths', paths);
 
   const matchedIndex = paths.findIndex(p => {
-    return newRoute.path.indexOf(p) === 0;
+    return p && newRoute.path.indexOf(p) === 0;
   });
 
   const newNode = getNewRouteNode(newRoute);