Merge pull request #217 from umijs/fix/umi-plugin-dva-endless-loop

fix(umi-plugin-dva): endless loop if route if outside of the pages dir
umijs · Mar 15, 2018 · f3d58ea · f3d58ea
2 parents 5a756a1 + 8d1d069
commit f3d58ea
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/umi-plugin-dva/src/index.js b/packages/umi-plugin-dva/src/index.js
@@ -38,6 +38,12 @@ export default function(api) {
     );
   }
 
+  function isSrcPath(path) {
+    return (
+      winPath(endWithSlash(path)) === winPath(endWithSlash(paths.absSrcPath))
+    );
+  }
+
   function getGlobalModels() {
     let models = getModel(paths.absSrcPath);
     if (!isProduction) {
@@ -54,7 +60,7 @@ export default function(api) {
 
   function getPageModels(cwd) {
     let models = [];
-    while (!isPagesPath(cwd)) {
+    while (!isPagesPath(cwd) && !isSrcPath(cwd) && cwd !== '/') {
       models = models.concat(getModel(cwd));
       cwd = dirname(cwd);
     }