fix(server): fix static server cwd error when there is no ykit config…

… file
YMFE · Aug 10, 2017 · 3a29c0d · 3a29c0d
1 parent fe56b5f
commit 3a29c0d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/lib/commands/server.js b/lib/commands/server.js
@@ -640,12 +640,13 @@ exports.run = function (options) {
             dirLevel += i === 0 ? dirSections[i] : '/' + dirSections[i];
 
             var searchDir = sysPath.join(cwd, dirLevel, '');
-            var ykitConf = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: searchDir })[0];
-
-            if (ykitConf) {
-                projectDir = searchDir;
-                projectName = sysPath.basename(searchDir);
-                break;
+            if (fs.lstatSync(searchDir).isDirectory()) {
+                var ykitConf = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: searchDir })[0];
+                if (ykitConf) {
+                    projectDir = searchDir;
+                    projectName = sysPath.basename(searchDir);
+                    break;
+                }
             }
         }
 

diff --git a/src/commands/server.js b/src/commands/server.js
@@ -629,12 +629,13 @@ exports.run = (options) => {
             dirLevel += i === 0 ? dirSections[i] : '/' + dirSections[i] ;
 
             const searchDir = sysPath.join(cwd, dirLevel, '');
-            const ykitConf = globby.sync(['ykit.*.js', 'ykit.js'], {cwd: searchDir})[0];
-
-            if(ykitConf) {
-                projectDir = searchDir;
-                projectName = sysPath.basename(searchDir);
-                break;
+            if (fs.lstatSync(searchDir).isDirectory()) {
+                const ykitConf = globby.sync(['ykit.*.js', 'ykit.js'], {cwd: searchDir})[0];
+                if(ykitConf) {
+                    projectDir = searchDir;
+                    projectName = sysPath.basename(searchDir);
+                    break;
+                }
             }
         }